summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--tests/unixInit.test12
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index de6a51f..d5ae083 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-27 Don Porter <dgp@users.sourceforge.net>
+
+ * tests/unixInit.test (7.1): Alternative fix for the
+ 2005-04-22 commit.
+
2005-04-25 Daniel Steffen <das@users.sourceforge.net>
* compat/string.h: fixed memchr() protoype for __APPLE__ so that we
diff --git a/tests/unixInit.test b/tests/unixInit.test
index 88a9638..f4a2fc7 100644
--- a/tests/unixInit.test
+++ b/tests/unixInit.test
@@ -10,7 +10,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: unixInit.test,v 1.30.2.11 2005/04/21 23:42:28 das Exp $
+# RCS: @(#) $Id: unixInit.test,v 1.30.2.12 2005/04/27 21:07:52 dgp Exp $
package require tcltest 2
namespace import -force ::tcltest::*
@@ -364,12 +364,12 @@ test unixInit-7.1 {closed standard channel: Bug 772288} -constraints {
unixOnly stdio
} -body {
set tclsh [interpreter]
- makeFile {puts [open /dev/null]} crash.tcl
- makeFile "
+ set crash [makeFile {puts [open /dev/null]} crash.tcl]
+ set crashtest [makeFile "
close stdin
- [list exec $tclsh [file join [temporaryDirectory] crash.tcl]]
- " crashtest.tcl
- exec $tclsh [file join [temporaryDirectory] crashtest.tcl]
+ [list exec $tclsh $crash]
+ " crashtest.tcl]
+ exec $tclsh $crashtest
} -cleanup {
removeFile crash.tcl
removeFile crashtest.tcl