summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-09-04 23:36:04 -0700
committerSteve Sakoman <steve@sakoman.com>2023-10-11 03:54:46 -1000
commitaa56c1b8fa59a7375214f7857b4943afdbab3e62 (patch)
tree81e800c3e9ae0f5b032e3caf6e873ad46edbb49f
parentc46f32ccf4681912b189bb43c72234d18df4a392 (diff)
downloadpoky-aa56c1b8fa59a7375214f7857b4943afdbab3e62.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: c6f4728d4e483067e353e91f5fb20ed552e6c911) 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-ptest4
-rw-r--r--meta/recipes-devtools/tcltk/tcl_8.6.13.bb5
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
4export TZ="Europe/London" 4export TZ="Europe/London"
5export TCL_LIBRARY=library 5export TCL_LIBRARY=library
6 6SKIPPED_TESTS=
7for i in `ls tests/*.test | awk -F/ '{print $2}'`; do 7for 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.13.bb b/meta/recipes-devtools/tcltk/tcl_8.6.13.bb
index 921ea7a01d..677a5822bd 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.13.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.13.bb
@@ -90,6 +90,11 @@ do_install_ptest() {
90 cp -r ${S}/tests ${D}${PTEST_PATH} 90 cp -r ${S}/tests ${D}${PTEST_PATH}
91} 91}
92 92
93do_install_ptest:append:libc-musl () {
94 # Assumes locales other than provided by musl-locales
95 sed -i -e 's|SKIPPED_TESTS=|SKIPPED_TESTS="unixInit-3*"|' ${D}${PTEST_PATH}/run-ptest
96}
97
93# Fix some paths that might be used by Tcl extensions 98# Fix some paths that might be used by Tcl extensions
94BINCONFIG_GLOB = "*Config.sh" 99BINCONFIG_GLOB = "*Config.sh"
95 100