diff options
author | Ross Burton <ross@burtonini.com> | 2021-12-21 17:09:12 +0000 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-09-16 11:16:07 -1000 |
commit | b222a20f8f8282c2f215130b66f1e724071fb8d5 (patch) | |
tree | 57c77b0375fa46a8efb3fb1094f7e453db59f43e /meta/recipes-extended | |
parent | 55b09cdc1c4795f4976867034567b012e39cad41 (diff) | |
download | poky-b222a20f8f8282c2f215130b66f1e724071fb8d5.tar.gz |
gawk: remove load-sensitive tests
The time and timeout tests are sensitive to system load, and as we run
these on build machines they fail randomly.
[ YOCTO #14371 ]
(From OE-Core rev: d2b62913a5771169265171129fe972c8e252fe04)
(From OE-Core rev: 309f1c6166f8535fa61fd1d01924df3c7fe9fbba)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a84b8d683b4b3f4d30999eac987790896d21eba6)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/gawk/gawk/remove-sensitive-tests.patch | 24 | ||||
-rw-r--r-- | meta/recipes-extended/gawk/gawk_5.0.1.bb | 14 |
2 files changed, 35 insertions, 3 deletions
diff --git a/meta/recipes-extended/gawk/gawk/remove-sensitive-tests.patch b/meta/recipes-extended/gawk/gawk/remove-sensitive-tests.patch new file mode 100644 index 0000000000..167c0787ee --- /dev/null +++ b/meta/recipes-extended/gawk/gawk/remove-sensitive-tests.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | These tests require an unloaded host as otherwise timing sensitive tests can fail | ||
2 | https://bugzilla.yoctoproject.org/show_bug.cgi?id=14371 | ||
3 | |||
4 | Upstream-Status: Inappropriate | ||
5 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
6 | |||
7 | --- a/test/Maketests~ | ||
8 | +++ b/test/Maketests | ||
9 | @@ -2069,7 +2069,2 @@ | ||
10 | |||
11 | -timeout: | ||
12 | - @echo $@ $(ZOS_FAIL) | ||
13 | - @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ | ||
14 | - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ | ||
15 | - | ||
16 | typedregex1: | ||
17 | @@ -2297,7 +2292,2 @@ | ||
18 | @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ | ||
19 | - | ||
20 | -time: | ||
21 | - @echo $@ | ||
22 | - @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ | ||
23 | - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ | ||
24 | |||
diff --git a/meta/recipes-extended/gawk/gawk_5.0.1.bb b/meta/recipes-extended/gawk/gawk_5.0.1.bb index e79ccfdebf..1b29ec3113 100644 --- a/meta/recipes-extended/gawk/gawk_5.0.1.bb +++ b/meta/recipes-extended/gawk/gawk_5.0.1.bb | |||
@@ -16,6 +16,7 @@ PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" | |||
16 | PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr" | 16 | PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr" |
17 | 17 | ||
18 | SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ | 18 | SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ |
19 | file://remove-sensitive-tests.patch \ | ||
19 | file://run-ptest \ | 20 | file://run-ptest \ |
20 | " | 21 | " |
21 | 22 | ||
@@ -41,13 +42,20 @@ inherit ptest | |||
41 | do_install_ptest() { | 42 | do_install_ptest() { |
42 | mkdir ${D}${PTEST_PATH}/test | 43 | mkdir ${D}${PTEST_PATH}/test |
43 | ln -s ${bindir}/gawk ${D}${PTEST_PATH}/gawk | 44 | ln -s ${bindir}/gawk ${D}${PTEST_PATH}/gawk |
44 | for i in `grep -vE "@|^$|#|Gt-dummy" ${S}/test/Maketests |awk -F: '{print $1}'` Maketests inclib.awk; \ | 45 | # The list of tests is all targets in Maketests, apart from the dummy Gt-dummy |
45 | do cp ${S}/test/$i* ${D}${PTEST_PATH}/test; \ | 46 | TESTS=$(awk -F: '$1 == "Gt-dummy" { next } /[[:alnum:]]+:$/ { print $1 }' ${S}/test/Maketests) |
47 | for i in $TESTS Maketests inclib.awk; do | ||
48 | cp ${S}/test/$i* ${D}${PTEST_PATH}/test | ||
46 | done | 49 | done |
47 | sed -i -e 's|/usr/local/bin|${bindir}|g' \ | 50 | sed -i -e 's|/usr/local/bin|${bindir}|g' \ |
48 | -e 's|#!${base_bindir}/awk|#!${bindir}/awk|g' ${D}${PTEST_PATH}/test/*.awk | 51 | -e 's|#!${base_bindir}/awk|#!${bindir}/awk|g' ${D}${PTEST_PATH}/test/*.awk |
49 | 52 | ||
50 | sed -i -e "s|GAWKLOCALE|LANG|g" ${D}${PTEST_PATH}/test/Maketests | 53 | sed -i -e "s|GAWKLOCALE|LANG|g" ${D}${PTEST_PATH}/test/Maketests |
54 | |||
55 | # These tests require an unloaded host as otherwise timing sensitive tests can fail | ||
56 | # https://bugzilla.yoctoproject.org/show_bug.cgi?id=14371 | ||
57 | rm -f ${D}${PTEST_PATH}/test/time.* | ||
58 | rm -f ${D}${PTEST_PATH}/test/timeout.* | ||
51 | } | 59 | } |
52 | 60 | ||
53 | RDEPENDS_${PN}-ptest += "make" | 61 | RDEPENDS_${PN}-ptest += "make" |