summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authordas <das>2001-11-23 01:26:52 (GMT)
committerdas <das>2001-11-23 01:26:52 (GMT)
commit5bf5a16c3a6e83b4297123ae905297ac723f7f81 (patch)
tree725fbc934e8cfe62511b965b22c0069a3e157e67 /tests
parent8ddfd6bbdf803f32768cf447560be0af0e97e08b (diff)
downloadtcl-5bf5a16c3a6e83b4297123ae905297ac723f7f81.zip
tcl-5bf5a16c3a6e83b4297123ae905297ac723f7f81.tar.gz
tcl-5bf5a16c3a6e83b4297123ae905297ac723f7f81.tar.bz2
** upport to 8.4 of mac code changes for 8.3.3 & various new
** changes for 8.4, some already backported to 8.3.4 (patch #435658) see ChangeLog for details
Diffstat (limited to 'tests')
-rwxr-xr-xtests/tcltest.test17
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}
}
}