summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-01-17 10:00:58 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-01-17 10:00:58 (GMT)
commit592e0f1dd91bee030010bd5efb84d9f6d976f22a (patch)
tree95f33dbb886ccd342d82c9ef102e9993d41d127a
parent9dcacf853204f3d0a155842d157fe8de21d61eff (diff)
downloadtcl-592e0f1dd91bee030010bd5efb84d9f6d976f22a.zip
tcl-592e0f1dd91bee030010bd5efb84d9f6d976f22a.tar.gz
tcl-592e0f1dd91bee030010bd5efb84d9f6d976f22a.tar.bz2
Test-cases which require Tcl 8.5 (or 8.6) should continue to work unmodified in Tcl 9.0. The "novem" branch will show whether this continues to work.
-rw-r--r--tests/all.tcl2
-rw-r--r--tests/httpd11.tcl2
-rw-r--r--tests/httpold.test2
-rw-r--r--tests/msgcat.test48
-rw-r--r--tests/safe.test2
-rw-r--r--tests/tm.test4
6 files changed, 30 insertions, 30 deletions
diff --git a/tests/all.tcl b/tests/all.tcl
index 0a6f57f..69a16ba 100644
--- a/tests/all.tcl
+++ b/tests/all.tcl
@@ -11,7 +11,7 @@
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
package prefer latest
-package require Tcl 8.5
+package require Tcl 8.5-
package require tcltest 2.2
namespace import tcltest::*
configure {*}$argv -testdir [file dir [info script]]
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]} {
diff --git a/tests/httpold.test b/tests/httpold.test
index aeba311..5995bed 100644
--- a/tests/httpold.test
+++ b/tests/httpold.test
@@ -36,7 +36,7 @@ if {[catch {package require http 1.0}]} {
set bindata "This is binary data\x0d\x0amore\x0dmore\x0amore\x00null"
catch {unset data}
-##
+##
## The httpd script implement a stub http server
##
source [file join [file dirname [info script]] httpd]
diff --git a/tests/msgcat.test b/tests/msgcat.test
index ae35272..1c3ce58 100644
--- a/tests/msgcat.test
+++ b/tests/msgcat.test
@@ -12,7 +12,7 @@
# Note that after running these tests, entries will be left behind in the
# message catalogs for locales foo, foo_BAR, and foo_BAR_baz.
-package require Tcl 8.5
+package require Tcl 8.5-
if {[catch {package require tcltest 2}]} {
puts stderr "Skipping tests in [info script]. tcltest 2 required."
return
@@ -51,7 +51,7 @@ namespace eval ::msgcat::test {
variable body
variable result
variable setVars
- foreach setVars [PowerSet $envVars] {
+ foreach setVars [PowerSet $envVars] {
set result [string tolower [lindex $setVars 0]]
if {[string length $result] == 0} {
if {[info exists ::tcl::mac::locale]} {
@@ -94,7 +94,7 @@ namespace eval ::msgcat::test {
incr count
}
unset -nocomplain result
-
+
# Could add tests of initialization from Windows registry here.
# Use a fake registry package.
@@ -294,11 +294,11 @@ namespace eval ::msgcat::test {
variable count 2
variable result
array set result {
- foo,ov0 ov0_ROOT foo,ov1 ov1_foo foo,ov2 ov2_foo
+ foo,ov0 ov0_ROOT foo,ov1 ov1_foo foo,ov2 ov2_foo
foo,ov3 ov3_foo foo,ov4 ov4
- foo_BAR,ov0 ov0_ROOT foo_BAR,ov1 ov1_foo foo_BAR,ov2 ov2_foo_BAR
- foo_BAR,ov3 ov3_foo_BAR foo_BAR,ov4 ov4
- foo_BAR_baz,ov0 ov0_ROOT foo_BAR_baz,ov1 ov1_foo
+ foo_BAR,ov0 ov0_ROOT foo_BAR,ov1 ov1_foo foo_BAR,ov2 ov2_foo_BAR
+ foo_BAR,ov3 ov3_foo_BAR foo_BAR,ov4 ov4
+ foo_BAR_baz,ov0 ov0_ROOT foo_BAR_baz,ov1 ov1_foo
foo_BAR_baz,ov2 ov2_foo_BAR
foo_BAR_baz,ov3 ov3_foo_BAR_baz foo_BAR_baz,ov4 ov4
}
@@ -417,12 +417,12 @@ namespace eval ::msgcat::test {
variable locale [mclocale]
::msgcat::mclocale ""
::msgcat::mcloadedlocales clear
- ::msgcat::mcpackageconfig unset mcfolder
+ ::msgcat::mcpackageconfig unset mcfolder
mclocale $loc
} -cleanup {
mclocale $locale
::msgcat::mcloadedlocales clear
- ::msgcat::mcpackageconfig unset mcfolder
+ ::msgcat::mcpackageconfig unset mcfolder
} -body {
mcload $msgdir
} -result [expr { $count+1 }]
@@ -437,7 +437,7 @@ namespace eval ::msgcat::test {
} -cleanup {
mclocale $locale
mcloadedlocales clear
- mcpackageconfig unset mcfolder
+ mcpackageconfig unset mcfolder
} -body {
mcload $msgdir
} -result 3
@@ -448,7 +448,7 @@ namespace eval ::msgcat::test {
} -cleanup {
mclocale $locale
mcloadedlocales clear
- mcpackageconfig unset mcfolder
+ mcpackageconfig unset mcfolder
} -body {
mcload $msgdir
} -result 1
@@ -517,7 +517,7 @@ namespace eval ::msgcat::test {
} -cleanup {
mclocale $locale
mcloadedlocales clear
- mcpackageconfig unset mcfolder
+ mcpackageconfig unset mcfolder
} -body {
mclocale foo
mcpackageconfig set mcfolder $msgdir
@@ -536,7 +536,7 @@ namespace eval ::msgcat::test {
# Tests msgcat-6.*: [mcset], [mc] namespace inheritance
#
# Test mcset and mc, ensuring that resolution for messages
-# proceeds from the current ns to its parent and so on to the
+# proceeds from the current ns to its parent and so on to the
# global ns.
#
# Do this for the 12 permutations of
@@ -580,7 +580,7 @@ namespace eval ::msgcat::test {
::msgcat::mcset foo ov3 "ov3_foo_bar_baz"
}
}
-
+
}
variable locale [mclocale]
mclocale foo
@@ -689,12 +689,12 @@ namespace eval ::msgcat::test {
mcexists
} -returnCodes 1\
-result {wrong # args: should be "mcexists ?-exactnamespace? ?-exactlocale? src"}
-
+
test msgcat-9.2 {mcexists unknown option} -body {
- mcexists -unknown src
+ mcexists -unknown src
} -returnCodes 1\
-result {unknown option "-unknown"}
-
+
test msgcat-9.3 {mcexists} -setup {
mcforgetpackage
variable locale [mclocale]
@@ -716,7 +716,7 @@ namespace eval ::msgcat::test {
} -body {
list [mcexists k1] [mcexists -exactlocale k1]
} -result {1 0}
-
+
test msgcat-9.5 {mcexists parent namespace} -setup {
mcforgetpackage
variable locale [mclocale]
@@ -730,19 +730,19 @@ namespace eval ::msgcat::test {
[::msgcat::mcexists -exactnamespace k1]
}
} -result {1 0}
-
+
# Tests msgcat-10.*: [mcloadedlocales]
test msgcat-10.1 {mcloadedlocales no arg} -body {
mcloadedlocales
} -returnCodes 1\
-result {wrong # args: should be "mcloadedlocales subcommand"}
-
+
test msgcat-10.2 {mcloadedlocales wrong subcommand} -body {
mcloadedlocales junk
} -returnCodes 1\
-result {unknown subcommand "junk": must be clear, or loaded}
-
+
test msgcat-10.3 {mcloadedlocales loaded} -setup {
mcforgetpackage
variable locale [mclocale]
@@ -755,7 +755,7 @@ namespace eval ::msgcat::test {
# The result is position independent so sort
set resultlist [lsort [mcloadedlocales loaded]]
} -result {{} foo foo_bar}
-
+
test msgcat-10.4 {mcloadedlocales clear} -setup {
mcforgetpackage
variable locale [mclocale]
@@ -961,9 +961,9 @@ namespace eval ::msgcat::test {
} -result {0 0 1 0}
# option mcfolder is already tested with 5.11
-
+
# Tests msgcat-14.*: callbacks: loadcmd, changecmd, unknowncmd
-
+
# This routine is used as bgerror and by direct callback invocation
proc callbackproc args {
variable resultvariable
diff --git a/tests/safe.test b/tests/safe.test
index 6c9c6c9..e43ce12 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -10,7 +10,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.5
+package require Tcl 8.5-
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest 2
diff --git a/tests/tm.test b/tests/tm.test
index 1b22f8c..567d351 100644
--- a/tests/tm.test
+++ b/tests/tm.test
@@ -6,7 +6,7 @@
# Copyright (c) 2004 by Donal K. Fellows.
# All rights reserved.
-package require Tcl 8.5
+package require Tcl 8.5-
if {"::tcltest" ni [namespace children]} {
package require tcltest 2
namespace import -force ::tcltest::*
@@ -200,7 +200,7 @@ test tm-3.11 {tm: module path management, remove ignores unknown path} -setup {
proc genpaths {base} {
# Normalizing picks up drive letters on windows [Bug 1053568]
set base [file normalize $base]
- lassign [split [package present Tcl] .] major minor
+ lassign [split [package present Tcl] .] major minor
set results {}
set base [file join $base tcl$major]
lappend results [file join $base site-tcl]