merged 8.0.4 into 8.1

11 files changed, 186 insertions, 83 deletions

diff --git a/tests/autoMkindex.test b/tests/autoMkindex.test
index 11db5f0..50a654f 100644
--- a/tests/autoMkindex.test
+++ b/tests/autoMkindex.test
@@ -8,7 +8,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: autoMkindex.test,v 1.1.2.1 1998/09/24 23:59:19 stanton Exp $
+# RCS: @(#) $Id: autoMkindex.test,v 1.1.2.2 1998/11/11 04:08:28 stanton Exp $
 
 if {[string compare test [info procs test]] == 1} then {source defs}
 
@@ -53,3 +53,9 @@ test autoMkindex-2.1 {commands on the autoload path can be imported} {
     interp delete $interp
     set final
 } "0 {} pub_one ::buried::pub_one pub_two ::buried::pub_two"
+
+#
+# Clean up.
+#
+
+catch {file delete tclIndex}
diff --git a/tests/cmdIL.test b/tests/cmdIL.test
index 58b83d4..3b38f84 100644
--- a/tests/cmdIL.test
+++ b/tests/cmdIL.test
@@ -3,11 +3,12 @@
 # generates output for errors.  No output means no errors were found.
 #
 # Copyright (c) 1997 Sun Microsystems, Inc.
+# Copyright (c) 1998 by Scriptics Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: cmdIL.test,v 1.1.2.2 1998/09/24 23:59:21 stanton Exp $
+# RCS: @(#) $Id: cmdIL.test,v 1.1.2.3 1998/11/11 04:08:28 stanton Exp $
 
 if {[string compare test [info procs test]] == 1} then {source defs}
 
@@ -38,34 +39,37 @@ test cmdIL-1.7 {Tcl_LsortObjCmd procedure, -decreasing option} {
 test cmdIL-1.8 {Tcl_LsortObjCmd procedure, -dictionary option} {
     lsort -dictionary {d e c b a d35 d300}
 } {a b c d d35 d300 e}
-test cmdIL-1.9 {Tcl_LsortObjCmd procedure, -increasing option} {
+test cmdIL-1.9 {Tcl_LsortObjCmd procedure, -dictionary option} {
+    lsort -dictionary {1k 0k 10k}
+} {0k 1k 10k}
+test cmdIL-1.10 {Tcl_LsortObjCmd procedure, -increasing option} {
     lsort -decreasing -increasing {d e c b a d35 d300}
 } {a b c d d300 d35 e}
-test cmdIL-1.10 {Tcl_LsortObjCmd procedure, -index option} {
+test cmdIL-1.11 {Tcl_LsortObjCmd procedure, -index option} {
     list [catch {lsort -index {1 3 2 5}} msg] $msg
 } {1 {"-index" option must be followed by list index}}
-test cmdIL-1.11 {Tcl_LsortObjCmd procedure, -index option} {
+test cmdIL-1.12 {Tcl_LsortObjCmd procedure, -index option} {
     list [catch {lsort -index foo {1 3 2 5}} msg] $msg
 } {1 {bad index "foo": must be integer or "end"}}
-test cmdIL-1.12 {Tcl_LsortObjCmd procedure, -index option} {
+test cmdIL-1.13 {Tcl_LsortObjCmd procedure, -index option} {
     lsort -index end -integer {{2 25} {10 20 50 100} {3 16 42} 1}
 } {1 {2 25} {3 16 42} {10 20 50 100}}
-test cmdIL-1.13 {Tcl_LsortObjCmd procedure, -index option} {
+test cmdIL-1.14 {Tcl_LsortObjCmd procedure, -index option} {
     lsort -index 1 -integer {{1 25 100} {3 16 42} {10 20 50}}
 } {{3 16 42} {10 20 50} {1 25 100}}
-test cmdIL-1.14 {Tcl_LsortObjCmd procedure, -integer option} {
+test cmdIL-1.15 {Tcl_LsortObjCmd procedure, -integer option} {
     lsort -integer {24 6 300 18}
 } {6 18 24 300}
-test cmdIL-1.15 {Tcl_LsortObjCmd procedure, -integer option} {
+test cmdIL-1.16 {Tcl_LsortObjCmd procedure, -integer option} {
     list [catch {lsort -integer {1 3 2.4}} msg] $msg
 } {1 {expected integer but got "2.4"}}
-test cmdIL-1.16 {Tcl_LsortObjCmd procedure, -real option} {
+test cmdIL-1.17 {Tcl_LsortObjCmd procedure, -real option} {
     lsort -real {24.2 6e3 150e-1}
 } {150e-1 24.2 6e3}
-test cmdIL-1.17 {Tcl_LsortObjCmd procedure, bogus list} {
+test cmdIL-1.18 {Tcl_LsortObjCmd procedure, bogus list} {
     list [catch {lsort "1 2 3 \{ 4"} msg] $msg
 } {1 {unmatched open brace in list}}
-test cmdIL-1.18 {Tcl_LsortObjCmd procedure, empty list} {
+test cmdIL-1.19 {Tcl_LsortObjCmd procedure, empty list} {
     lsort {}
 } {}
 
diff --git a/tests/http.test b/tests/http.test
index 3a0e420..e5afd9a 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -11,7 +11,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
 #
-# RCS: @(#) $Id: http.test,v 1.1.2.2 1998/09/24 23:59:25 stanton Exp $
+# RCS: @(#) $Id: http.test,v 1.1.2.3 1998/11/11 04:08:28 stanton Exp $
 
 if {[string compare test [info procs test]] == 1} then {source defs}
 
@@ -256,7 +256,7 @@ test http-4.11 {http::Event} {
     http::status $token
 } {reset}
 test http-4.12 {http::Event} {
-    set token [http::geturl $url -timeout 1 -command {#}]
+    set token [http::geturl $url?timeout=10 -timeout 1 -command {#}]
     http::wait $token
     http::status $token
 } {timeout}
diff --git a/tests/httpold.test b/tests/httpold.test
index 3873639..138574a 100644
--- a/tests/httpold.test
+++ b/tests/httpold.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: httpold.test,v 1.1.2.1 1998/09/24 23:59:25 stanton Exp $
+# RCS: @(#) $Id: httpold.test,v 1.1.2.2 1998/11/11 04:08:28 stanton Exp $
 
 if {[string compare test [info procs test]] == 1} then {source defs}
 
@@ -145,6 +145,14 @@ proc httpdRespond { sock } {
 	    append html "<h2>Query</h2>\n<dl>\n"
 	    foreach {key value} [split $data(query) &=] {
 		append html "<dt>$key<dd>$value\n"
+		if {[string compare $key timeout] == 0} {
+		    # Simulate a timeout by not responding,
+		    # but clean up our socket later.
+
+		    after 50 [list httpdSockDone $sock]
+		    httpd_log $sock Noresponse ""
+		    return
+		}
 	    }
 	    append html </dl>\n
 	}
diff --git a/tests/interp.test b/tests/interp.test
index f602def..bfca84b 100644
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -5,11 +5,12 @@
 # generates output for errors.  No output means no errors were found.
 #
 # Copyright (c) 1995-1996 Sun Microsystems, Inc.
+# Copyright (c) 1998 by Scriptics Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: interp.test,v 1.1.2.3 1998/10/05 18:47:26 stanton Exp $
+# RCS: @(#) $Id: interp.test,v 1.1.2.4 1998/11/11 04:08:29 stanton Exp $
 
 if {[string compare test [info procs test]] == 1} then {source defs}
 
@@ -2316,8 +2317,15 @@ test interp-29.2 {recursion limit inheritance} {
 #test interp-29.1 {interp and stack (info level)} {
 #} {}
 
+# End of stack-recursion tests
 }
 
+# This test dumps core in Tcl 8.0.3!
+#test interp-30.1 {deletion of aliases inside namespaces} {
+#    set i [interp create]
+#    $i alias ns::cmd list
+#    $i alias ns::cmd {}
+#} {}
 
 foreach i [interp slaves] {
   interp delete $i
diff --git a/tests/io.test b/tests/io.test
index d90d1c0..cd0c06d 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -11,7 +11,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: io.test,v 1.1.2.2 1998/09/24 23:59:27 stanton Exp $
+# RCS: @(#) $Id: io.test,v 1.1.2.3 1998/11/11 04:08:30 stanton Exp $
 
 if {[string compare test [info procs test]] == 1} then {source defs}
 
@@ -6705,8 +6705,8 @@ test io-34.2 {buffered data and file events, read} {
     proc accept {sock args} {
 	set ::s2 $sock
     }
-    set server [socket -server accept 4040]
-    set s [socket localhost 4040]
+    set server [socket -server accept 4041]
+    set s [socket localhost 4041]
     vwait s2
     update
     fileevent $s2 readable {lappend result readable}
@@ -6723,6 +6723,31 @@ test io-34.2 {buffered data and file events, read} {
     set result
 } {1 readable 234567890 timer}
         
+test io-35.1 {Tcl_NotifyChannel and error when closing} {unixOrPc} {
+    set out [open script w]
+    puts $out {
+	puts "normal message from pipe"
+	puts stderr "error message from pipe"
+	exit 1
+    }
+    proc readit {pipe} {
+	global x result
+	if {[eof $pipe]} {
+	    set x [catch {close $pipe} line]
+	    lappend result catch $line
+	} else {
+	    gets $pipe line
+	    lappend result gets $line
+	}
+    }
+    close $out
+    set pipe [open "|[list $tcltest] script" r]
+    fileevent $pipe readable [list readit $pipe]
+    set x ""
+    set result ""
+    vwait x
+    list $x $result
+} {1 {gets {normal message from pipe} gets {} catch {error message from pipe}}}
 
 
 removeFile fooBar
diff --git a/tests/parse.test b/tests/parse.test
index ff61caa..3f8ae88 100644
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -7,7 +7,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: parse.test,v 1.1.2.2 1998/09/24 23:59:33 stanton Exp $
+# RCS: @(#) $Id: parse.test,v 1.1.2.3 1998/11/11 04:08:33 stanton Exp $
 
 if {[info commands testparser] == {}} {
     puts "This application hasn't been compiled with the \"testparser\""
@@ -555,151 +555,185 @@ test parse-15.4 {Tcl_ParseQuotedString procedure, garbage after quoted string} {
     invoked from within
 "testparser {foo "a b c"d} 0"}}
 
-test parse-15.1 {CommandComplete procedure} {
+test parse-15.5 {CommandComplete procedure} {
     info complete ""
 } 1
-test parse-15.2 {CommandComplete procedure} {
+test parse-15.6 {CommandComplete procedure} {
     info complete "  \n"
 } 1
-test parse-15.3 {CommandComplete procedure} {
+test parse-15.7 {CommandComplete procedure} {
     info complete "abc def"
 } 1
-test parse-15.4 {CommandComplete procedure} {
+test parse-15.8 {CommandComplete procedure} {
     info complete "a b c d e f \t\n"
 } 1
-test parse-15.5 {CommandComplete procedure} {
+test parse-15.9 {CommandComplete procedure} {
     info complete {a b c"d}
 } 1
-test parse-15.6 {CommandComplete procedure} {
+test parse-15.10 {CommandComplete procedure} {
     info complete {a b "c d" e}
 } 1
-test parse-15.7 {CommandComplete procedure} {
+test parse-15.11 {CommandComplete procedure} {
     info complete {a b "c d"}
 } 1
-test parse-15.8 {CommandComplete procedure} {
+test parse-15.12 {CommandComplete procedure} {
     info complete {a b "c d"}
 } 1
-test parse-15.9 {CommandComplete procedure} {
+test parse-15.13 {CommandComplete procedure} {
     info complete {a b "c d}
 } 0
-test parse-15.10 {CommandComplete procedure} {
+test parse-15.14 {CommandComplete procedure} {
     info complete {a b "}
 } 0
-test parse-15.11 {CommandComplete procedure} {
+test parse-15.15 {CommandComplete procedure} {
     info complete {a b "cd"xyz}
 } 1
-test parse-15.12 {CommandComplete procedure} {
+test parse-15.16 {CommandComplete procedure} {
     info complete {a b "c $d() d"}
 } 1
-test parse-15.13 {CommandComplete procedure} {
+test parse-15.17 {CommandComplete procedure} {
     info complete {a b "c $dd("}
 } 0
-test parse-15.14 {CommandComplete procedure} {
+test parse-15.18 {CommandComplete procedure} {
     info complete {a b "c \"}
 } 0
-test parse-15.15 {CommandComplete procedure} {
+test parse-15.19 {CommandComplete procedure} {
     info complete {a b "c [d e f]"}
 } 1
-test parse-15.16 {CommandComplete procedure} {
+test parse-15.20 {CommandComplete procedure} {
     info complete {a b "c [d e f] g"}
 } 1
-test parse-15.17 {CommandComplete procedure} {
+test parse-15.21 {CommandComplete procedure} {
     info complete {a b "c [d e f"}
 } 0
-test parse-15.18 {CommandComplete procedure} {
+test parse-15.22 {CommandComplete procedure} {
     info complete {a {b c d} e}
 } 1
-test parse-15.19 {CommandComplete procedure} {
+test parse-15.23 {CommandComplete procedure} {
     info complete {a {b c d}}
 } 1
-test parse-15.20 {CommandComplete procedure} {
+test parse-15.24 {CommandComplete procedure} {
     info complete "a b\{c d"
 } 1
-test parse-15.21 {CommandComplete procedure} {
+test parse-15.25 {CommandComplete procedure} {
     info complete "a b \{c"
 } 0
-test parse-15.22 {CommandComplete procedure} {
+test parse-15.26 {CommandComplete procedure} {
     info complete "a b \{c{ }"
 } 0
-test parse-15.23 {CommandComplete procedure} {
+test parse-15.27 {CommandComplete procedure} {
     info complete "a b {c d e}xxx"
 } 1
-test parse-15.24 {CommandComplete procedure} {
+test parse-15.28 {CommandComplete procedure} {
     info complete "a b {c \\\{d e}xxx"
 } 1
-test parse-15.25 {CommandComplete procedure} {
+test parse-15.29 {CommandComplete procedure} {
     info complete {a b [ab cd ef]}
 } 1
-test parse-15.26 {CommandComplete procedure} {
+test parse-15.30 {CommandComplete procedure} {
     info complete {a b x[ab][cd][ef] gh}
 } 1
-test parse-15.27 {CommandComplete procedure} {
+test parse-15.31 {CommandComplete procedure} {
     info complete {a b x[ab][cd[ef] gh}
 } 0
-test parse-15.28 {CommandComplete procedure} {
+test parse-15.32 {CommandComplete procedure} {
     info complete {a b x[ gh}
 } 0
-test parse-15.29 {CommandComplete procedure} {
+test parse-15.33 {CommandComplete procedure} {
     info complete {[]]]}
 } 1
-test parse-15.30 {CommandComplete procedure} {
+test parse-15.34 {CommandComplete procedure} {
     info complete {abc x$yyy}
 } 1
-test parse-15.31 {CommandComplete procedure} {
+test parse-15.35 {CommandComplete procedure} {
     info complete "abc x\${abc\[\\d} xyz"
 } 1
-test parse-15.32 {CommandComplete procedure} {
+test parse-15.36 {CommandComplete procedure} {
     info complete "abc x\$\{ xyz"
 } 0
-test parse-15.33 {CommandComplete procedure} {
+test parse-15.37 {CommandComplete procedure} {
     info complete {word $a(xyz)}
 } 1
-test parse-15.34 {CommandComplete procedure} {
+test parse-15.38 {CommandComplete procedure} {
     info complete {word $a(}
 } 0
-test parse-15.35 {CommandComplete procedure} {
+test parse-15.39 {CommandComplete procedure} {
     info complete "set a \\\n"
 } 0
-test parse-15.36 {CommandComplete procedure} {
+test parse-15.40 {CommandComplete procedure} {
     info complete "set a \\\\\n"
 } 1
-test parse-15.37 {CommandComplete procedure} {
+test parse-15.41 {CommandComplete procedure} {
     info complete "set a \\n "
 } 1
-test parse-15.38 {CommandComplete procedure} {
+test parse-15.42 {CommandComplete procedure} {
     info complete "set a \\"
 } 1
-test parse-15.39 {CommandComplete procedure} {
+test parse-15.43 {CommandComplete procedure} {
     info complete "foo \\\n\{"
 } 0
-test parse-15.40 {CommandComplete procedure} {
+test parse-15.44 {CommandComplete procedure} {
     info complete "a\nb\n# \{\n# \{\nc\n"
 } 1
-test parse-15.41 {CommandComplete procedure} {
+test parse-15.45 {CommandComplete procedure} {
     info complete "#Incomplete comment\\\n"
 } 0
-test parse-15.42 {CommandComplete procedure} {
+test parse-15.46 {CommandComplete procedure} {
     info complete "#Incomplete comment\\\nBut now it's complete.\n"
 } 1
-test parse-15.43 {CommandComplete procedure} {
+test parse-15.47 {CommandComplete procedure} {
     info complete "# Complete comment\\\\\n"
 } 1
-test parse-15.44 {CommandComplete procedure} {
+test parse-15.48 {CommandComplete procedure} {
     info complete "abc\\\n def"
 } 1
-test parse-15.45 {CommandComplete procedure} {
+test parse-15.49 {CommandComplete procedure} {
     info complete "abc\\\n "
 } 1
-test parse-15.46 {CommandComplete procedure} {
+test parse-15.50 {CommandComplete procedure} {
     info complete "abc\\\n"
 } 0
-test parse-15.47 {CommandComplete procedure} {
+test parse-15.51 {CommandComplete procedure} {
     info complete "\{abc\}\{"
 } 1
-test parse-15.48 {CommandComplete procedure} {
+test parse-15.52 {CommandComplete procedure} {
     info complete "\"abc\"("
 } 1
+test parse-15.53 {CommandComplete procedure} {
+    parse complete " # \{"
+} 1
+test parse-15.54 {CommandComplete procedure} {
+    parse complete "foo bar;# \{"
+} 1
+test parse-15.55 {CommandComplete procedure} {
+    parse complete "a\nb\n# \{\n# \{\nc\n"
+} 1
+test parse-15.56 {CommandComplete procedure} {
+    parse complete "#Incomplete comment\\\n"
+} 0
+test parse-15.57 {CommandComplete procedure} {
+    parse complete "#Incomplete comment\\\nBut now it's complete.\n"
+} 1
+test parse-15.58 {CommandComplete procedure} {
+    parse complete "# Complete comment\\\\\n"
+} 1
+test parse-15.59 {CommandComplete procedure} {
+    parse complete "abc\\\n def"
+} 1
+test parse-15.60 {CommandComplete procedure} {
+    parse complete "abc\\\n "
+} 1
+test parse-15.61 {CommandComplete procedure} {
+    parse complete "abc\\\n"
+} 0
+test parse-15.62 {CommandComplete procedure} {
+    parse complete "set x [binary format H 00]; puts hi"
+} 1
+test parse-15.63 {CommandComplete procedure} {
+    parse complete "set x [binary format H 00]; {"
+} 0
 
 
 catch {unset a}
 return
+
diff --git a/tests/registry.test b/tests/registry.test
index ffa2961..5196cfb 100644
--- a/tests/registry.test
+++ b/tests/registry.test
@@ -9,7 +9,7 @@
 #
 # Copyright (c) 1997 by Sun Microsystems, Inc.  All rights reserved.
 #
-# RCS: @(#) $Id: registry.test,v 1.1.2.2 1998/09/24 23:59:34 stanton Exp $
+# RCS: @(#) $Id: registry.test,v 1.1.2.3 1998/11/11 04:08:33 stanton Exp $
 
 if {$tcl_platform(platform) != "windows"} {
     return
@@ -17,7 +17,10 @@ if {$tcl_platform(platform) != "windows"} {
 
 if {[string compare test [info procs test]] == 1} then {source defs}
 
-if [catch {package require registry}] {
+set lib [lindex [glob [file join [pwd] [file dirname \
+	[info nameofexecutable]] tclreg*.dll]] 0]
+
+if [catch {load $lib registry}] {
     puts "Unable to find the registry package. Skipping registry tests."
     return
 }
diff --git a/tests/resource.test b/tests/resource.test
index 840443c..938ff34 100644
--- a/tests/resource.test
+++ b/tests/resource.test
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: resource.test,v 1.1.2.1 1998/09/24 23:59:35 stanton Exp $
+# RCS: @(#) $Id: resource.test,v 1.1.2.2 1998/11/11 04:08:34 stanton Exp $
 
 # Only run this test on Macintosh systems
 if {$tcl_platform(platform) != "macintosh"} {
@@ -45,27 +45,38 @@ test resource-2.5 {resource open & close tests} {
 } {}
 test resource-2.6 {resource open & close tests} {
     catch {file delete rsrc.file}
-    testWriteTextResource -rsrc fileRsrcName -file rsrc.file  {error "don't source me"}
+    testWriteTextResource -rsrc fileRsrcName -file rsrc.file  {A test string}
     set id [resource open rsrc.file]
     set result [string compare [resource open rsrc.file] $id]
+    lappend result [resource read TEXT fileRsrcName $id]
     resource close $id
     file delete rsrc.file
     set result
-} {0}
+} {0 {A test string}}
 test resource-2.7 {resource open & close tests} {
+    catch {file delete rsrc.file}
+    testWriteTextResource -rsrc fileRsrcName -file rsrc.file  {error "don't source me"}
+    set id [resource open rsrc.file r]
+    set result [catch {resource open rsrc.file w} mssg]
+    resource close $id
+    file delete rsrc.file
+    lappend result $mssg
+    set result
+} {1 {Resource already open with different permissions.}}
+test resource-2.8 {resource open & close tests} {
     list [catch {resource close} msg] $msg
 } {1 {wrong # args: should be "resource close resourceRef"}}
-test resource-2.8 {resource open & close tests} {
+test resource-2.9 {resource open & close tests} {
     list [catch {resource close foo bar} msg] $msg
 } {1 {wrong # args: should be "resource close resourceRef"}}
-test resource-2.9 {resource open & close tests} {
+test resource-2.10 {resource open & close tests} {
     list [catch {resource close _bad_resource_} msg] $msg
 } {1 {invalid resource file reference "_bad_resource_"}}
-test resource-2.10 {resource open & close tests} {
+test resource-2.11 {resource open & close tests} {
     set result [catch {resource close System} mssg]
     lappend result $mssg
 } {1 {can't close "System" resource file}}
-test resource-2.11 {resource open & close tests} {
+test resource-2.12 {resource open & close tests} {
     set result [catch {resource close application} mssg]
     lappend result $mssg
 } {1 {can't close "application" resource file}}
diff --git a/tests/safe.test b/tests/safe.test
index 4ca857a..745b529 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: safe.test,v 1.1.2.2 1998/09/24 23:59:35 stanton Exp $
+# RCS: @(#) $Id: safe.test,v 1.1.2.3 1998/11/11 04:08:35 stanton Exp $
 
 if {[string compare test [info procs test]] == 1} then {source defs}
 
@@ -167,7 +167,10 @@ test safe-6.1 {test safe interpreters knowledge of the world} {
 test safe-6.2 {test safe interpreters knowledge of the world} {
     SI; set r [$I eval {info script}]; DI; set r
 } {}
-test safe-6.3 {test safe interpreters knowledge of the world} {
+test safe-6.3 {test safe interpreters knowledge of the world} {pcOnly} {
+    SI; set r [lsort [$I eval {array names tcl_platform}]]; DI; set r
+} {byteOrder debug platform}
+test safe-6.3 {test safe interpreters knowledge of the world} {macOrUnix} {
     SI; set r [lsort [$I eval {array names tcl_platform}]]; DI; set r
 } {byteOrder platform}
 
diff --git a/tests/winPipe.test b/tests/winPipe.test
index f8d0192..1991abc 100644
--- a/tests/winPipe.test
+++ b/tests/winPipe.test
@@ -11,14 +11,15 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: winPipe.test,v 1.1.2.2 1998/09/24 23:59:40 stanton Exp $
+# RCS: @(#) $Id: winPipe.test,v 1.1.2.3 1998/11/11 04:08:35 stanton Exp $
 
 if {($tcl_platform(platform) != "windows") || ($testConfig(stdio) == 0)} {
     return
 }
 
-set cat16 [file join $tcl_library ../win/cat16.exe]
-set cat32 [file join $tcl_library ../win/cat32.exe]
+set bindir [file join [pwd] [file dirname [info nameofexecutable]]]
+set cat16 [file join  $bindir cat16.exe]
+set cat32 [file join $bindir cat32.exe]
 
 if {[string compare test [info procs test]] == 1} then {source defs}
 
@@ -263,7 +264,7 @@ test winpipe-2.21 {16 bit comprehensive tests: read/write application} {nt} {
 } "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
 }
 
-test winpipe-3.1 {Tcl_WaitPid} {nt} {
+test winpipe-4.1 {Tcl_WaitPid} {nt} {
     proc readResults {f} {
 	global x result
 	if { [eof $f] } {