diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/http.test | 30 | ||||
| -rw-r--r-- | tests/unixInit.test | 6 |
2 files changed, 19 insertions, 17 deletions
diff --git a/tests/http.test b/tests/http.test index 752e3a2..099b962 100644 --- a/tests/http.test +++ b/tests/http.test @@ -12,7 +12,7 @@ # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # -# RCS: @(#) $Id: http.test,v 1.4 1999/04/16 00:47:28 stanton Exp $ +# RCS: @(#) $Id: http.test,v 1.5 1999/04/24 01:46:53 stanton Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { source [file join [pwd] [file dirname [info script]] defs.tcl] @@ -36,7 +36,16 @@ if {[catch {package require http 2.0}]} { set port 8010 set bindata "This is binary data\x0d\x0amore\x0dmore\x0amore\x00null" -set httpdFile [file join $::tcltest::testsDir httpd] +# Ensure httpd file exists + +set origFile [file join $::tcltest::testsDir httpd] +set newFile [file join $::tcltest::workingDir httpd] +if {![file exists $newFile]} { + file copy $origFile $newFile + set removeHttpd 1 +} +set httpdFile [file join $::tcltest::workingDir httpd] + if {[info commands testthread] == "testthread" && [file exists $httpdFile]} { set httpthread [testthread create " source $httpdFile @@ -299,17 +308,10 @@ if {[info exists httpthread]} { } else { close $listen } -::tcltest::cleanupTests -return - - - - - - - - - - +if {[info exist removeHttpd]} { + remove $httpdFile +} +::tcltest::cleanupTests +return diff --git a/tests/unixInit.test b/tests/unixInit.test index 7ed56b7..84fcdb0 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.4 1999/04/21 21:50:31 rjohnson Exp $ +# RCS: @(#) $Id: unixInit.test,v 1.5 1999/04/24 01:46:53 stanton Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { source [file join [pwd] [file dirname [info script]] defs.tcl] @@ -90,7 +90,7 @@ test unixInit-2.1 {TclpInitLibraryPath: value of installLib, developLib} \ set x {} lappend x [string compare [lindex $path 0] $prefix/$installLib] - lappend x [string compare [lindex $path 1] [file dirname $prefix]/$developLib] + lappend x [string compare [lindex $path 4] [file dirname $prefix]/$developLib] set x } {0 0} test unixInit-2.2 {TclpInitLibraryPath: TCL_LIBRARY} {unixOnly installedTcl} { @@ -139,7 +139,7 @@ test unixInit-2.6 {TclpInitLibraryPath: executable relative} \ set x [lrange [getlibpath /tmp/sparkly/bin/tcltest] 0 1] file delete -force /tmp/sparkly set x -} [list /tmp/sparkly/lib/tcl[info tclversion] /tmp/tcl[info tclversion]/library] +} [list /tmp/sparkly/lib/tcl[info tclversion] /tmp/lib/tcl[info tclversion]] test unixInit-2.7 {TclpInitLibraryPath: compiled-in library path} \ {emptyTest unixOnly} { # would need test command to get defaultLibDir and compare it to |