diff options
Diffstat (limited to 'meta/recipes-core/expat')
-rw-r--r-- | meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch | 83 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat/autotools.patch | 25 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat/run-ptest | 23 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat_2.2.10.bb | 27 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat_2.2.6.bb | 23 |
5 files changed, 133 insertions, 48 deletions
diff --git a/meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch b/meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch new file mode 100644 index 0000000000..c5c18ead74 --- /dev/null +++ b/meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch @@ -0,0 +1,83 @@ +From aa84835a00bfd65e784d58411e76f60658e939dc Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych <oleksandr.s.popovych@globallogic.com> +Date: Tue, 18 Feb 2020 19:04:55 +0200 +Subject: [PATCH] Add output of tests result + +Added console output of testing results in form 'RESULT: TEST_NAME'. + +Changed verbose mode of test application set by '-v' ('--verbose') +argument to CK_NORMAL. +Added new supported argument '-vv' ('--extra-verbose') that changes +verbose mode of test application to CK_VERBOSE. Results of each test +are shown in output only if this mode is set. + +Upstream-Status: Denied + +This patch changes potentially deprecated feature that shoud be changed +in upstream. [https://github.com/libexpat/libexpat/issues/382] + +Signed-off-by: Oleksandr Popovych <oleksandr.s.popovych@globallogic.com> +--- + tests/minicheck.c | 10 +++++++++- + tests/runtests.c | 4 +++- + 2 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/expat/tests/minicheck.c b/expat/tests/minicheck.c +index a5a1efb..94fa412 100644 +--- a/tests/minicheck.c ++++ b/tests/minicheck.c +@@ -164,6 +164,8 @@ srunner_run_all(SRunner *runner, int verbosity) { + if (tc->setup != NULL) { + /* setup */ + if (setjmp(env)) { ++ if (verbosity >= CK_VERBOSE) ++ printf("SKIP: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } +@@ -171,6 +173,8 @@ srunner_run_all(SRunner *runner, int verbosity) { + } + /* test */ + if (setjmp(env)) { ++ if (verbosity >= CK_VERBOSE) ++ printf("FAIL: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } +@@ -178,12 +182,16 @@ srunner_run_all(SRunner *runner, int verbosity) { + + /* teardown */ + if (tc->teardown != NULL) { +- if (setjmp(env)) { ++ if (setjmp(env)) { ++ if (verbosity >= CK_VERBOSE) ++ printf("PASS: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } + tc->teardown(); + } ++ if (verbosity >= CK_VERBOSE) ++ printf("PASS: %s\n", _check_current_function); + } + tc = tc->next_tcase; + } +diff --git a/tests/runtests.c b/expat/tests/runtests.c +index 7791fe0..75724e5 100644 +--- a/tests/runtests.c ++++ b/tests/runtests.c +@@ -11619,9 +11619,11 @@ main(int argc, char *argv[]) { + for (i = 1; i < argc; ++i) { + char *opt = argv[i]; + if (strcmp(opt, "-v") == 0 || strcmp(opt, "--verbose") == 0) +- verbosity = CK_VERBOSE; ++ verbosity = CK_NORMAL; + else if (strcmp(opt, "-q") == 0 || strcmp(opt, "--quiet") == 0) + verbosity = CK_SILENT; ++ else if (strcmp(opt, "-vv") == 0 || strcmp(opt, "--extra-verbose") == 0) ++ verbosity = CK_VERBOSE; + else { + fprintf(stderr, "runtests: unknown option '%s'\n", opt); + return 2; +-- +2.17.1 diff --git a/meta/recipes-core/expat/expat/autotools.patch b/meta/recipes-core/expat/expat/autotools.patch deleted file mode 100644 index 104717eabb..0000000000 --- a/meta/recipes-core/expat/expat/autotools.patch +++ /dev/null @@ -1,25 +0,0 @@ -Avoid using expat's m4 files - -Upstream-Status: Inappropriate [Other] -Workaround specific to our build system. - -Signed-off-by: Kevin Tian <kevin.tian@intel.com> -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - -Updated to apply over expat 2.1.0 - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> - -Index: expat-2.2.5/configure.ac -=================================================================== ---- expat-2.2.5.orig/configure.ac -+++ expat-2.2.5/configure.ac -@@ -53,8 +53,6 @@ LIBAGE=6 # CMakeLists.txt! - CPPFLAGS="${CPPFLAGS} -DHAVE_EXPAT_CONFIG_H" - AC_CONFIG_HEADER(expat_config.h) - --sinclude(conftools/ac_c_bigendian_cross.m4) -- - AC_LIBTOOL_WIN32_DLL - AC_PROG_LIBTOOL - diff --git a/meta/recipes-core/expat/expat/run-ptest b/meta/recipes-core/expat/expat/run-ptest new file mode 100644 index 0000000000..1b39cec8e5 --- /dev/null +++ b/meta/recipes-core/expat/expat/run-ptest @@ -0,0 +1,23 @@ +#!/bin/bash + +output=${1:-"expat_tests.log"} # default log file + +# logging function +function testCheck() { + testExec="$1" + shift + echo && echo ${testExec} && ./${testExec} "$@" + error=$? + result=$([[ ${error} -eq 0 ]] && echo "PASS" || echo "FAIL") + echo "${result}: ${testExec}" && echo "============================" +} + +export output +export -f testCheck +TIME=$(which time) + +echo "Architecture: $(uname -m)" > ${output} +echo "Image: $(uname -sr)" >> ${output} +${TIME} -f 'Execution time: %e s' bash -c "testCheck runtests -vv" |& tee -a ${output} +${TIME} -f 'Execution time: %e s' bash -c "testCheck runtestspp -vv" |& tee -a ${output} +echo diff --git a/meta/recipes-core/expat/expat_2.2.10.bb b/meta/recipes-core/expat/expat_2.2.10.bb new file mode 100644 index 0000000000..fa263775b3 --- /dev/null +++ b/meta/recipes-core/expat/expat_2.2.10.bb @@ -0,0 +1,27 @@ +SUMMARY = "A stream-oriented XML parser library" +DESCRIPTION = "Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags)" +HOMEPAGE = "http://expat.sourceforge.net/" +SECTION = "libs" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9" + +SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ + file://libtool-tag.patch \ + file://run-ptest \ + file://0001-Add-output-of-tests-result.patch \ + " + +SRC_URI[sha256sum] = "b2c160f1b60e92da69de8e12333096aeb0c3bf692d41c60794de278af72135a5" + +EXTRA_OECMAKE_class-native += "-DEXPAT_BUILD_DOCS=OFF" + +RDEPENDS_${PN}-ptest += "bash" + +inherit cmake lib_package ptest + +do_install_ptest_class-target() { + install -m 755 ${B}/tests/* ${D}${PTEST_PATH} +} + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta/recipes-core/expat/expat_2.2.6.bb b/meta/recipes-core/expat/expat_2.2.6.bb deleted file mode 100644 index c9e6081a35..0000000000 --- a/meta/recipes-core/expat/expat_2.2.6.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "A stream-oriented XML parser library" -DESCRIPTION = "Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags)" -HOMEPAGE = "http://expat.sourceforge.net/" -SECTION = "libs" -LICENSE = "MIT" - -LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" - -SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ - file://autotools.patch \ - file://libtool-tag.patch \ - " - -SRC_URI[md5sum] = "ca047ae951b40020ac831c28859161b2" -SRC_URI[sha256sum] = "17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2" - -inherit autotools lib_package - -do_configure_prepend () { - rm -f ${S}/conftools/libtool.m4 -} - -BBCLASSEXTEND = "native nativesdk" |