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 681403a..1741956 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-28 Don Porter <dgp@users.sourceforge.net>
+
+ * tests/unixInit.test (7.1): Alternative fix for the
+ 2004-11-11 commit.
+
2005-04-27 Don Porter <dgp@users.sourceforge.net>
* library/init.tcl: Corrected flaw in interactive command
diff --git a/tests/unixInit.test b/tests/unixInit.test
index 1b7a6f0..db473df 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.46 2005/04/15 22:41:44 dgp Exp $
+# RCS: @(#) $Id: unixInit.test,v 1.47 2005/04/28 14:24:40 dgp Exp $
package require tcltest 2.2
namespace import -force ::tcltest::*
@@ -429,12 +429,12 @@ test unixInit-7.1 {closed standard channel: Bug 772288} -constraints {
unix 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