diff options
author | Ross Burton <ross.burton@arm.com> | 2024-03-15 14:37:36 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-19 15:25:12 +0000 |
commit | 264a3f429aaac2da5019f9f9d368bd25fa51d7a9 (patch) | |
tree | 84b321dafc722c91f8a0f24c52e0e2e0f75dc6b7 /meta/recipes-support | |
parent | b739fa5f4d9c70f1048906f51ed9276ee2170382 (diff) | |
download | poky-264a3f429aaac2da5019f9f9d368bd25fa51d7a9.tar.gz |
curl: improve run-ptest
There's no need to run the output of runtests.pl through a sed to get
automake-style output, as you can pass -am to get this formatting.
Don't run timing dependent tests, as the ptests can run on loaded
systems.
Add a dependency on the en_US locale because some of the tests require
this.
(From OE-Core rev: 3c3601d50ae290e7e9797eadd20c05df99bbd040)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/curl/curl/run-ptest | 13 | ||||
-rw-r--r-- | meta/recipes-support/curl/curl_8.6.0.bb | 1 |
2 files changed, 10 insertions, 4 deletions
diff --git a/meta/recipes-support/curl/curl/run-ptest b/meta/recipes-support/curl/curl/run-ptest index 8f9c20f34d..acd2892f80 100644 --- a/meta/recipes-support/curl/curl/run-ptest +++ b/meta/recipes-support/curl/curl/run-ptest | |||
@@ -1,6 +1,11 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | |||
2 | cd tests | 3 | cd tests |
3 | { ./runtests.pl -a -n -s -j4 !flaky || echo "FAIL: curl" ; } | sed \ | 4 | |
4 | -e 's|\([^ ]* *\) \([^ ]* *\)...OK|PASS: \1 \2|' \ | 5 | # Run all tests, don't stop on first failure |
5 | -e 's|\([^ ]* *\) \([^ ]* *\)...FAILED|FAIL: \1 \2|' \ | 6 | # Don't use valgrind if it is found |
6 | -e 's/Warning: test[0-9]\+ not present in tests\/data\/Makefile.inc//' | 7 | # Use automake-style output |
8 | # Run four tests in parallel | ||
9 | # Print log output on failure | ||
10 | # Don't run the flaky or timing dependent tests | ||
11 | ./runtests.pl -a -n -am -j4 -p '!flaky !timing-dependent' | ||
diff --git a/meta/recipes-support/curl/curl_8.6.0.bb b/meta/recipes-support/curl/curl_8.6.0.bb index b01f4542a2..d4473d868e 100644 --- a/meta/recipes-support/curl/curl_8.6.0.bb +++ b/meta/recipes-support/curl/curl_8.6.0.bb | |||
@@ -125,6 +125,7 @@ RDEPENDS:${PN}-ptest += " \ | |||
125 | perl-module-storable \ | 125 | perl-module-storable \ |
126 | perl-module-time-hires \ | 126 | perl-module-time-hires \ |
127 | " | 127 | " |
128 | RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-en-us" | ||
128 | 129 | ||
129 | PACKAGES =+ "lib${BPN}" | 130 | PACKAGES =+ "lib${BPN}" |
130 | 131 | ||