diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | tests/load.test | 4 | ||||
| -rw-r--r-- | tests/safe.test | 8 | ||||
| -rwxr-xr-x | tests/tcltest.test | 8 |
4 files changed, 18 insertions, 10 deletions
@@ -1,3 +1,11 @@ +2002-05-10 Don Porter <dgp@users.sourceforge.net> + + * tests/load.test: + * tests/safe.test: + * tests/tcltest.test: Corrected some list-quoting issues and + other matters that cause tests to fail when the patch includes + special characters. Report from Vince Darley. [Bug 554068]. + 2002-05-08 David Gravereaux <davygrvy@pobox.com> * doc/file.n: diff --git a/tests/load.test b/tests/load.test index 2a61bfc..fcd6084 100644 --- a/tests/load.test +++ b/tests/load.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: load.test,v 1.8 2002/05/08 05:58:57 dgp Exp $ +# RCS: @(#) $Id: load.test,v 1.9 2002/05/10 18:47:11 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -113,7 +113,7 @@ test load-4.1 {reloading package into same interpreter} [list $dll $loaded] { } {0 {}} test load-4.2 {reloading package into same interpreter} [list $dll $loaded] { list [catch {load [file join $testDir pkga$ext] pkgb} msg] $msg -} "1 {file \"[file join $testDir pkga$ext\"] is already loaded for package \"Pkga\"}" +} [list 1 "file \"[file join $testDir pkga$ext]\" is already loaded for package \"Pkga\""] test load-5.1 {file name not specified and no static package: pick default} \ [list $dll $loaded] { diff --git a/tests/safe.test b/tests/safe.test index 202afdf..21fad12 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. # -# RCS: @(#) $Id: safe.test,v 1.12 2002/02/22 21:51:34 hobbs Exp $ +# RCS: @(#) $Id: safe.test,v 1.13 2002/05/10 18:47:11 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -285,7 +285,7 @@ test safe-8.5 {safe source control on file} { $log \ [safe::setLogCmd $prevlog; unset log] \ [safe::interpDelete $i] ; -} "1 {no such file or directory} {{ERROR for slave a : [file join [info library] blah]:no such file or directory}} {} {}" +} [list 1 {no such file or directory} [list "ERROR for slave a : [file join [info library] blah]:no such file or directory"] {} {}] test safe-8.6 {safe source control on file} { @@ -301,7 +301,7 @@ test safe-8.6 {safe source control on file} { $log \ [safe::setLogCmd $prevlog; unset log] \ [safe::interpDelete $i] ; -} "1 {no such file or directory} {{ERROR for slave a : [file join [info library] blah.tcl]:no such file or directory}} {} {}" +} [list 1 {no such file or directory} [list "ERROR for slave a : [file join [info library] blah.tcl]:no such file or directory"] {} {}] test safe-8.7 {safe source control on file} { @@ -320,7 +320,7 @@ test safe-8.7 {safe source control on file} { $log \ [safe::setLogCmd $prevlog; unset log] \ [safe::interpDelete $i] ; -} "1 {no such file or directory} {{ERROR for slave a : [file join [info library] xxxxxxxxxxx.tcl]:no such file or directory}} {} {}" +} [list 1 {no such file or directory} [list "ERROR for slave a : [file join [info library] xxxxxxxxxxx.tcl]:no such file or directory"] {} {}] test safe-8.8 {safe source forbids -rsrc} { set i "a"; diff --git a/tests/tcltest.test b/tests/tcltest.test index ad4aa85..736ef27 100755 --- a/tests/tcltest.test +++ b/tests/tcltest.test @@ -6,7 +6,7 @@ # Copyright (c) 2000 by Ajuba Solutions # All rights reserved. # -# RCS: @(#) $Id: tcltest.test,v 1.20 2002/05/08 05:51:05 dgp Exp $ +# RCS: @(#) $Id: tcltest.test,v 1.21 2002/05/10 18:47:11 dgp Exp $ set tcltestVersion [package require tcltest] namespace import -force ::tcltest::* @@ -574,10 +574,10 @@ test tcltest-8.12 {tcltest a.tcl -testdir notReadableDir} {unixOnly} { test tcltest-8.13 {tcltest a.tcl -testdir normaldirectory} {unixOrPc} { - catch {exec $::tcltest::tcltest a.tcl -testdir normaldirectory} msg + catch {exec $::tcltest::tcltest a.tcl -testdir $normaldirectory} msg # The join is necessary because the message can be split on multiple lines - regexp "testdir: $normaldirectory" [join $msg] -} {1} + string first "testdir: $normaldirectory" [join $msg] +} {0} test tcltest-8.14 {tcltest::testsDirectory} { -setup { |