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:05 +0100 |
| commit | ff88f275f5f8d52da2967726d8880cbbfdfc8f19 (patch) | |
| tree | 600dfba4a423909c26a951a09d811aa6494b640b | |
| parent | 432446ef402ff42fe0c90172b77376fa5981524a (diff) | |
| download | openembedded-core-ff88f275f5f8d52da2967726d8880cbbfdfc8f19.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.
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 @@ #!/bin/sh cd tests -{ ./runtests.pl -a -n -s || echo "FAIL: curl" ; } | sed \ +{ ./runtests.pl -a -n -s -j4 || echo "FAIL: curl" ; } | sed \ -e 's|\([^ ]* *\) \([^ ]* *\)...OK|PASS: \1 \2|' \ -e 's|\([^ ]* *\) \([^ ]* *\)...FAILED|FAIL: \1 \2|' \ -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() { } do_compile_ptest() { - oe_runmake test - oe_runmake -C ${B}/tests/server + oe_runmake -C ${B}/tests } do_install_ptest() { cat ${WORKDIR}/disable-tests >> ${S}/tests/data/DISABLED rm -f ${B}/tests/configurehelp.pm cp -rf ${B}/tests ${D}${PTEST_PATH} + rm -f ${D}${PTEST_PATH}/tests/libtest/.libs/libhostname.la + rm -f ${D}${PTEST_PATH}/tests/libtest/libhostname.la + mv ${D}${PTEST_PATH}/tests/libtest/.libs/* ${D}${PTEST_PATH}/tests/libtest/ + mv ${D}${PTEST_PATH}/tests/libtest/libhostname.so ${D}${PTEST_PATH}/tests/libtest/.libs/ + mv ${D}${PTEST_PATH}/tests/http/clients/.libs/* ${D}${PTEST_PATH}/tests/http/clients/ cp -rf ${S}/tests ${D}${PTEST_PATH} find ${D}${PTEST_PATH}/ -type f -name Makefile.am -o -name Makefile.in -o -name Makefile -delete install -d ${D}${PTEST_PATH}/src |