From 2d959d1fdfbd7e020f5177b1a7ff6a08809536ca Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Mon, 12 Jul 2021 14:50:13 +0100
Subject: [PATCH] tcl: fix race in interp.test

The interp-36.7 patch has race conditions and is missing cleanup.  This patch by
a Tcl maintainer should improve matters.

Upstream-Status: Inappropriate [tcl 8.x is obsolete; upstream submission should be for 9.x patches]
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 tests/interp.test | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/interp.test b/tests/interp.test
index d64fdd4..9931dd1 100644
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -3651,17 +3651,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
 
