From 0271027790063e391fe23ca6c20fb4d900e7ef6d Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Tue, 19 Mar 2013 10:06:01 +0000
Subject: [Bug 3606387]: Fix isolation of test scan-7.4.

---
 tests/scan.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/scan.test b/tests/scan.test
index 34351e0..d7b72d5 100644
--- a/tests/scan.test
+++ b/tests/scan.test
@@ -481,7 +481,7 @@ test scan-7.3 {string and character scanning} {
     list [scan "123456 test " "%*c%*s %s %s %s" a b c] $a $b $c
 } {1 test {} {}}
 test scan-7.4 {string and character scanning} {
-    set a {}; set b {}; set c {}; set d
+    set a {}; set b {}; set c {}; set d {}
     list [scan "ababcd01234  f 123450" {%4[abcd] %4[abcd] %[^abcdef] %[^0]} a b c d] $a $b $c $d
 } {4 abab cd {01234  } {f 12345}}
 test scan-7.5 {string and character scanning} {
-- 
cgit v0.12


From 1e752d8ad7755a862ef7cd5d45f3b157b566cd35 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Tue, 19 Mar 2013 10:16:12 +0000
Subject: [Bug 3606390]: Fix isolation of test string-6.37.

---
 tests/string.test | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/string.test b/tests/string.test
index c3cfc3c..7a7a749 100644
--- a/tests/string.test
+++ b/tests/string.test
@@ -404,13 +404,15 @@ test string-6.35 {string is double, false} {
 test string-6.36 {string is double, false} {
     list [string is double -fail var "\n"] $var
 } {0 0}
-test string-6.37 {string is double, false on int overflow} {
+test string-6.37 {string is double, false on int overflow} -setup {
+    set var priorValue
+} -body {
     # Make it the largest int recognizable, with one more digit for overflow
     # Since bignums arrived in Tcl 8.5, the sense of this test changed.
     # Now integer values that exceed native limits become bignums, and
     # bignums can convert to doubles without error.
     list [string is double -fail var [largest_int]0] $var
-} {1 0}
+} -result {1 priorValue}
 # string-6.38 removed, underflow on input is no longer an error.
 test string-6.39 {string is double, false} {
     # This test is non-portable because IRIX thinks 
-- 
cgit v0.12