1 files changed, 28 insertions, 29 deletions
diff --git a/tests/unixFile.test b/tests/unixFile.test
index eed009c..8147f48 100644
--- a/tests/unixFile.test
+++ b/tests/unixFile.test
@@ -4,63 +4,62 @@
 # built-in commands.  Sourcing this file into Tcl runs the tests and
 # generates output for errors.  No output means no errors were found.
 #
-# Copyright (c) 1998 by Scriptics Corporation.
+# 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.
-#
-# SCCS: %Z% $Id: unixFile.test,v 1.1 1998/06/17 18:16:41 stanton Exp $ 
-
- 
-if {[string compare test [info procs test]] == 1} then {source defs}
 
-if {[info commands testobj] == {}} {
-    puts "This application hasn't been compiled with the \"testfindexecutable\""
-    puts "command, so I can't test the Tcl_FindExecutable function"
-    return
+if {[lsearch [namespace children] ::tcltest] == -1} {
+    package require tcltest
+    namespace import -force ::tcltest::*
 }
 
-if {$tcl_platform(platform) != "unix"} {
-    return
-}
+::tcltest::loadTestedCommands
+catch [list package require -exact Tcltest [info patchlevel]]
+
+testConstraint testfindexecutable [llength [info commands testfindexecutable]]
 
+set oldpwd [pwd]
+cd [temporaryDirectory]
 
-set oldPath $env(PATH)
-close [open junk w]
-file attributes junk -perm 0777
+catch {
+    set oldPath $env(PATH)
+    file attributes [makeFile "" junk] -perm 0777
+}
+set absPath [file join [temporaryDirectory] junk]
 
-set absPath [file join [pwd] junk]
-test unixFile-1.1 {Tcl_FindExecutable} {
+test unixFile-1.1 {Tcl_FindExecutable} {testfindexecutable unix} {
     set env(PATH) ""
     testfindexecutable junk
 } $absPath
-test unixFile-1.2 {Tcl_FindExecutable} {
+test unixFile-1.2 {Tcl_FindExecutable} {testfindexecutable unix} {
     set env(PATH) "/dummy"
     testfindexecutable junk
 } {}
-test unixFile-1.3 {Tcl_FindExecutable} {
+test unixFile-1.3 {Tcl_FindExecutable} {testfindexecutable unix} {
     set env(PATH) "/dummy:[pwd]"
     testfindexecutable junk
 } $absPath
-test unixFile-1.4 {Tcl_FindExecutable} {
+test unixFile-1.4 {Tcl_FindExecutable} {testfindexecutable unix} {
     set env(PATH) "/dummy:"
     testfindexecutable junk
 } $absPath
-test unixFile-1.5 {Tcl_FindExecutable} {
+test unixFile-1.5 {Tcl_FindExecutable} {testfindexecutable unix} {
     set env(PATH) "/dummy:/dummy"
     testfindexecutable junk
 } {}
-test unixFile-1.6 {Tcl_FindExecutable} {
+test unixFile-1.6 {Tcl_FindExecutable} {testfindexecutable unix} {
     set env(PATH) "/dummy::/dummy"
     testfindexecutable junk
 } $absPath
-test unixFile-1.7 {Tcl_FindExecutable} {
+test unixFile-1.7 {Tcl_FindExecutable} {testfindexecutable unix} {
     set env(PATH) ":/dummy"
     testfindexecutable junk
 } $absPath
 
-
-
-
-set env(PATH) $oldPath
-file delete junk
+# cleanup
+catch {set env(PATH) $oldPath}
+removeFile junk
+cd $oldpwd
+::tcltest::cleanupTests
+return