From b7d2ed098d4da0c69bea2284a85c32b2c5b963d2 Mon Sep 17 00:00:00 2001 From: rjohnson Date: Sat, 26 Jun 1999 20:55:07 +0000 Subject: Fixed style problems in many of the test files. Fixed bug in pkg.test where defs.tcl was still being used. --- tests/init.test | 4 ++-- tests/interp.test | 20 ++++++++++---------- tests/namespace.test | 18 +++++++++--------- tests/parseOld.test | 4 ++-- tests/pid.test | 4 ++-- tests/pkg.test | 7 ++++--- tests/pkgMkIndex.test | 4 ++-- tests/platform.test | 2 +- tests/proc-old.test | 4 ++-- tests/proc.test | 4 ++-- tests/pwd.test | 4 ++-- tests/reg.test | 4 ++-- tests/regexp.test | 4 ++-- tests/registry.test | 4 ++-- tests/rename.test | 4 ++-- tests/resource.test | 4 ++-- tests/result.test | 2 +- tests/safe.test | 4 ++-- tests/scan.test | 4 ++-- tests/security.test | 4 ++-- tests/set-old.test | 4 ++-- tests/set.test | 4 ++-- tests/socket.test | 4 ++-- tests/source.test | 4 ++-- tests/split.test | 4 ++-- tests/stack.test | 4 ++-- tests/string.test | 4 ++-- tests/stringObj.test | 4 ++-- tests/subst.test | 4 ++-- tests/switch.test | 4 ++-- tests/thread.test | 4 ++-- tests/timer.test | 4 ++-- tests/trace.test | 4 ++-- tests/unixFCmd.test | 4 ++-- tests/unixFile.test | 4 ++-- tests/unixInit.test | 4 ++-- tests/unixNotfy.test | 4 ++-- tests/unknown.test | 4 ++-- tests/uplevel.test | 4 ++-- tests/upvar.test | 4 ++-- tests/utf.test | 4 ++-- tests/util.test | 4 ++-- tests/var.test | 16 ++++++++-------- tests/while-old.test | 4 ++-- tests/while.test | 4 ++-- tests/winConsole.test | 4 ++-- tests/winDde.test | 4 ++-- tests/winFCmd.test | 4 ++-- tests/winFile.test | 4 ++-- tests/winNotify.test | 4 ++-- tests/winPipe.test | 4 ++-- tests/winTime.test | 4 ++-- 52 files changed, 125 insertions(+), 124 deletions(-) diff --git a/tests/init.test b/tests/init.test index bd9b486..e9d49b9 100644 --- a/tests/init.test +++ b/tests/init.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. # -# RCS: @(#) $Id: init.test,v 1.4 1999/06/26 03:54:15 jenn Exp $ +# RCS: @(#) $Id: init.test,v 1.5 1999/06/26 20:55:07 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -144,7 +144,7 @@ test init-2.8 {load http::geturl (package)} { test init-3.0 {random stuff in the auto_index, should still work} { set auto_index(foo:::bar::blah) { - namespace eval foo {namespace eval bar {proc blah {} {return 1}}} + namespace eval foo {namespace eval bar {proc blah {} {return 1}}} } foo:::bar::blah } 1 diff --git a/tests/interp.test b/tests/interp.test index f4fe2ce..ed37f6b 100644 --- a/tests/interp.test +++ b/tests/interp.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. # -# RCS: @(#) $Id: interp.test,v 1.8 1999/06/26 03:54:15 jenn Exp $ +# RCS: @(#) $Id: interp.test,v 1.9 1999/06/26 20:55:08 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -1444,7 +1444,7 @@ test interp-20.45 {interp hide vs namespaces} { catch {interp delete a} interp create a a eval { - namespace eval foo {} + namespace eval foo {} proc foo::x {} {} } set l [list [catch {interp hide a foo::x} msg] $msg] @@ -1455,7 +1455,7 @@ test interp-20.46 {interp hide vs namespaces} { catch {interp delete a} interp create a a eval { - namespace eval foo {} + namespace eval foo {} proc foo::x {} {} } set l [list [catch {interp hide a foo::x x} msg] $msg] @@ -1476,7 +1476,7 @@ test interp-20.48 {interp hide vs namespaces} { catch {interp delete a} interp create a a eval { - namespace eval foo {} + namespace eval foo {} proc foo::x {} {} } set l [list [catch {interp hide a foo::x bar::x} msg] $msg] @@ -2149,7 +2149,7 @@ test interp-27.4 {interp aliases & namespaces} { # test interp-27.5 {interp hidden & namespaces} { # set i [interp create]; # interp eval $i { -# namespace eval foo { +# namespace eval foo { # proc bar {args} { # return "bar called ([namespace current]) ($args)" # } @@ -2174,7 +2174,7 @@ test interp-27.4 {interp aliases & namespaces} { # } # } # interp eval $i { -# namespace eval foo { +# namespace eval foo { # namespace export * # variable v foo-slave; # proc bar {args} { @@ -2188,7 +2188,7 @@ test interp-27.4 {interp aliases & namespaces} { # $i alias foo::bar foo::bar $i; # set res [concat $res [interp eval $i { # set v root-slave; -# namespace eval test { +# namespace eval test { # variable v foo-test; # namespace import ::foo::*; # bar test2 @@ -2212,7 +2212,7 @@ test interp-27.4 {interp aliases & namespaces} { # } # } # interp eval $i { -# namespace eval foo { +# namespace eval foo { # namespace export * # variable v foo-slave; # proc bar {args} { @@ -2221,7 +2221,7 @@ test interp-27.4 {interp aliases & namespaces} { # } # } # set v root-slave; -# namespace eval test { +# namespace eval test { # variable v foo-test; # namespace import ::foo::*; # } @@ -2252,7 +2252,7 @@ test interp-28.1 {getting fooled by slave's namespace ?} { proc master {interp args} {interp hide $interp list} $i alias master master $i; set r [interp eval $i { - namespace eval foo { + namespace eval foo { proc list {args} { return "dummy foo::list"; } diff --git a/tests/namespace.test b/tests/namespace.test index c852a7d..c954aa2 100644 --- a/tests/namespace.test +++ b/tests/namespace.test @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: namespace.test,v 1.5 1999/06/26 03:54:17 jenn Exp $ +# RCS: @(#) $Id: namespace.test,v 1.6 1999/06/26 20:55:08 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -81,14 +81,14 @@ test namespace-5.2 {Tcl_PopCallFrame, local vars must be deleted} { test namespace-6.1 {Tcl_CreateNamespace} { catch {eval namespace delete [namespace children :: test_ns_*]} list [lsort [namespace children :: test_ns_*]] \ - [namespace eval test_ns_1 {namespace current}] \ - [namespace eval test_ns_2 {namespace current}] \ - [namespace eval ::test_ns_3 {namespace current}] \ - [namespace eval ::test_ns_4 \ - {namespace eval foo {namespace current}}] \ - [namespace eval ::test_ns_5 \ - {namespace eval ::test_ns_6 {namespace current}}] \ - [lsort [namespace children :: test_ns_*]] + [namespace eval test_ns_1 {namespace current}] \ + [namespace eval test_ns_2 {namespace current}] \ + [namespace eval ::test_ns_3 {namespace current}] \ + [namespace eval ::test_ns_4 \ + {namespace eval foo {namespace current}}] \ + [namespace eval ::test_ns_5 \ + {namespace eval ::test_ns_6 {namespace current}}] \ + [lsort [namespace children :: test_ns_*]] } {{} ::test_ns_1 ::test_ns_2 ::test_ns_3 ::test_ns_4::foo ::test_ns_6 {::test_ns_1 ::test_ns_2 ::test_ns_3 ::test_ns_4 ::test_ns_5 ::test_ns_6}} test namespace-6.2 {Tcl_CreateNamespace, odd number of :'s in name is okay} { list [namespace eval :::test_ns_1::::foo {namespace current}] \ diff --git a/tests/parseOld.test b/tests/parseOld.test index 50cf625..6f63e7d 100644 --- a/tests/parseOld.test +++ b/tests/parseOld.test @@ -13,11 +13,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: parseOld.test,v 1.3 1999/06/26 03:54:19 jenn Exp $ +# RCS: @(#) $Id: parseOld.test,v 1.4 1999/06/26 20:55:08 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } proc fourArgs {a b c d} { diff --git a/tests/pid.test b/tests/pid.test index a896aaf..b48b75e 100644 --- a/tests/pid.test +++ b/tests/pid.test @@ -11,11 +11,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: pid.test,v 1.4 1999/06/26 03:54:19 jenn Exp $ +# RCS: @(#) $Id: pid.test,v 1.5 1999/06/26 20:55:09 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } # If pid is not defined just return with no error diff --git a/tests/pkg.test b/tests/pkg.test index aa0ea7e..82cc7a5 100644 --- a/tests/pkg.test +++ b/tests/pkg.test @@ -10,18 +10,19 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: pkg.test,v 1.5 1999/06/26 03:54:20 jenn Exp $ +# RCS: @(#) $Id: pkg.test,v 1.6 1999/06/26 20:55:09 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } # Do all this in a slave interp to avoid garbaging the # package list set i [interp create] interp eval $i [list set argv $argv] -interp eval $i [list source [file join $::tcltest::testsDirectory defs.tcl]] +interp eval $i [list package require tcltest] +interp eval $i [list namespace import ::tcltest::*] interp eval $i { eval package forget [package names] diff --git a/tests/pkgMkIndex.test b/tests/pkgMkIndex.test index 8f8313a..6d1b59f 100644 --- a/tests/pkgMkIndex.test +++ b/tests/pkgMkIndex.test @@ -8,11 +8,11 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: pkgMkIndex.test,v 1.9 1999/06/26 03:54:20 jenn Exp $ +# RCS: @(#) $Id: pkgMkIndex.test,v 1.10 1999/06/26 20:55:09 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } set fullPkgPath [file join $::tcltest::testsDirectory pkg] diff --git a/tests/platform.test b/tests/platform.test index c5d9794..e8a69f8 100644 --- a/tests/platform.test +++ b/tests/platform.test @@ -13,7 +13,7 @@ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } test platform-1.1 {TclpSetVariables: tcl_platform} { diff --git a/tests/proc-old.test b/tests/proc-old.test index a802c63..abff6fc 100644 --- a/tests/proc-old.test +++ b/tests/proc-old.test @@ -14,11 +14,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: proc-old.test,v 1.4 1999/06/26 03:54:21 jenn Exp $ +# RCS: @(#) $Id: proc-old.test,v 1.5 1999/06/26 20:55:09 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } catch {rename t1 ""} diff --git a/tests/proc.test b/tests/proc.test index c22a85f..86a9dab 100644 --- a/tests/proc.test +++ b/tests/proc.test @@ -13,11 +13,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: proc.test,v 1.5 1999/06/26 03:54:21 jenn Exp $ +# RCS: @(#) $Id: proc.test,v 1.6 1999/06/26 20:55:09 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } catch {eval namespace delete [namespace children :: test_ns_*]} diff --git a/tests/pwd.test b/tests/pwd.test index c1f6c48..be16809 100644 --- a/tests/pwd.test +++ b/tests/pwd.test @@ -11,11 +11,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: pwd.test,v 1.4 1999/06/26 03:54:22 jenn Exp $ +# RCS: @(#) $Id: pwd.test,v 1.5 1999/06/26 20:55:10 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } test pwd-1.1 {simple pwd} { diff --git a/tests/reg.test b/tests/reg.test index b5bfc8e..9627d72 100644 --- a/tests/reg.test +++ b/tests/reg.test @@ -6,11 +6,11 @@ # # Copyright (c) 1998, 1999 Henry Spencer. All rights reserved. # -# RCS: @(#) $Id: reg.test,v 1.6 1999/06/26 03:54:22 jenn Exp $ +# RCS: @(#) $Id: reg.test,v 1.7 1999/06/26 20:55:10 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } # All tests require the testregexp command, return if this diff --git a/tests/regexp.test b/tests/regexp.test index 0d1e021..d17f2be 100644 --- a/tests/regexp.test +++ b/tests/regexp.test @@ -11,11 +11,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: regexp.test,v 1.7 1999/06/26 03:54:22 jenn Exp $ +# RCS: @(#) $Id: regexp.test,v 1.8 1999/06/26 20:55:10 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } catch {unset foo} diff --git a/tests/registry.test b/tests/registry.test index 4fe7382..9b08f2f 100644 --- a/tests/registry.test +++ b/tests/registry.test @@ -10,11 +10,11 @@ # Copyright (c) 1997 by Sun Microsystems, Inc. All rights reserved. # Copyright (c) 1998-1999 by Scriptics Corporation. # -# RCS: @(#) $Id: registry.test,v 1.6 1999/06/26 03:54:23 jenn Exp $ +# RCS: @(#) $Id: registry.test,v 1.7 1999/06/26 20:55:10 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } if {$tcl_platform(platform) == "windows"} { diff --git a/tests/rename.test b/tests/rename.test index b85a3ec..b0a4a7c 100644 --- a/tests/rename.test +++ b/tests/rename.test @@ -11,11 +11,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: rename.test,v 1.4 1999/06/26 03:54:23 jenn Exp $ +# RCS: @(#) $Id: rename.test,v 1.5 1999/06/26 20:55:11 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } # Must eliminate the "unknown" command while the test is running, diff --git a/tests/resource.test b/tests/resource.test index f49077b..43747cb 100644 --- a/tests/resource.test +++ b/tests/resource.test @@ -10,11 +10,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: resource.test,v 1.5 1999/06/26 03:54:24 jenn Exp $ +# RCS: @(#) $Id: resource.test,v 1.6 1999/06/26 20:55:11 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } test resource-1.1 {resource tests} {macOnly} { diff --git a/tests/result.test b/tests/result.test index febbf94..dbcd95a 100644 --- a/tests/result.test +++ b/tests/result.test @@ -14,7 +14,7 @@ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } # Some tests require the testsaveresult command diff --git a/tests/safe.test b/tests/safe.test index 8d8aa14..b453543 100644 --- a/tests/safe.test +++ b/tests/safe.test @@ -10,11 +10,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: safe.test,v 1.6 1999/06/26 03:54:24 jenn Exp $ +# RCS: @(#) $Id: safe.test,v 1.7 1999/06/26 20:55:12 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } foreach i [interp slaves] { diff --git a/tests/scan.test b/tests/scan.test index b777a76..842e0f7 100644 --- a/tests/scan.test +++ b/tests/scan.test @@ -11,11 +11,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: scan.test,v 1.5 1999/06/26 03:54:25 jenn Exp $ +# RCS: @(#) $Id: scan.test,v 1.6 1999/06/26 20:55:12 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } test scan-1.1 {BuildCharSet, CharInSet} { diff --git a/tests/security.test b/tests/security.test index ae5f58b..f259c6a 100644 --- a/tests/security.test +++ b/tests/security.test @@ -10,11 +10,11 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: security.test,v 1.3 1999/06/26 03:54:25 jenn Exp $ +# RCS: @(#) $Id: security.test,v 1.4 1999/06/26 20:55:12 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } # If this proc becomes invoked, then there is a bug diff --git a/tests/set-old.test b/tests/set-old.test index 51ddb9e..7fec23e 100644 --- a/tests/set-old.test +++ b/tests/set-old.test @@ -13,11 +13,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: set-old.test,v 1.5 1999/06/26 03:54:26 jenn Exp $ +# RCS: @(#) $Id: set-old.test,v 1.6 1999/06/26 20:55:12 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } proc ignore args {} diff --git a/tests/set.test b/tests/set.test index 00d9951..736e0e5 100644 --- a/tests/set.test +++ b/tests/set.test @@ -10,11 +10,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: set.test,v 1.4 1999/06/26 03:54:26 jenn Exp $ +# RCS: @(#) $Id: set.test,v 1.5 1999/06/26 20:55:12 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } catch {unset x} diff --git a/tests/socket.test b/tests/socket.test index 36b3b44..93b96ee 100644 --- a/tests/socket.test +++ b/tests/socket.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. # -# RCS: @(#) $Id: socket.test,v 1.10 1999/06/26 03:54:26 jenn Exp $ +# RCS: @(#) $Id: socket.test,v 1.11 1999/06/26 20:55:13 rjohnson Exp $ # Running socket tests with a remote server: # ------------------------------------------ @@ -64,7 +64,7 @@ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } # Some tests require the testthread command diff --git a/tests/source.test b/tests/source.test index a0001f7..b245cd0 100644 --- a/tests/source.test +++ b/tests/source.test @@ -11,11 +11,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: source.test,v 1.4 1999/06/26 03:54:27 jenn Exp $ +# RCS: @(#) $Id: source.test,v 1.5 1999/06/26 20:55:13 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } test source-1.1 {source command} { diff --git a/tests/split.test b/tests/split.test index a474cb0..a8f27f7 100644 --- a/tests/split.test +++ b/tests/split.test @@ -11,11 +11,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: split.test,v 1.4 1999/06/26 03:54:27 jenn Exp $ +# RCS: @(#) $Id: split.test,v 1.5 1999/06/26 20:55:13 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } test split-1.1 {basic split commands} { diff --git a/tests/stack.test b/tests/stack.test index 55f04ae..5beda5b 100644 --- a/tests/stack.test +++ b/tests/stack.test @@ -9,11 +9,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: stack.test,v 1.3 1999/06/26 03:54:27 jenn Exp $ +# RCS: @(#) $Id: stack.test,v 1.4 1999/06/26 20:55:13 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } # Note that a failure in this test results in a crash of the executable. diff --git a/tests/string.test b/tests/string.test index 3a7e8be..cb91f9c 100644 --- a/tests/string.test +++ b/tests/string.test @@ -11,11 +11,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: string.test,v 1.15 1999/06/26 03:54:28 jenn Exp $ +# RCS: @(#) $Id: string.test,v 1.16 1999/06/26 20:55:13 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } # Some tests require the testobj command diff --git a/tests/stringObj.test b/tests/stringObj.test index 28d550e..257aa9a 100644 --- a/tests/stringObj.test +++ b/tests/stringObj.test @@ -12,11 +12,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: stringObj.test,v 1.7 1999/06/26 03:54:28 jenn Exp $ +# RCS: @(#) $Id: stringObj.test,v 1.8 1999/06/26 20:55:14 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } if {[info commands testobj] == {}} { diff --git a/tests/subst.test b/tests/subst.test index da2be4b..0fb07cd 100644 --- a/tests/subst.test +++ b/tests/subst.test @@ -11,11 +11,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: subst.test,v 1.4 1999/06/26 03:54:29 jenn Exp $ +# RCS: @(#) $Id: subst.test,v 1.5 1999/06/26 20:55:14 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } test subst-1.1 {basics} { diff --git a/tests/switch.test b/tests/switch.test index 388b13e..4b7101e 100644 --- a/tests/switch.test +++ b/tests/switch.test @@ -11,11 +11,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: switch.test,v 1.4 1999/06/26 03:54:29 jenn Exp $ +# RCS: @(#) $Id: switch.test,v 1.5 1999/06/26 20:55:14 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } test switch-1.1 {simple patterns} { diff --git a/tests/thread.test b/tests/thread.test index 1144c11..1ab7e83 100644 --- a/tests/thread.test +++ b/tests/thread.test @@ -10,11 +10,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: thread.test,v 1.5 1999/06/26 03:54:29 jenn Exp $ +# RCS: @(#) $Id: thread.test,v 1.6 1999/06/26 20:55:14 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } # Some tests require the testthread command diff --git a/tests/timer.test b/tests/timer.test index 24f782a..4a85cda 100644 --- a/tests/timer.test +++ b/tests/timer.test @@ -13,11 +13,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: timer.test,v 1.4 1999/06/26 03:54:30 jenn Exp $ +# RCS: @(#) $Id: timer.test,v 1.5 1999/06/26 20:55:15 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } test timer-1.1 {Tcl_CreateTimerHandler procedure} { diff --git a/tests/trace.test b/tests/trace.test index 13d3982..8bc0afe 100644 --- a/tests/trace.test +++ b/tests/trace.test @@ -11,11 +11,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: trace.test,v 1.4 1999/06/26 03:54:30 jenn Exp $ +# RCS: @(#) $Id: trace.test,v 1.5 1999/06/26 20:55:15 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } proc traceScalar {name1 name2 op} { diff --git a/tests/unixFCmd.test b/tests/unixFCmd.test index 9b28d4f..1c37f04 100644 --- a/tests/unixFCmd.test +++ b/tests/unixFCmd.test @@ -9,11 +9,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: unixFCmd.test,v 1.7 1999/06/26 03:54:31 jenn Exp $ +# RCS: @(#) $Id: unixFCmd.test,v 1.8 1999/06/26 20:55:15 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } # Several tests require need to match results against the unix username diff --git a/tests/unixFile.test b/tests/unixFile.test index 9f623fd..c8810bd 100644 --- a/tests/unixFile.test +++ b/tests/unixFile.test @@ -9,11 +9,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: unixFile.test,v 1.4 1999/06/26 03:54:31 jenn Exp $ +# RCS: @(#) $Id: unixFile.test,v 1.5 1999/06/26 20:55:15 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } if {[info commands testobj] == {}} { diff --git a/tests/unixInit.test b/tests/unixInit.test index 3c84a38..2fc1939 100644 --- a/tests/unixInit.test +++ b/tests/unixInit.test @@ -10,11 +10,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: unixInit.test,v 1.6 1999/06/26 03:54:31 jenn Exp $ +# RCS: @(#) $Id: unixInit.test,v 1.7 1999/06/26 20:55:16 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } catch {set oldlibrary $env(TCL_LIBRARY); unset env(TCL_LIBRARY)} diff --git a/tests/unixNotfy.test b/tests/unixNotfy.test index 132c771..34f269c 100644 --- a/tests/unixNotfy.test +++ b/tests/unixNotfy.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. # -# RCS: @(#) $Id: unixNotfy.test,v 1.5 1999/06/26 03:54:32 jenn Exp $ +# RCS: @(#) $Id: unixNotfy.test,v 1.6 1999/06/26 20:55:16 rjohnson Exp $ # The tests should not be run if you have a notifier which is unable to # detect infinite vwaits, as the tests below will hang. The presence of @@ -18,7 +18,7 @@ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } set ::tcltest::testConfig(testthread) \ diff --git a/tests/unknown.test b/tests/unknown.test index 3dab4e1..cb9de8a 100644 --- a/tests/unknown.test +++ b/tests/unknown.test @@ -11,11 +11,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: unknown.test,v 1.4 1999/06/26 03:54:32 jenn Exp $ +# RCS: @(#) $Id: unknown.test,v 1.5 1999/06/26 20:55:16 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } catch {unset x} diff --git a/tests/uplevel.test b/tests/uplevel.test index d26e900..6031586 100644 --- a/tests/uplevel.test +++ b/tests/uplevel.test @@ -11,11 +11,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: uplevel.test,v 1.4 1999/06/26 03:54:32 jenn Exp $ +# RCS: @(#) $Id: uplevel.test,v 1.5 1999/06/26 20:55:17 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } proc a {x y} { diff --git a/tests/upvar.test b/tests/upvar.test index 35b8f2f..75984da 100644 --- a/tests/upvar.test +++ b/tests/upvar.test @@ -11,11 +11,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: upvar.test,v 1.5 1999/06/26 03:54:32 jenn Exp $ +# RCS: @(#) $Id: upvar.test,v 1.6 1999/06/26 20:55:17 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } test upvar-1.1 {reading variables with upvar} { diff --git a/tests/utf.test b/tests/utf.test index 800e21d..3250097 100644 --- a/tests/utf.test +++ b/tests/utf.test @@ -8,11 +8,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: utf.test,v 1.4 1999/06/26 03:54:32 jenn Exp $ +# RCS: @(#) $Id: utf.test,v 1.5 1999/06/26 20:55:17 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } catch {unset x} diff --git a/tests/util.test b/tests/util.test index 06b1bf8..416320a 100644 --- a/tests/util.test +++ b/tests/util.test @@ -7,11 +7,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: util.test,v 1.5 1999/06/26 03:54:33 jenn Exp $ +# RCS: @(#) $Id: util.test,v 1.6 1999/06/26 20:55:17 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } if {[info commands testobj] == {}} { diff --git a/tests/var.test b/tests/var.test index a6e54ff..de08a35 100644 --- a/tests/var.test +++ b/tests/var.test @@ -14,12 +14,12 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: var.test,v 1.6 1999/06/26 03:54:33 jenn Exp $ +# RCS: @(#) $Id: var.test,v 1.7 1999/06/26 20:55:17 rjohnson Exp $ # if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } catch {rename p ""} @@ -124,7 +124,7 @@ test var-1.15 {TclLookupVar, resurrect variable via upvar to deleted namespace: proc p {} { variable ::test_ns_var::foo lappend result [catch {set foo} msg] $msg - namespace delete ::test_ns_var + namespace delete ::test_ns_var lappend result [catch {set foo 3} msg] $msg lappend result [catch {set foo(3) 3} msg] $msg } @@ -133,15 +133,15 @@ test var-1.15 {TclLookupVar, resurrect variable via upvar to deleted namespace: test var-1.16 {TclLookupVar, resurrect variable via upvar to deleted namespace: uncompiled code path} { namespace eval test_ns_var { variable result - namespace eval subns { + namespace eval subns { variable foo 2 } upvar 0 subns::foo foo lappend result [catch {set foo} msg] $msg - namespace delete subns + namespace delete subns lappend result [catch {set foo 3} msg] $msg lappend result [catch {set foo(3) 3} msg] $msg - namespace delete [namespace current] + namespace delete [namespace current] set result } } {0 2 1 {can't set "foo": upvar refers to variable in deleted namespace} 1 {can't set "foo(3)": upvar refers to variable in deleted namespace}} @@ -156,7 +156,7 @@ test var-1.17 {TclLookupVar, resurrect array element via upvar to deleted array: lappend result [catch {set foo 3} msg] $msg } set result [p] - namespace delete [namespace current] + namespace delete [namespace current] set result } } {0 2 1 {can't set "foo": upvar refers to element in deleted array}} @@ -169,7 +169,7 @@ test var-1.18 {TclLookupVar, resurrect array element via upvar to deleted array: lappend result [catch {set foo} msg] $msg unset x lappend result [catch {set foo 3} msg] $msg - namespace delete [namespace current] + namespace delete [namespace current] set result } } {0 2 1 {can't set "foo": upvar refers to element in deleted array}} diff --git a/tests/while-old.test b/tests/while-old.test index ac181f3..0e9e474 100644 --- a/tests/while-old.test +++ b/tests/while-old.test @@ -13,11 +13,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: while-old.test,v 1.4 1999/06/26 03:54:33 jenn Exp $ +# RCS: @(#) $Id: while-old.test,v 1.5 1999/06/26 20:55:18 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } test while-old-1.1 {basic while loops} { diff --git a/tests/while.test b/tests/while.test index 5708dec..83b2f8a 100644 --- a/tests/while.test +++ b/tests/while.test @@ -10,11 +10,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: while.test,v 1.4 1999/06/26 03:54:34 jenn Exp $ +# RCS: @(#) $Id: while.test,v 1.5 1999/06/26 20:55:18 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } # Basic "while" operation. diff --git a/tests/winConsole.test b/tests/winConsole.test index c6b6fc2..197c8b1 100644 --- a/tests/winConsole.test +++ b/tests/winConsole.test @@ -9,11 +9,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: winConsole.test,v 1.3 1999/06/26 03:54:34 jenn Exp $ +# RCS: @(#) $Id: winConsole.test,v 1.4 1999/06/26 20:55:18 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } diff --git a/tests/winDde.test b/tests/winDde.test index 4ac101d..9b21bdf 100644 --- a/tests/winDde.test +++ b/tests/winDde.test @@ -9,11 +9,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: winDde.test,v 1.3 1999/06/26 03:54:34 jenn Exp $ +# RCS: @(#) $Id: winDde.test,v 1.4 1999/06/26 20:55:18 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } if {$tcl_platform(platform) == "windows"} { diff --git a/tests/winFCmd.test b/tests/winFCmd.test index 7566c2e..f672071 100644 --- a/tests/winFCmd.test +++ b/tests/winFCmd.test @@ -10,12 +10,12 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: winFCmd.test,v 1.5 1999/06/26 03:54:34 jenn Exp $ +# RCS: @(#) $Id: winFCmd.test,v 1.6 1999/06/26 20:55:18 rjohnson Exp $ # if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } proc createfile {file {string a}} { diff --git a/tests/winFile.test b/tests/winFile.test index 622dcdb..09889c7 100644 --- a/tests/winFile.test +++ b/tests/winFile.test @@ -10,11 +10,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: winFile.test,v 1.4 1999/06/26 03:54:35 jenn Exp $ +# RCS: @(#) $Id: winFile.test,v 1.5 1999/06/26 20:55:19 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } test winFile-1.1 {TclpGetUserHome} {pcOnly} { diff --git a/tests/winNotify.test b/tests/winNotify.test index 13c8f9a..4de1177 100644 --- a/tests/winNotify.test +++ b/tests/winNotify.test @@ -10,11 +10,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: winNotify.test,v 1.4 1999/06/26 03:54:35 jenn Exp $ +# RCS: @(#) $Id: winNotify.test,v 1.5 1999/06/26 20:55:20 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } set ::tcltest::testConfig(testeventloop) \ diff --git a/tests/winPipe.test b/tests/winPipe.test index ba45ad7..d9db002 100644 --- a/tests/winPipe.test +++ b/tests/winPipe.test @@ -12,11 +12,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: winPipe.test,v 1.8 1999/06/26 03:54:35 jenn Exp $ +# RCS: @(#) $Id: winPipe.test,v 1.9 1999/06/26 20:55:20 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } set bindir [file join [pwd] [file dirname [info nameofexecutable]]] diff --git a/tests/winTime.test b/tests/winTime.test index 9ba05cd..bc857eb 100644 --- a/tests/winTime.test +++ b/tests/winTime.test @@ -10,11 +10,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: winTime.test,v 1.3 1999/06/26 03:54:36 jenn Exp $ +# RCS: @(#) $Id: winTime.test,v 1.4 1999/06/26 20:55:21 rjohnson Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest - namespace import ::tcltest::* + namespace import ::tcltest::* } # The next two tests will crash on Windows if the check for negative -- cgit v0.12