diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-09-04 23:36:04 -0700 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2024-04-19 04:50:39 -0700 |
commit | f3e5f706b4081bcd30819deedef82d08ef2e084e (patch) | |
tree | 451b15c27ad5bfe9aa6159f65e7405cb5d8b20bc | |
parent | ca3bb1f53edd77f581e616b3382eeb8af25e06d1 (diff) | |
download | poky-f3e5f706b4081bcd30819deedef82d08ef2e084e.tar.gz |
tcl: Add a way to skip ptests
Some tests hardcode assumptions on locales, which may not be present in
musl systems e.g., therefore add a way to skip such tests using -skip
option.
Skip unixInit-3* test on musl
(From OE-Core rev: a70f9039259d7d38c5a3e50f7003d3228d1ab692)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit fa66f1cee2d88c2276442e8b4aaeccde5490f9ea)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/run-ptest | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/run-ptest b/meta/recipes-devtools/tcltk/tcl/run-ptest index a62b703082..5b9127784e 100644 --- a/meta/recipes-devtools/tcltk/tcl/run-ptest +++ b/meta/recipes-devtools/tcltk/tcl/run-ptest | |||
@@ -3,9 +3,9 @@ | |||
3 | # clock.test needs a timezone to be set | 3 | # clock.test needs a timezone to be set |
4 | export TZ="Europe/London" | 4 | export TZ="Europe/London" |
5 | export TCL_LIBRARY=library | 5 | export TCL_LIBRARY=library |
6 | 6 | SKIPPED_TESTS= | |
7 | for i in `ls tests/*.test | awk -F/ '{print $2}'`; do | 7 | for i in `ls tests/*.test | awk -F/ '{print $2}'`; do |
8 | ./tcltest tests/all.tcl -file $i >$i.log 2>&1 | 8 | ./tcltest tests/all.tcl -file $i -skip "$SKIPPED_TESTS" >$i.log 2>&1 |
9 | grep -q -F -e "Files with failing tests:" -e "Test files exiting with errors:" $i.log | 9 | grep -q -F -e "Files with failing tests:" -e "Test files exiting with errors:" $i.log |
10 | if [ $? -eq 0 ]; then | 10 | if [ $? -eq 0 ]; then |
11 | echo "FAIL: $i" | 11 | echo "FAIL: $i" |
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb index b591671868..f8f3d7dd3f 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb | |||
@@ -89,6 +89,11 @@ do_install_ptest() { | |||
89 | cp -r ${S}/tests ${D}${PTEST_PATH} | 89 | cp -r ${S}/tests ${D}${PTEST_PATH} |
90 | } | 90 | } |
91 | 91 | ||
92 | do_install_ptest:append:libc-musl () { | ||
93 | # Assumes locales other than provided by musl-locales | ||
94 | sed -i -e 's|SKIPPED_TESTS=|SKIPPED_TESTS="unixInit-3*"|' ${D}${PTEST_PATH}/run-ptest | ||
95 | } | ||
96 | |||
92 | # Fix some paths that might be used by Tcl extensions | 97 | # Fix some paths that might be used by Tcl extensions |
93 | BINCONFIG_GLOB = "*Config.sh" | 98 | BINCONFIG_GLOB = "*Config.sh" |
94 | 99 | ||