From d526e52856c864ba6af3ae8a0b83fc2a9faa06cf Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 30 Nov 2011 20:45:21 +0000
Subject: [Bug 967195]: Make tcltest work when tclsh is compiled without using
 the setargv() function on mingw (no need to incr the version, since 2.2.10 is
 never released)

---
 ChangeLog                   |  6 ++++++
 library/tcltest/tcltest.tcl | 12 ++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b59f373..86cfbc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-30  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* library/tcltest/tcltest.tcl: [Bug 967195]: Make tcltest work
+	when tclsh is compiled without using the setargv() function on mingw.
+	(no need to incr the version, since 2.2.10 is never released)
+
 2011-11-29  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* doc/tclsh.1:  Use the same shebang comment everywhere.
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 8e70628..4ae1480c 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -483,8 +483,10 @@ namespace eval tcltest {
 	variable Verify
 	variable Usage
 	variable OptionControlledVariables
+	variable DefaultValue
 	set Usage($option) $usage
 	set Verify($option) $verify
+	set DefaultValue($option) $value
 	if {[catch {$verify $value} msg]} {
 	    return -code error $msg
 	} else {
@@ -707,7 +709,7 @@ namespace eval tcltest {
 	    }
 	}
     }
-    Option -limitconstraints false {
+    Option -limitconstraints 0 {
 	whether to run only tests with the constraints
     } AcceptBoolean limitConstraints 
     trace variable Option(-limitconstraints) w \
@@ -2664,6 +2666,7 @@ proc tcltest::runAllTests { {shell ""} } {
     variable numTestFiles
     variable numTests
     variable failFiles
+    variable DefaultValue
 
     FillFilesExisted
     if {[llength [info level 0]] == 1} {
@@ -2728,7 +2731,12 @@ proc tcltest::runAllTests { {shell ""} } {
 	    set childargv [list]
 	    foreach opt [Configure] {
 		if {[string equal $opt -outfile]} {continue}
-		lappend childargv $opt [Configure $opt]
+		set value [Configure $opt]
+		# Don't bother passing default configuration options
+		if {[string equal $value $DefaultValue($opt)]} {
+			continue
+		}
+		lappend childargv $opt $value
 	    }
 	    set cmd [linsert $childargv 0 | $shell $file]
 	    if {[catch {
-- 
cgit v0.12