diff options
| -rw-r--r-- | tests/all.tcl | 6 | ||||
| -rw-r--r-- | tests/filebox.test | 15 | ||||
| -rw-r--r-- | tests/unixWm.test | 8 |
3 files changed, 14 insertions, 15 deletions
diff --git a/tests/all.tcl b/tests/all.tcl index 600be5b..fa7fb58 100644 --- a/tests/all.tcl +++ b/tests/all.tcl @@ -7,7 +7,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: all.tcl,v 1.1.2.1 1999/03/11 18:50:36 hershey Exp $ +# RCS: @(#) $Id: all.tcl,v 1.1.2.2 1999/03/11 23:51:26 hershey Exp $ # extra files: arc.tcl bugs.tcl butGeom2.tcl \ # canvPsBmap.tcl canvPsText.tcl bevel.tcl butGeom.tcl \ @@ -42,9 +42,9 @@ if {$fileIndex > 0} { set globPattern [file join $::test::testsDir [lindex $argv $fileIndex]] puts stdout "Sourcing files that match: $globPattern" } elseif {$tcl_platform(os) == "Win32s"} { - set [file join $::test::testsDir globPattern *.tes] + set globPattern [file join $::test::testsDir *.tes] } else { - set [file join $::test::testsDir globPattern *.test] + set globPattern [file join $::test::testsDir *.test] } set fileList [glob -nocomplain $globPattern] if {[llength $fileList] < 1} { diff --git a/tests/filebox.test b/tests/filebox.test index aff8a68..d88bb4e 100644 --- a/tests/filebox.test +++ b/tests/filebox.test @@ -6,12 +6,9 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: filebox.test,v 1.1.4.4 1999/03/11 18:50:48 hershey Exp $ +# RCS: @(#) $Id: filebox.test,v 1.1.4.5 1999/03/11 23:51:26 hershey Exp $ # -puts "skipping these tests: TEMPORARILY under construction" -return - set tk_strictMotif_old $tk_strictMotif #---------------------------------------------------------------------- @@ -104,6 +101,11 @@ if {$tcl_platform(platform) == "unix"} { set unknownOptionsMsg {1 {bad option "-foo": must be -defaultextension, -filetypes, -initialdir, -initialfile, -parent, or -title}} +set tmpFile "filebox.tmp" +makeFile { + # this file can be empty! +} $tmpFile + foreach mode $modes { # @@ -186,10 +188,7 @@ foreach mode $modes { set fileDir [pwd] set pathName [file join [pwd] $fileName] } else { - set thisFile [info script] - set fileName [file tail $thisFile] - - # this file should be in the current working dir + set fileName $tmpFile set fileDir [pwd] set pathName [file join $fileDir $fileName] } diff --git a/tests/unixWm.test b/tests/unixWm.test index ff6b4d9..8f3c438 100644 --- a/tests/unixWm.test +++ b/tests/unixWm.test @@ -7,7 +7,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: unixWm.test,v 1.1.4.4 1999/03/11 18:51:18 hershey Exp $ +# RCS: @(#) $Id: unixWm.test,v 1.1.4.5 1999/03/11 23:51:27 hershey Exp $ if {$tcl_platform(platform) != "unix"} { puts "skipping: Unix only tests..." @@ -2332,7 +2332,7 @@ test unixWm-58.1 {exit processing} { exit } close $fd - if {[catch {exec $tktest script -geometry 10x10+0+0} msg]} { + if {[catch {exec $::test::tktest script -geometry 10x10+0+0} msg]} { set error 1 } else { set error 0 @@ -2351,7 +2351,7 @@ test unixWm-58.2 {exit processing} { exit } close $fd - if {[catch {exec $tktest script -geometry 10x10+0+0} msg]} { + if {[catch {exec $::test::tktest script -geometry 10x10+0+0} msg]} { set error 1 } else { set error 0 @@ -2376,7 +2376,7 @@ test unixWm-58.3 {exit processing} { exit } close $fd - if {[catch {exec $tktest script -geometry 10x10+0+0} msg]} { + if {[catch {exec $::test::tktest script -geometry 10x10+0+0} msg]} { set error 1 } else { set error 0 |