summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/curl/curl/run-ptest2
-rw-r--r--meta/recipes-support/curl/curl_8.2.1.bb8
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
2cd tests 2cd 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
87do_compile_ptest() { 87do_compile_ptest() {
88 oe_runmake test 88 oe_runmake -C ${B}/tests
89 oe_runmake -C ${B}/tests/server
90} 89}
91 90
92do_install_ptest() { 91do_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