summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2004-03-17 19:29:41 (GMT)
committerdgp <dgp@users.sourceforge.net>2004-03-17 19:29:41 (GMT)
commitffa58c2b26dfdfa393cbd383ce80469028c497c1 (patch)
treeb9f97a5eb958c59139491dc030248856cf330e7a
parent60a59c56d556992340418492d2e3c9fe568b83c0 (diff)
downloadtcl-ffa58c2b26dfdfa393cbd383ce80469028c497c1.zip
tcl-ffa58c2b26dfdfa393cbd383ce80469028c497c1.tar.gz
tcl-ffa58c2b26dfdfa393cbd383ce80469028c497c1.tar.bz2
Reverted changes to tcltest so that it can still support Mac when
copied to Mac systems (only requires Tcl 8.3).
-rw-r--r--ChangeLog2
-rw-r--r--library/tcltest/tcltest.tcl5
-rwxr-xr-xtests/tcltest.test5
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f126cd..47cdc2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,7 +57,6 @@
* library/package.tcl:
* library/safe.tcl:
* library/tclIndex:
- * library/tcltest/tcltest.tcl:
* mac/AppleScript.html (removed):
* mac/Background.doc (removed):
* mac/MW_TclAppleScriptHeader.h (removed):
@@ -131,7 +130,6 @@
* tests/resource.test (removed):
* tests/socket.test:
* tests/source.test:
- * tests/tcltest.test:
* tests/unload.test:
* tools/cvtEOL.tcl (removed):
* tools/genStubs.tcl:
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 4a36a38..d037fd3 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -16,7 +16,7 @@
# Contributions from Don Porter, NIST, 2002. (not subject to US copyright)
# All rights reserved.
#
-# RCS: @(#) $Id: tcltest.tcl,v 1.88 2004/03/17 18:14:14 das Exp $
+# RCS: @(#) $Id: tcltest.tcl,v 1.89 2004/03/17 19:29:42 dgp Exp $
package require Tcl 8.3 ;# uses [glob -directory]
namespace eval tcltest {
@@ -1263,6 +1263,9 @@ proc tcltest::DefineConstraintInitializers {} {
ConstraintInitializer unixExecs {
set code 1
+ if {[string equal macintosh $::tcl_platform(platform)]} {
+ set code 0
+ }
if {[string equal windows $::tcl_platform(platform)]} {
if {[catch {
set file _tcl_test_remove_me.txt
diff --git a/tests/tcltest.test b/tests/tcltest.test
index a652407..79b9869 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.38 2004/03/17 18:14:18 das Exp $
+# RCS: @(#) $Id: tcltest.test,v 1.39 2004/03/17 19:29:43 dgp Exp $
# Note that there are several places where the value of
# tcltest::currentFailure is stored/reset in the -setup/-cleanup
@@ -525,6 +525,9 @@ set a [makeFile {
set tdiaf [makeFile {} thisdirectoryisafile]
set normaldirectory [makeDirectory normaldirectory]
+if {$::tcl_platform(platform) == "macintosh"} {
+set normaldirectory [file normalize $normaldirectory]
+}
# -tmpdir, [temporaryDirectory]
test tcltest-8.1 {tcltest a.tcl -tmpdir a} {unixOrPc} {