tcl: fix race in interp.test

There's a timeout race in interp which is exposed when running under load.

(From OE-Core rev: bcd792270676beeac73f3900346184dec24d00a1)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2021-07-12 14:50:13 +01:00 committed by Richard Purdie
parent 3a4da0d8f7
commit b59f420dea
2 changed files with 33 additions and 0 deletions

View File

@ -0,0 +1,32 @@
The interp-36.7 patch has race conditions and is missing cleanup. This patch by
a Tcl maintainer should improve matters.
Upstream-Status: Pending
Signed-off-by: Ross Burton <ross.burton@arm.com>
diff --git a/tests/interp.test b/tests/interp.test
index d7424847f..fc90990f3 100644
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -3595,17 +3595,18 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup {
variable result
set result [lindex $args 0]
}
+ set tout [after 5000 {set result timeout}]
} -body {
child eval {
variable done {}
after 0 error foo
- after 10 [list ::set [namespace which -variable done] {}]
- vwait [namespace which -variable done]
}
+ vwait result
set result
} -cleanup {
+ after cancel $tout
variable result {}
- unset -nocomplain result
+ unset -nocomplain result tout
interp delete child
} -result foo

View File

@ -22,6 +22,7 @@ SRC_URI = "${BASE_SRC_URI} \
file://fix_issue_with_old_distro_glibc.patch \
file://tcl-remove-hardcoded-install-path.patch \
file://alter-includedir.patch \
file://interp.patch \
file://run-ptest \
"
SRC_URI[sha256sum] = "cfb49aab82bd179651e23eeeb69606f51b0ddc575ca55c3d35e2457469024cfa"