Attachment "tcltest.test.diff" to
ticket [549605ffff]
added by
kennykb
2002-04-28 04:54:45.
Index: tests/tcltest.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/tcltest.test,v
retrieving revision 1.19
diff -u -r1.19 tcltest.test
--- tests/tcltest.test 15 Apr 2002 17:04:29 -0000 1.19
+++ tests/tcltest.test 27 Apr 2002 21:51:47 -0000
@@ -365,9 +365,9 @@
set f2 [tcltest::errorFile $ef]
set f3 [tcltest::errorChannel]
set f4 [tcltest::errorFile]
- list $f0 $f1 $f2 $f3 $f4
+ subst {$f0;$f1;$f2;$f3;$f4}
}
- -result {stderr stderr .*efile file[0-9a-f]+ .*efile}
+ -result {stderr;stderr;.*efile;file[0-9a-f]+;.*efile}
-match regexp
-cleanup {
tcltest::errorFile $of
@@ -400,9 +400,9 @@
set f2 [tcltest::outputFile $ef]
set f3 [tcltest::outputChannel]
set f4 [tcltest::outputFile]
- list $f0 $f1 $f2 $f3 $f4
+ subst {$f0;$f1;$f2;$f3;$f4}
}
- -result {stdout stdout .*efile file[0-9a-f]+ .*efile}
+ -result {stdout;stdout;.*efile;file[0-9a-f]+;.*efile}
-match regexp
-cleanup {
tcltest::outputFile $of
@@ -535,7 +535,7 @@
set f3 [tcltest::temporaryDirectory]
list $f1 $f2 $f3
}
- -result "$normaldirectory $current $current"
+ -result "[list $normaldirectory $current $current]"
-cleanup {
set tcltest::temporaryDirectory $old
}
@@ -551,7 +551,7 @@
list $f1 $f2 $f3
} -cleanup {
set tcltest::temporaryDirectory $old
-} -result "$normaldirectory $current $current"
+} -result [list $normaldirectory $current $current]
# -testdir, tcltest::testsDirectory
test tcltest-8.10 {tcltest a.tcl -testdir thisdirectorydoesnotexist} {unixOrPc} {
@@ -591,7 +591,7 @@
set f3 [tcltest::testsDirectory]
list $f1 $f2 $f3
}
- -result "$normaldirectory $current $current"
+ -result "[list $normaldirectory $current $current]"
-cleanup {
set tcltest::testsDirectory $old
}
@@ -613,7 +613,11 @@
set f5 [tcltest::workingDirectory]
list $f1 $f2 $f3 $f4 $f5
}
- -result "$normaldirectory $normaldirectory $current $current $current"
+ -result "[list $normaldirectory \
+ $normaldirectory \
+ $current \
+ $current \
+ $current]"
-cleanup {
set tcltest::workingDirectory $old
cd $current
@@ -772,13 +776,12 @@
set f5 [tcltest::loadFile]
list $f1 $f2 $f3 $f4 $f5
}
- -result "{} {} $loadfile {
+ -result "[list {} {} $loadfile {
package require tcltest
namespace import -force ::tcltest::*
- puts \$::tcltest::loadScript
+ puts $::tcltest::loadScript
exit
-} $loadfile
-"
+} $loadfile]\n"
-cleanup {
set tcltest::loadScript $olds
set tcltest::loadFile $oldf