diff options
author | Ross Burton <ross.burton@arm.com> | 2024-03-15 14:37:36 +0000 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2024-03-28 07:08:30 -1000 |
commit | ba6ed3b8311fd5791a06efc59cee75a3f4d5ea54 (patch) | |
tree | 7f313e5eb2737b862ddf7817adb0ff59a251f774 | |
parent | b29f40625a958c574ce0ca226e3983b30cf58917 (diff) | |
download | poky-ba6ed3b8311fd5791a06efc59cee75a3f4d5ea54.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: 000bedc1c95e033f8a479a18a47dc66a0609d596)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3c3601d50ae290e7e9797eadd20c05df99bbd040)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/recipes-support/curl/curl/run-ptest | 13 | ||||
-rw-r--r-- | meta/recipes-support/curl/curl_8.4.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.4.0.bb b/meta/recipes-support/curl/curl_8.4.0.bb index 977404c963..bb46efb1e7 100644 --- a/meta/recipes-support/curl/curl_8.4.0.bb +++ b/meta/recipes-support/curl/curl_8.4.0.bb | |||
@@ -127,6 +127,7 @@ RDEPENDS:${PN}-ptest += " \ | |||
127 | perl-module-storable \ | 127 | perl-module-storable \ |
128 | perl-module-time-hires \ | 128 | perl-module-time-hires \ |
129 | " | 129 | " |
130 | RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-en-us" | ||
130 | 131 | ||
131 | PACKAGES =+ "lib${BPN}" | 132 | PACKAGES =+ "lib${BPN}" |
132 | 133 | ||