diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/tcltest.test | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tests/tcltest.test b/tests/tcltest.test index 92cca87..7e55e25 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.16 2001/08/22 23:55:27 hobbs Exp $ +# RCS: @(#) $Id: tcltest.test,v 1.17 2001/11/23 01:29:11 das Exp $ set tcltestVersion [package require tcltest] namespace import -force ::tcltest::* @@ -465,6 +465,9 @@ makeFile { makeFile {} thisdirectoryisafile set normaldirectory [tcltest::makeDirectory normaldirectory] +if {$::tcl_platform(platform) == "macintosh"} { +set normaldirectory [file normalize $normaldirectory] +} # -tmpdir, tcltest::temporaryDirectory test tcltest-8.1 {tcltest a.tcl -tmpdir a} {unixOrPc} { @@ -498,7 +501,7 @@ switch $tcl_platform(platform) { file attributes $notWriteableDir -permissions 00555 } default { - file attributes $notWriteableDir -readonly 1 + catch {file attributes $notWriteableDir -readonly 1} } } @@ -514,7 +517,7 @@ test tcltest-8.4 {tcltest a.tcl -tmpdir notWriteableDir} {unixOrPc} { list [regexp {not writeable} [join $msg]] } {1} -test tcltest-8.5 {tcltest a.tcl -tmpdir normaldirectory} { +test tcltest-8.5 {tcltest a.tcl -tmpdir normaldirectory} {unixOrPc} { catch {exec $::tcltest::tcltest a.tcl -tmpdir $normaldirectory} msg # The join is necessary because the message can be split on multiple lines file exists [file join $normaldirectory a.tmp] @@ -551,13 +554,13 @@ test tcltest-8.6a {tcltest::temporaryDirectory - test format 2} -setup { } -result "$normaldirectory $current $current" # -testdir, tcltest::testsDirectory -test tcltest-8.10 {tcltest a.tcl -testdir thisdirectorydoesnotexist} { +test tcltest-8.10 {tcltest a.tcl -testdir thisdirectorydoesnotexist} {unixOrPc} { file delete -force thisdirectorydoesnotexist catch {exec $::tcltest::tcltest a.tcl -testdir thisdirectorydoesnotexist} msg list [regexp "does not exist" [join $msg]] } {1} -test tcltest-8.11 {tcltest a.tcl -testdir thisdirectoryisafile} { +test tcltest-8.11 {tcltest a.tcl -testdir thisdirectoryisafile} {unixOrPc} { catch {exec $::tcltest::tcltest a.tcl -testdir thisdirectoryisafile} msg # The join is necessary because the message can be split on multiple lines list [regexp "not a directory" [join $msg]] @@ -570,7 +573,7 @@ test tcltest-8.12 {tcltest a.tcl -testdir notReadableDir} {unixOnly} { } {1} -test tcltest-8.13 {tcltest a.tcl -testdir normaldirectory} { +test tcltest-8.13 {tcltest a.tcl -testdir normaldirectory} {unixOrPc} { 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] @@ -625,7 +628,7 @@ switch $tcl_platform(platform) { file attributes $notWriteableDir -permissions 777 } default { - file attributes $notWriteableDir -readonly 0 + catch {file attributes $notWriteableDir -readonly 0} } } |