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/libtool-tag.patch | 30 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat/run-ptest | 22 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat_2.2.10.bb | 27 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat_2.6.2.bb | 33 |
5 files changed, 37 insertions, 158 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 deleted file mode 100644 index c5c18ead74..0000000000 --- a/meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch +++ /dev/null | |||
@@ -1,83 +0,0 @@ | |||
1 | From aa84835a00bfd65e784d58411e76f60658e939dc Mon Sep 17 00:00:00 2001 | ||
2 | From: Oleksandr Popovych <oleksandr.s.popovych@globallogic.com> | ||
3 | Date: Tue, 18 Feb 2020 19:04:55 +0200 | ||
4 | Subject: [PATCH] Add output of tests result | ||
5 | |||
6 | Added console output of testing results in form 'RESULT: TEST_NAME'. | ||
7 | |||
8 | Changed verbose mode of test application set by '-v' ('--verbose') | ||
9 | argument to CK_NORMAL. | ||
10 | Added new supported argument '-vv' ('--extra-verbose') that changes | ||
11 | verbose mode of test application to CK_VERBOSE. Results of each test | ||
12 | are shown in output only if this mode is set. | ||
13 | |||
14 | Upstream-Status: Denied | ||
15 | |||
16 | This patch changes potentially deprecated feature that shoud be changed | ||
17 | in upstream. [https://github.com/libexpat/libexpat/issues/382] | ||
18 | |||
19 | Signed-off-by: Oleksandr Popovych <oleksandr.s.popovych@globallogic.com> | ||
20 | --- | ||
21 | tests/minicheck.c | 10 +++++++++- | ||
22 | tests/runtests.c | 4 +++- | ||
23 | 2 files changed, 12 insertions(+), 2 deletions(-) | ||
24 | |||
25 | diff --git a/expat/tests/minicheck.c b/expat/tests/minicheck.c | ||
26 | index a5a1efb..94fa412 100644 | ||
27 | --- a/tests/minicheck.c | ||
28 | +++ b/tests/minicheck.c | ||
29 | @@ -164,6 +164,8 @@ srunner_run_all(SRunner *runner, int verbosity) { | ||
30 | if (tc->setup != NULL) { | ||
31 | /* setup */ | ||
32 | if (setjmp(env)) { | ||
33 | + if (verbosity >= CK_VERBOSE) | ||
34 | + printf("SKIP: %s\n", _check_current_function); | ||
35 | add_failure(runner, verbosity); | ||
36 | continue; | ||
37 | } | ||
38 | @@ -171,6 +173,8 @@ srunner_run_all(SRunner *runner, int verbosity) { | ||
39 | } | ||
40 | /* test */ | ||
41 | if (setjmp(env)) { | ||
42 | + if (verbosity >= CK_VERBOSE) | ||
43 | + printf("FAIL: %s\n", _check_current_function); | ||
44 | add_failure(runner, verbosity); | ||
45 | continue; | ||
46 | } | ||
47 | @@ -178,12 +182,16 @@ srunner_run_all(SRunner *runner, int verbosity) { | ||
48 | |||
49 | /* teardown */ | ||
50 | if (tc->teardown != NULL) { | ||
51 | - if (setjmp(env)) { | ||
52 | + if (setjmp(env)) { | ||
53 | + if (verbosity >= CK_VERBOSE) | ||
54 | + printf("PASS: %s\n", _check_current_function); | ||
55 | add_failure(runner, verbosity); | ||
56 | continue; | ||
57 | } | ||
58 | tc->teardown(); | ||
59 | } | ||
60 | + if (verbosity >= CK_VERBOSE) | ||
61 | + printf("PASS: %s\n", _check_current_function); | ||
62 | } | ||
63 | tc = tc->next_tcase; | ||
64 | } | ||
65 | diff --git a/tests/runtests.c b/expat/tests/runtests.c | ||
66 | index 7791fe0..75724e5 100644 | ||
67 | --- a/tests/runtests.c | ||
68 | +++ b/tests/runtests.c | ||
69 | @@ -11619,9 +11619,11 @@ main(int argc, char *argv[]) { | ||
70 | for (i = 1; i < argc; ++i) { | ||
71 | char *opt = argv[i]; | ||
72 | if (strcmp(opt, "-v") == 0 || strcmp(opt, "--verbose") == 0) | ||
73 | - verbosity = CK_VERBOSE; | ||
74 | + verbosity = CK_NORMAL; | ||
75 | else if (strcmp(opt, "-q") == 0 || strcmp(opt, "--quiet") == 0) | ||
76 | verbosity = CK_SILENT; | ||
77 | + else if (strcmp(opt, "-vv") == 0 || strcmp(opt, "--extra-verbose") == 0) | ||
78 | + verbosity = CK_VERBOSE; | ||
79 | else { | ||
80 | fprintf(stderr, "runtests: unknown option '%s'\n", opt); | ||
81 | return 2; | ||
82 | -- | ||
83 | 2.17.1 | ||
diff --git a/meta/recipes-core/expat/expat/libtool-tag.patch b/meta/recipes-core/expat/expat/libtool-tag.patch deleted file mode 100644 index 0a0aed23e5..0000000000 --- a/meta/recipes-core/expat/expat/libtool-tag.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 10342e6b600858b091bc7771e454d9e06af06410 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 2 Nov 2017 18:20:57 +0800 | ||
4 | Subject: [PATCH] Add CC tag to build | ||
5 | |||
6 | Add CC tag to build | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | Signed-off-by: Dengke Du <dengke.du@windriver.com> | ||
11 | --- | ||
12 | Makefile.in | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/Makefile.in b/Makefile.in | ||
16 | index 9560a95..d444bd6 100644 | ||
17 | --- a/Makefile.in | ||
18 | +++ b/Makefile.in | ||
19 | @@ -319,7 +319,7 @@ LIBCURRENT = @LIBCURRENT@ | ||
20 | LIBOBJS = @LIBOBJS@ | ||
21 | LIBREVISION = @LIBREVISION@ | ||
22 | LIBS = @LIBS@ | ||
23 | -LIBTOOL = @LIBTOOL@ | ||
24 | +LIBTOOL = @LIBTOOL@ --tag CC | ||
25 | LIPO = @LIPO@ | ||
26 | LN_S = @LN_S@ | ||
27 | LTLIBOBJS = @LTLIBOBJS@ | ||
28 | -- | ||
29 | 2.7.4 | ||
30 | |||
diff --git a/meta/recipes-core/expat/expat/run-ptest b/meta/recipes-core/expat/expat/run-ptest index 1b39cec8e5..ff7986db3c 100644 --- a/meta/recipes-core/expat/expat/run-ptest +++ b/meta/recipes-core/expat/expat/run-ptest | |||
@@ -1,23 +1,9 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | 2 | ||
3 | output=${1:-"expat_tests.log"} # default log file | ||
4 | |||
5 | # logging function | ||
6 | function testCheck() { | ||
7 | testExec="$1" | ||
8 | shift | ||
9 | echo && echo ${testExec} && ./${testExec} "$@" | ||
10 | error=$? | ||
11 | result=$([[ ${error} -eq 0 ]] && echo "PASS" || echo "FAIL") | ||
12 | echo "${result}: ${testExec}" && echo "============================" | ||
13 | } | ||
14 | |||
15 | export output | ||
16 | export -f testCheck | ||
17 | TIME=$(which time) | 3 | TIME=$(which time) |
18 | 4 | ||
19 | echo "Architecture: $(uname -m)" > ${output} | 5 | echo "runtests" |
20 | echo "Image: $(uname -sr)" >> ${output} | 6 | ${TIME} -f 'Execution time: %e s' bash -c "./runtests -v" |
21 | ${TIME} -f 'Execution time: %e s' bash -c "testCheck runtests -vv" |& tee -a ${output} | 7 | echo "runtestspp" |
22 | ${TIME} -f 'Execution time: %e s' bash -c "testCheck runtestspp -vv" |& tee -a ${output} | 8 | ${TIME} -f 'Execution time: %e s' bash -c "./runtests_cxx -v" |
23 | echo | 9 | echo |
diff --git a/meta/recipes-core/expat/expat_2.2.10.bb b/meta/recipes-core/expat/expat_2.2.10.bb deleted file mode 100644 index fa263775b3..0000000000 --- a/meta/recipes-core/expat/expat_2.2.10.bb +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | SUMMARY = "A stream-oriented XML parser library" | ||
2 | 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)" | ||
3 | HOMEPAGE = "http://expat.sourceforge.net/" | ||
4 | SECTION = "libs" | ||
5 | LICENSE = "MIT" | ||
6 | |||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9" | ||
8 | |||
9 | SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ | ||
10 | file://libtool-tag.patch \ | ||
11 | file://run-ptest \ | ||
12 | file://0001-Add-output-of-tests-result.patch \ | ||
13 | " | ||
14 | |||
15 | SRC_URI[sha256sum] = "b2c160f1b60e92da69de8e12333096aeb0c3bf692d41c60794de278af72135a5" | ||
16 | |||
17 | EXTRA_OECMAKE_class-native += "-DEXPAT_BUILD_DOCS=OFF" | ||
18 | |||
19 | RDEPENDS_${PN}-ptest += "bash" | ||
20 | |||
21 | inherit cmake lib_package ptest | ||
22 | |||
23 | do_install_ptest_class-target() { | ||
24 | install -m 755 ${B}/tests/* ${D}${PTEST_PATH} | ||
25 | } | ||
26 | |||
27 | BBCLASSEXTEND += "native nativesdk" | ||
diff --git a/meta/recipes-core/expat/expat_2.6.2.bb b/meta/recipes-core/expat/expat_2.6.2.bb new file mode 100644 index 0000000000..6c9db91bef --- /dev/null +++ b/meta/recipes-core/expat/expat_2.6.2.bb | |||
@@ -0,0 +1,33 @@ | |||
1 | SUMMARY = "A stream-oriented XML parser library" | ||
2 | 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)" | ||
3 | HOMEPAGE = "https://github.com/libexpat/libexpat" | ||
4 | SECTION = "libs" | ||
5 | LICENSE = "MIT" | ||
6 | |||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=7b3b078238d0901d3b339289117cb7fb" | ||
8 | |||
9 | VERSION_TAG = "${@d.getVar('PV').replace('.', '_')}" | ||
10 | |||
11 | SRC_URI = "${GITHUB_BASE_URI}/download/R_${VERSION_TAG}/expat-${PV}.tar.bz2 \ | ||
12 | file://run-ptest \ | ||
13 | " | ||
14 | |||
15 | GITHUB_BASE_URI = "https://github.com/libexpat/libexpat/releases/" | ||
16 | UPSTREAM_CHECK_REGEX = "releases/tag/R_(?P<pver>.+)" | ||
17 | |||
18 | SRC_URI[sha256sum] = "9c7c1b5dcbc3c237c500a8fb1493e14d9582146dd9b42aa8d3ffb856a3b927e0" | ||
19 | |||
20 | EXTRA_OECMAKE:class-native += "-DEXPAT_BUILD_DOCS=OFF" | ||
21 | |||
22 | RDEPENDS:${PN}-ptest += "bash" | ||
23 | |||
24 | inherit cmake lib_package ptest github-releases | ||
25 | |||
26 | do_install_ptest:class-target() { | ||
27 | install -m 755 ${B}/tests/runtests* ${D}${PTEST_PATH} | ||
28 | install -m 755 ${B}/tests/benchmark/benchmark ${D}${PTEST_PATH} | ||
29 | } | ||
30 | |||
31 | BBCLASSEXTEND += "native nativesdk" | ||
32 | |||
33 | CVE_PRODUCT = "expat libexpat" | ||