summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-11-30 21:01:38 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-11-30 21:01:38 (GMT)
commitb62d0cd535ee81ad4c8929d41895817b0159ef40 (patch)
tree8add2ba97612e4effb4639bc13796f52cad3858d /library
parentde31dba2a563beaf59a669f640312d21dacdc115 (diff)
parentd526e52856c864ba6af3ae8a0b83fc2a9faa06cf (diff)
downloadtcl-b62d0cd535ee81ad4c8929d41895817b0159ef40.zip
tcl-b62d0cd535ee81ad4c8929d41895817b0159ef40.tar.gz
tcl-b62d0cd535ee81ad4c8929d41895817b0159ef40.tar.bz2
[Bug 967195]: Make tcltest work when tclsh is compiled without using the setargv() function on mingw.
Diffstat (limited to 'library')
-rw-r--r--library/tcltest/pkgIndex.tcl2
-rw-r--r--library/tcltest/tcltest.tcl14
2 files changed, 12 insertions, 4 deletions
diff --git a/library/tcltest/pkgIndex.tcl b/library/tcltest/pkgIndex.tcl
index 2eb43a6..0e4568d 100644
--- a/library/tcltest/pkgIndex.tcl
+++ b/library/tcltest/pkgIndex.tcl
@@ -9,4 +9,4 @@
# full path name of this file's directory.
if {![package vsatisfies [package provide Tcl] 8.5]} {return}
-package ifneeded tcltest 2.3.3 [list source [file join $dir tcltest.tcl]]
+package ifneeded tcltest 2.3.4 [list source [file join $dir tcltest.tcl]]
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index af809f6..02da62f 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -22,7 +22,7 @@ namespace eval tcltest {
# When the version number changes, be sure to update the pkgIndex.tcl file,
# and the install directory in the Makefiles. When the minor version
# changes (new feature) be sure to update the man page as well.
- variable Version 2.3.3
+ variable Version 2.3.4
# Compatibility support for dumb variables defined in tcltest 1
# Do not use these. Call [package provide Tcl] and [info patchlevel]
@@ -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 {
@@ -708,7 +710,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 \
@@ -2716,6 +2718,7 @@ proc tcltest::runAllTests { {shell ""} } {
variable numTestFiles
variable numTests
variable failFiles
+ variable DefaultValue
FillFilesExisted
if {[llength [info level 0]] == 1} {
@@ -2780,7 +2783,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 {