summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-01-23 09:11:34 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-01-23 09:11:34 (GMT)
commit000147c3a5bd1e6c44efc6e8f56f8e61c86fc0d4 (patch)
tree713c68ff63524c90b5f59d85a3f146f0cb45d145 /tests
parent814bdc470b9b20e53414976461a9c8bd41651f8d (diff)
parentf73959c2df224df88d79415e16dfab56b8756008 (diff)
downloadtcl-000147c3a5bd1e6c44efc6e8f56f8e61c86fc0d4.zip
tcl-000147c3a5bd1e6c44efc6e8f56f8e61c86fc0d4.tar.gz
tcl-000147c3a5bd1e6c44efc6e8f56f8e61c86fc0d4.tar.bz2
Merge trunk
Diffstat (limited to 'tests')
-rw-r--r--tests/clock.test4
-rw-r--r--tests/httpd11.tcl2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/clock.test b/tests/clock.test
index 08036ca..6a0fecd 100644
--- a/tests/clock.test
+++ b/tests/clock.test
@@ -37009,10 +37009,10 @@ test clock-67.5 {Change scan %x output on global locale change [Bug 4a0c163d24]}
set current [msgcat::mclocale]
} -body {
msgcat::mclocale de_de
- set res [clock scan "01.01.1970" -locale current -format %x]
+ set res [clock scan "01.01.1970" -locale current -format %x -gmt 1]
msgcat::mclocale en_uk
# This will fail without the bug fix, as still de_de is active
- expr {$res == [clock scan "01/01/1970" -locale current -format %x]}
+ expr {$res == [clock scan "01/01/1970" -locale current -format %x -gmt 1]}
} -cleanup {
msgcat::mclocale $current
} -result {1}
diff --git a/tests/httpd11.tcl b/tests/httpd11.tcl
index 6eae2b7..7880494 100644
--- a/tests/httpd11.tcl
+++ b/tests/httpd11.tcl
@@ -8,7 +8,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-package require Tcl 8.6
+package require Tcl 8.6-
proc ::tcl::dict::get? {dict key} {
if {[dict exists $dict $key]} {