[OE-core] [PATCH v3] expat: add ptest
Alexander Kanavin
alex.kanavin at gmail.com
Mon Feb 10 17:14:00 UTC 2020
You need to send your patch using 'git send-email', that will guarantee the
correct format.
Alex
On Mon, 10 Feb 2020 at 17:50, Oleksandr Popovych via Openembedded-core <
openembedded-core at lists.openembedded.org> wrote:
> From dcf5a9b6199c3b1f4a6aad00334e69281bde3c34 Mon Sep 17 00:00:00 2001
> From: Oleksandr Popovych <oleksandr.s.popovych at globallogic.com>
> Date: Thu, 6 Feb 2020 18:14:28 +0200
> Subject: [OE-core][PATCH] expat: Added ptest
>
> For ptest support for this package several additional patches and
> run-ptest script were added and recipe was changed.
>
> Signed-off-by: Oleksandr Popovych <oleksandr.s.popovych at globallogic.com>
> ---
> ...d-Makefile-targets-for-ptest-support.patch | 38 ++++++++++++++
> ...ort-for-ptests-in-form-of-new-target.patch | 31 ++++++++++++
> ...ed-suitable-format-of-tests-in-ptest.patch | 50 +++++++++++++++++++
> meta/recipes-core/expat/expat/run-ptest | 3 ++
> meta/recipes-core/expat/expat_2.2.9.bb | 12 ++++-
> 5 files changed, 133 insertions(+), 1 deletion(-)
> create mode 100644
>
> meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch
> create mode 100644
>
> meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch
> create mode 100644
>
> meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch
> create mode 100644 meta/recipes-core/expat/expat/run-ptest
>
> diff --git
> a/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch
>
> b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch
> new file mode 100644
> index 0000000000..32488060ee
> --- /dev/null
> +++
> b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch
> @@ -0,0 +1,38 @@
> +From ce803ec3d7b095cb55686f9cd5d3f01d34a31a5e Mon Sep 17 00:00:00 2001
> +From: Oleksandr Popovych <oleksandr.s.popovych at globallogic.com>
> +Date: Thu, 6 Feb 2020 13:41:45 +0200
> +Subject: [PATCH 1/3] expat: Added Makefile targets for ptest support
> +
> +install-ptest, runtests and check tagrets are added.
> +
> +Signed-off-by: Oleksandr Popovych <oleksandr.s.popovych at globallogic.com>
> +---
> + Makefile.am | 15 +++++++++++++++
> + 1 file changed, 15 insertions(+)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index 5e1d37d..c63b44a 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -152,3 +152,18 @@ qa:
> + QA_COMPILER=clang QA_SANITIZER=memory ./qa.sh
> + QA_COMPILER=clang QA_SANITIZER=undefined ./qa.sh
> + QA_COMPILER=gcc QA_PROCESSOR=gcov ./qa.sh
> ++
> ++.PHONY: install-ptest
> ++install-ptest:
> ++ echo $(S)
> ++ (if [ -d tests/.libs ] ; then cd tests/.libs; fi; \
> ++ install runtests runtestspp $(DESTDIR))
> ++ cp Makefile $(DESTDIR)
> ++ sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile
> ++
> ++.PHONY: runtests
> ++runtests:
> ++ @echo "C variant of tests:"
> ++ @$(CHECKER) ./runtests$(EXEEXT) -q
> ++ @echo "C++ variant of tests:"
> ++ @$(CHECKER) ./runtestspp$(EXEEXT) -q
> +--
> +2.17.1
> +
> diff --git
> a/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch
>
> b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch
> new file mode 100644
> index 0000000000..cf8a2495e9
> --- /dev/null
> +++
> b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch
> @@ -0,0 +1,31 @@
> +From 2b209a025f62fb1be7b32599aa80703ce8ecd76a Mon Sep 17 00:00:00 2001
> +From: Oleksandr Popovych <oleksandr.s.popovych at globallogic.com>
> +Date: Thu, 6 Feb 2020 13:43:57 +0200
> +Subject: [PATCH 2/3] expat: Added support for ptests in form of new target
> +
> +configure.am file changed, according to this advice:
> +https://wiki.yoctoproject.org/wiki/Ptest#Building_the_test_suite
> +
> +Signed-off-by: Oleksandr Popovych <oleksandr.s.popovych at globallogic.com>
> +---
> + configure.ac | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index d58ac03..8e6b41e 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -34,8 +34,8 @@ AC_CONFIG_SRCDIR([Makefile.in])
> + AC_CONFIG_AUX_DIR([conftools])
> + AC_CONFIG_MACRO_DIR([m4])
> + AC_CANONICAL_HOST
> +-AM_INIT_AUTOMAKE
> +-
> ++AM_INIT_AUTOMAKE([serial-tests])
> ++AM_EXTRA_RECURSIVE_TARGETS([buildtest-TESTS])
> +
> + dnl
> + dnl Increment LIBREVISION if source code has changed at all
> +--
> +2.17.1
> +
> diff --git
> a/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch
>
> b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch
> new file mode 100644
> index 0000000000..5d1daefc92
> --- /dev/null
> +++
> b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch
> @@ -0,0 +1,50 @@
> +From b2e236e238f8bab42651313ea198b27355945d97 Mon Sep 17 00:00:00 2001
> +From: Oleksandr Popovych <oleksandr.s.popovych at globallogic.com>
> +Date: Thu, 6 Feb 2020 13:44:56 +0200
> +Subject: [PATCH 3/3] expat: Added suitable format of tests in ptest
> +
> +Some changes in testcases code were applied for testcase engine.
> +This was just adding of message outputs in "RESULT: TESTNAME" form...
> +
> +Signed-off-by: Oleksandr Popovych <oleksandr.s.popovych at globallogic.com>
> +---
> + tests/minicheck.c | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/tests/minicheck.c b/tests/minicheck.c
> +index a5a1efb..b39cda9 100644
> +--- a/tests/minicheck.c
> ++++ b/tests/minicheck.c
> +@@ -164,6 +164,7 @@ srunner_run_all(SRunner *runner, int verbosity) {
> + if (tc->setup != NULL) {
> + /* setup */
> + if (setjmp(env)) {
> ++ printf("SKIP: %s\n", _check_current_function);
> + add_failure(runner, verbosity);
> + continue;
> + }
> +@@ -171,6 +172,7 @@ srunner_run_all(SRunner *runner, int verbosity) {
> + }
> + /* test */
> + if (setjmp(env)) {
> ++ printf("FAIL: %s\n", _check_current_function);
> + add_failure(runner, verbosity);
> + continue;
> + }
> +@@ -179,11 +181,13 @@ srunner_run_all(SRunner *runner, int verbosity) {
> + /* teardown */
> + if (tc->teardown != NULL) {
> + if (setjmp(env)) {
> ++ printf("PASS: %s\n", _check_current_function);
> + add_failure(runner, verbosity);
> + continue;
> + }
> + tc->teardown();
> + }
> ++ printf("PASS: %s\n", _check_current_function);
> + }
> + tc = tc->next_tcase;
> + }
> +--
> +2.17.1
> +
> diff --git a/meta/recipes-core/expat/expat/run-ptest
> b/meta/recipes-core/expat/expat/run-ptest
> new file mode 100644
> index 0000000000..df994c0838
> --- /dev/null
> +++ b/meta/recipes-core/expat/expat/run-ptest
> @@ -0,0 +1,3 @@
> +#!/bin/bash
> +
> +make -k runtests
> diff --git a/meta/recipes-core/expat/expat_2.2.9.bb
> b/meta/recipes-core/expat/expat_2.2.9.bb
> index 8f3db41352..420ffddc80 100644
> --- a/meta/recipes-core/expat/expat_2.2.9.bb
> +++ b/meta/recipes-core/expat/expat_2.2.9.bb
> @@ -8,15 +8,25 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79"
>
> SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \
> file://libtool-tag.patch \
> + file://0001-expat-Added-Makefile-targets-for-ptest-support.patch \
> +
> file://0002-expat-Added-support-for-ptests-in-form-of-new-target.patch \
> + file://0003-expat-Added-suitable-format-of-tests-in-ptest.patch \
> + file://run-ptest \
> "
>
> SRC_URI[md5sum] = "875a2c2ff3e8eb9e5a5cd62db2033ab5"
> SRC_URI[sha256sum] =
> "f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237"
>
> -inherit autotools lib_package
> +inherit autotools ptest lib_package
> +
> +RDEPENDS_${PN}-ptest += "make bash"
>
>
> do_configure_prepend () {
> rm -f ${S}/conftools/libtool.m4
> }
>
> +do_compile_ptest() {
> + oe_runmake buildtest-TESTS
> +}
> +
> BBCLASSEXTEND = "native nativesdk"
> --
> 2.17.1
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20200210/ee5d1379/attachment-0001.html>
More information about the Openembedded-core
mailing list