summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/curl
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/curl')
-rw-r--r--meta/recipes-support/curl/curl/run-ptest4
-rw-r--r--meta/recipes-support/curl/curl_8.7.1.bb4
2 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-support/curl/curl/run-ptest b/meta/recipes-support/curl/curl/run-ptest
index 3d25f3d90b..579b3f4587 100644
--- a/meta/recipes-support/curl/curl/run-ptest
+++ b/meta/recipes-support/curl/curl/run-ptest
@@ -7,5 +7,7 @@ cd tests
7# Use automake-style output 7# Use automake-style output
8# Run four tests in parallel 8# Run four tests in parallel
9# Print log output on failure 9# Print log output on failure
10
10# Don't run the flaky or timing dependent tests 11# Don't run the flaky or timing dependent tests
11./runtests.pl -a -n -am -j4 -p !flaky !timing-dependent 12# Until https://github.com/curl/curl/issues/13350 is resolved, don't run FTP tests
13./runtests.pl -a -n -am -j4 -p !flaky !timing-dependent !FTP
diff --git a/meta/recipes-support/curl/curl_8.7.1.bb b/meta/recipes-support/curl/curl_8.7.1.bb
index c74416d7e9..23b7c50a86 100644
--- a/meta/recipes-support/curl/curl_8.7.1.bb
+++ b/meta/recipes-support/curl/curl_8.7.1.bb
@@ -103,7 +103,7 @@ do_compile_ptest() {
103} 103}
104 104
105do_install_ptest() { 105do_install_ptest() {
106 cat ${WORKDIR}/disable-tests >> ${S}/tests/data/DISABLED 106 cat ${UNPACKDIR}/disable-tests >> ${S}/tests/data/DISABLED
107 rm -f ${B}/tests/configurehelp.pm 107 rm -f ${B}/tests/configurehelp.pm
108 cp -rf ${B}/tests ${D}${PTEST_PATH} 108 cp -rf ${B}/tests ${D}${PTEST_PATH}
109 rm -f ${D}${PTEST_PATH}/tests/libtest/.libs/libhostname.la 109 rm -f ${D}${PTEST_PATH}/tests/libtest/.libs/libhostname.la
@@ -120,6 +120,7 @@ do_install_ptest() {
120 120
121RDEPENDS:${PN}-ptest += " \ 121RDEPENDS:${PN}-ptest += " \
122 bash \ 122 bash \
123 locale-base-en-us \
123 perl-module-b \ 124 perl-module-b \
124 perl-module-base \ 125 perl-module-base \
125 perl-module-cwd \ 126 perl-module-cwd \
@@ -135,7 +136,6 @@ RDEPENDS:${PN}-ptest += " \
135 perl-module-storable \ 136 perl-module-storable \
136 perl-module-time-hires \ 137 perl-module-time-hires \
137" 138"
138RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-en-us"
139 139
140PACKAGES =+ "lib${BPN}" 140PACKAGES =+ "lib${BPN}"
141 141