1 files changed, 18 insertions, 24 deletions

diff --git a/tests/winPipe.test b/tests/winPipe.test
index 62d7d0d..3f983e1 100644
--- a/tests/winPipe.test
+++ b/tests/winPipe.test
@@ -9,13 +9,14 @@
 # Copyright (c) 1996 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 #
-# See the file "license.terms" for information on usage and redistribution of
-# this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 package require tcltest
 namespace import -force ::tcltest::*
 unset -nocomplain path
 
+
 set bindir [file join [pwd] [file dirname [info nameofexecutable]]]
 set cat32 [file join $bindir cat32.exe]
 
@@ -57,7 +58,7 @@ set path(more) [makeFile {
 
 set path(stdout) [makeFile {} stdout]
 set path(stderr) [makeFile {} stderr]
-
+
 test winpipe-1.1 {32 bit comprehensive tests: from little file} {win exec cat32} {
     exec $cat32 < $path(little) > $path(stdout) 2> $path(stderr)
     list [contents $path(stdout)] [contents $path(stderr)]
@@ -67,15 +68,15 @@ test winpipe-1.2 {32 bit comprehensive tests: from big file} {win exec cat32} {
     list [contents $path(stdout)] [contents $path(stderr)]
 } "{$big} stderr32"
 test winpipe-1.3 {32 bit comprehensive tests: a little from pipe} {win nt exec cat32} {
-    exec [interpreter] $path(more) < $path(little) | $cat32 > $path(stdout) 2> $path(stderr)
+    exec [interpreter] more < little | $cat32 > $path(stdout) 2> $path(stderr)
     list [contents $path(stdout)] [contents $path(stderr)]
 } {little stderr32}
 test winpipe-1.4 {32 bit comprehensive tests: a lot from pipe} {win nt exec cat32} {
-    exec [interpreter] $path(more) < $path(big) | $cat32 > $path(stdout) 2> $path(stderr)
+    exec [interpreter] more < big | $cat32 > $path(stdout) 2> $path(stderr)
     list [contents $path(stdout)] [contents $path(stderr)]
 } "{$big} stderr32"
 test winpipe-1.5 {32 bit comprehensive tests: a lot from pipe} {win 95 exec cat32} {
-    exec command /c type $path(big) |& $cat32 > $path(stdout) 2> $path(stderr)
+    exec command /c type big |& $cat32 > $path(stdout) 2> $path(stderr)
     list [contents $path(stdout)] [contents $path(stderr)]
 } "{$big} stderr32"
 test winpipe-1.6 {32 bit comprehensive tests: from console} \
@@ -170,6 +171,7 @@ test winpipe-1.22 {Checking command.com for Win95/98 hanging} {win 95 exec} {
     exec command.com /c dir /b
     set result 1
 } 1
+file delete more
 
 test winpipe-4.1 {Tcl_WaitPid} {win nt exec cat32} {
     proc readResults {f} {
@@ -182,7 +184,8 @@ test winpipe-4.1 {Tcl_WaitPid} {win nt exec cat32} {
 	    set result "$result$line"
 	}
     }
-    set f [open "|[list $cat32] < $path(big) 2> $path(stderr)" r]
+
+    set f [open "|[list $cat32] < big 2> $path(stderr)" r]
     fconfigure $f  -buffering none -blocking 0
     fileevent $f readable "readResults $f"
     set x 0
@@ -231,9 +234,9 @@ set env(TEMP) c:/
 test winpipe-5.1 {TclpCreateTempFile: cleanup temp files} {win exec} {
     set x {}
     set existing [glob -nocomplain c:/tcl*.tmp]
-    exec [interpreter] < $path(nothing)
+    exec [interpreter] < nothing 
     foreach p [glob -nocomplain c:/tcl*.tmp] {
-	if {$p ni $existing} {
+	if {[lsearch $existing $p] == -1} {
 	    lappend x $p
 	}
     }
@@ -244,7 +247,7 @@ test winpipe-5.2 {TclpCreateTempFile: TMP and TEMP not defined} {win exec} {
     set temp $env(TEMP)
     unset env(TMP)
     unset env(TEMP)
-    exec [interpreter] < $path(nothing)
+    exec [interpreter] < nothing
     set env(TMP) $tmp
     set env(TEMP) $temp
     set x {}
@@ -253,7 +256,7 @@ test winpipe-5.3 {TclpCreateTempFile: TMP specifies non-existent directory} \
 	{win exec } {
     set tmp $env(TMP)
     set env(TMP) snarky
-    exec [interpreter] < $path(nothing)
+    exec [interpreter] < nothing
     set env(TMP) $tmp
     set x {}
 } {}
@@ -263,7 +266,7 @@ test winpipe-5.4 {TclpCreateTempFile: TEMP specifies non-existent directory} \
     set temp $env(TEMP)
     unset env(TMP)
     set env(TEMP) snarky
-    exec [interpreter] < $path(nothing)
+    exec [interpreter] < nothing
     set env(TMP) $tmp
     set env(TEMP) $temp
     set x {}
@@ -308,6 +311,7 @@ set path(echoArgs.tcl) [makeFile {
     puts "[list $argv0 $argv]"
 } echoArgs.tcl]
 
+
 ### validate the raw output of BuildCommandLine().
 ###
 test winpipe-7.1 {BuildCommandLine: null arguments} {win exec} {
@@ -424,7 +428,7 @@ test winpipe-8.18 {BuildCommandLine/parse_cmdline pass-thru: special chars #2} {
 test winpipe-8.19 {ensure parse_cmdline isn't doing wildcard replacement} {win exec} {
     exec [interpreter] $path(echoArgs.tcl) foo * makefile.?c bar
 } [list $path(echoArgs.tcl) [list foo * makefile.?c bar]]
-
+
 # restore old values for env(TMP) and env(TEMP)
 
 if {[catch {set env(TMP) $env_tmp}]} {
@@ -435,16 +439,6 @@ if {[catch {set env(TEMP) $env_temp}]} {
 }
 
 # cleanup
-removeFile little
-removeFile big
-removeFile more
-removeFile stdout
-removeFile stderr
-removeFile nothing
-removeFile echoArgs.tcl
+file delete big little stdout stderr nothing echoArgs.tcl
 ::tcltest::cleanupTests
 return
-
-# Local Variables:
-# mode: tcl
-# End: