From 9c5e226ba42a4f8bca6775d7f635e76f5dc373ed Mon Sep 17 00:00:00 2001
From: "dgp@users.sourceforge.net" <dgp>
Date: Fri, 7 Nov 2014 14:49:31 +0000
Subject: Restore test menu-32.8

---
 generic/tkMenu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index 3808b09..49b5935 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -1466,9 +1466,9 @@ DestroyMenuEntry(
 		if (menuRefPtr->menuPtr == destroyThis) {
 		    menuRefPtr->menuPtr = NULL;
 		}
-		if (destroyThis != NULL) {
-		    TkDestroyMenu(destroyThis);
-		}
+	    }
+	    if (destroyThis != NULL) {
+		TkDestroyMenu(destroyThis);
 	    }
 	} else {
 	    UnhookCascadeEntry(mePtr);
-- 
cgit v0.12


From ad2b0bf80e4d51715c8bb69951ef99ff08b33357 Mon Sep 17 00:00:00 2001
From: "dgp@users.sourceforge.net" <dgp>
Date: Fri, 7 Nov 2014 15:33:19 +0000
Subject: Stop test litter breaking scale-19.

---
 tests/canvText.test | 6 ++++--
 tests/scale.test    | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/canvText.test b/tests/canvText.test
index 070011b..20a39b0 100644
--- a/tests/canvText.test
+++ b/tests/canvText.test
@@ -501,7 +501,7 @@ end
 %%EOF
 "
 
-test canvText-18.1 {bug fix 2525, find enclosed on text with newlines} {
+test canvText-18.1 {bug fix 2525, find enclosed on text with newlines} -body {
     catch {destroy .c}
     canvas .c
     pack .c
@@ -513,7 +513,9 @@ test canvText-18.1 {bug fix 2525, find enclosed on text with newlines} {
     incr y2
     update
     .c find enclosed 99 99 [expr $x2 + $i] [expr $y2 + 1]
-} 1
+} -cleanup {
+    unset -nocomplain bbox x2 y2
+} -result 1
 
 test canvText-19.1 {patch 1006286, leading space caused wrap under Win32} {
     catch {destroy .c}
diff --git a/tests/scale.test b/tests/scale.test
index 73d0f2d..f8e58bb 100644
--- a/tests/scale.test
+++ b/tests/scale.test
@@ -871,6 +871,7 @@ test scale-19 {Bug [3529885fff] - Click in through goes in wrong direction} \
     -setup {
         catch {destroy .s}
         catch {destroy .s1 .s2 .s3 .s4}
+        unset -nocomplain x1 x2 x3 x4 x y
         scale .s1 -from 0 -to 100 -resolution 1  -variable x1 -digits 4 -orient horizontal -length 100
         scale .s2 -from 0 -to 100 -resolution -1 -variable x2 -digits 4 -orient horizontal -length 100
         scale .s3 -from 100 -to 0 -resolution 1  -variable x3 -digits 4 -orient horizontal -length 100
-- 
cgit v0.12