diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-09-17 11:38:36 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-18 08:53:10 +0100 |
commit | 4ef31c91ca6c89f3c69096da9b63ec9717043da3 (patch) | |
tree | c27a9c0e87eb681951ba370d4f6a2e8779bd2348 | |
parent | 9f473461294e2d7582922d19812135637b55d23b (diff) | |
download | poky-4ef31c91ca6c89f3c69096da9b63ec9717043da3.tar.gz |
curl: build and run the full set of ptests
Not running make in the top level tests/ directory
excluded about a third of them (those that consisted
of running small test binaries).
Also, run tests in parallel, which reduces total time
from five minutes to about 75 seconds.
(From OE-Core rev: ff88f275f5f8d52da2967726d8880cbbfdfc8f19)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/curl/curl/run-ptest | 2 | ||||
-rw-r--r-- | meta/recipes-support/curl/curl_8.2.1.bb | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-support/curl/curl/run-ptest b/meta/recipes-support/curl/curl/run-ptest index 2c74c58f5d..95af2bd7b3 100644 --- a/meta/recipes-support/curl/curl/run-ptest +++ b/meta/recipes-support/curl/curl/run-ptest | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | cd tests | 2 | cd tests |
3 | { ./runtests.pl -a -n -s || echo "FAIL: curl" ; } | sed \ | 3 | { ./runtests.pl -a -n -s -j4 || echo "FAIL: curl" ; } | sed \ |
4 | -e 's|\([^ ]* *\) \([^ ]* *\)...OK|PASS: \1 \2|' \ | 4 | -e 's|\([^ ]* *\) \([^ ]* *\)...OK|PASS: \1 \2|' \ |
5 | -e 's|\([^ ]* *\) \([^ ]* *\)...FAILED|FAIL: \1 \2|' \ | 5 | -e 's|\([^ ]* *\) \([^ ]* *\)...FAILED|FAIL: \1 \2|' \ |
6 | -e 's/Warning: test[0-9]\+ not present in tests\/data\/Makefile.inc//' | 6 | -e 's/Warning: test[0-9]\+ not present in tests\/data\/Makefile.inc//' |
diff --git a/meta/recipes-support/curl/curl_8.2.1.bb b/meta/recipes-support/curl/curl_8.2.1.bb index 068486a352..b86c6f3bba 100644 --- a/meta/recipes-support/curl/curl_8.2.1.bb +++ b/meta/recipes-support/curl/curl_8.2.1.bb | |||
@@ -85,14 +85,18 @@ do_install:append:class-target() { | |||
85 | } | 85 | } |
86 | 86 | ||
87 | do_compile_ptest() { | 87 | do_compile_ptest() { |
88 | oe_runmake test | 88 | oe_runmake -C ${B}/tests |
89 | oe_runmake -C ${B}/tests/server | ||
90 | } | 89 | } |
91 | 90 | ||
92 | do_install_ptest() { | 91 | do_install_ptest() { |
93 | cat ${WORKDIR}/disable-tests >> ${S}/tests/data/DISABLED | 92 | cat ${WORKDIR}/disable-tests >> ${S}/tests/data/DISABLED |
94 | rm -f ${B}/tests/configurehelp.pm | 93 | rm -f ${B}/tests/configurehelp.pm |
95 | cp -rf ${B}/tests ${D}${PTEST_PATH} | 94 | cp -rf ${B}/tests ${D}${PTEST_PATH} |
95 | rm -f ${D}${PTEST_PATH}/tests/libtest/.libs/libhostname.la | ||
96 | rm -f ${D}${PTEST_PATH}/tests/libtest/libhostname.la | ||
97 | mv ${D}${PTEST_PATH}/tests/libtest/.libs/* ${D}${PTEST_PATH}/tests/libtest/ | ||
98 | mv ${D}${PTEST_PATH}/tests/libtest/libhostname.so ${D}${PTEST_PATH}/tests/libtest/.libs/ | ||
99 | mv ${D}${PTEST_PATH}/tests/http/clients/.libs/* ${D}${PTEST_PATH}/tests/http/clients/ | ||
96 | cp -rf ${S}/tests ${D}${PTEST_PATH} | 100 | cp -rf ${S}/tests ${D}${PTEST_PATH} |
97 | find ${D}${PTEST_PATH}/ -type f -name Makefile.am -o -name Makefile.in -o -name Makefile -delete | 101 | find ${D}${PTEST_PATH}/ -type f -name Makefile.am -o -name Makefile.in -o -name Makefile -delete |
98 | install -d ${D}${PTEST_PATH}/src | 102 | install -d ${D}${PTEST_PATH}/src |