summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-11-30 21:05:49 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-11-30 21:05:49 (GMT)
commita8eb4be9f28af1b8a6bf8e78dbe7964625b70f28 (patch)
tree6fd1948dd1678b08051bb55e2875b9857b5bc23f
parentb774a7b73682ce8dec7ce3a91c495205fbb6adae (diff)
parentb62d0cd535ee81ad4c8929d41895817b0159ef40 (diff)
downloadtcl-a8eb4be9f28af1b8a6bf8e78dbe7964625b70f28.zip
tcl-a8eb4be9f28af1b8a6bf8e78dbe7964625b70f28.tar.gz
tcl-a8eb4be9f28af1b8a6bf8e78dbe7964625b70f28.tar.bz2
[Bug 967195]: Make tcltest work when tclsh is compiled without using the setargv() function on mingw.
-rw-r--r--ChangeLog6
-rw-r--r--library/tcltest/pkgIndex.tcl2
-rw-r--r--library/tcltest/tcltest.tcl14
-rw-r--r--tests/init.test2
-rw-r--r--unix/Makefile.in4
-rw-r--r--win/Makefile.in6
6 files changed, 24 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d91aba..1a3d6d8 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>
* win/Makefile.in: don't install tommath_(super)?class.h
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 {
diff --git a/tests/init.test b/tests/init.test
index 79d9a04..41b8624 100644
--- a/tests/init.test
+++ b/tests/init.test
@@ -11,7 +11,7 @@
# this file, and for a DISCLAIMER OF ALL WARRANTIES.
if {"::tcltest" ni [namespace children]} {
- package require tcltest 2.3.3
+ package require tcltest 2.3.4
namespace import -force ::tcltest::*
}
diff --git a/unix/Makefile.in b/unix/Makefile.in
index eb1af89..154f1b9 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -838,8 +838,8 @@ install-libraries: libraries
done;
@echo "Installing package msgcat 1.4.4 as a Tcl Module";
@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.4.tm;
- @echo "Installing package tcltest 2.3.3 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.3.tm;
+ @echo "Installing package tcltest 2.3.4 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.4.tm;
@echo "Installing package platform 1.0.10 as a Tcl Module";
@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.10.tm;
diff --git a/win/Makefile.in b/win/Makefile.in
index 47640bb..8880dc6 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -648,7 +648,7 @@ install-libraries: libraries install-tzdata install-msgs
"$(GENERIC_DIR)/tclOO.h" "$(GENERIC_DIR)/tclOODecls.h" \
"$(GENERIC_DIR)/tclPlatDecls.h" \
"$(GENERIC_DIR)/tclTomMath.h" \
- "$(GENERIC_DIR)/tclTomMathDecls.h" \
+ "$(GENERIC_DIR)/tclTomMathDecls.h"; \
do \
$(COPY) "$$i" "$(INCLUDE_INSTALL_DIR)"; \
done;
@@ -671,8 +671,8 @@ install-libraries: libraries install-tzdata install-msgs
done;
@echo "Installing package msgcat 1.4.4 as a Tcl Module";
@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/msgcat-1.4.4.tm;
- @echo "Installing package tcltest 2.3.3 as a Tcl Module";
- @$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3.3.tm;
+ @echo "Installing package tcltest 2.3.4 as a Tcl Module";
+ @$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3.4.tm;
@echo "Installing package platform 1.0.10 as a Tcl Module";
@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.10.tm;
@echo "Installing package platform::shell 1.1.4 as a Tcl Module";