Index: tests/all.tcl ================================================================== --- tests/all.tcl +++ tests/all.tcl @@ -5,22 +5,22 @@ # in this directory. # # Copyright (c) 1998-2000 by Ajuba Solutions. # All rights reserved. # -# RCS: @(#) $Id: all.tcl,v 1.2 2000/05/30 22:19:48 aborr Exp $ +# RCS: @(#) $Id: all.tcl,v 1.3 2000/06/05 22:57:58 stanton Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest namespace import ::tcltest::* } -set ::tcltest::testSingleFile false -set ::tcltest::testsDirectory [file dir [info script]] +# set ::tcltest::testSingleFile false +# set ::tcltest::testsDirectory [file dir [info script]] # We need to ensure that the testsDirectory is absolute -::tcltest::normalizePath ::tcltest::testsDirectory +# ::tcltest::normalizePath ::tcltest::testsDirectory puts stdout "Tests running in interp: [info nameofexecutable]" puts stdout "Tests running in working dir: $::tcltest::testsDirectory" if {[llength $::tcltest::skip] > 0} { puts stdout "Skipping tests that match: $::tcltest::skip" Index: tests/tlsIO.test ================================================================== --- tests/tlsIO.test +++ tests/tlsIO.test @@ -8,11 +8,11 @@ # Copyright (c) 1998-2000 Ajuba Solutions. # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tlsIO.test,v 1.4 2000/06/05 22:33:26 aborr Exp $ +# RCS: @(#) $Id: tlsIO.test,v 1.5 2000/06/05 22:57:58 stanton Exp $ # Running socket tests with a remote server: # ------------------------------------------ # # Some tests in socket.test depend on the existence of a remote server to @@ -68,15 +68,17 @@ } # Load the tls package package require tls -set serverCert [file join $::tcltest::testsDirectory certs server.pem] -set clientCert [file join $::tcltest::testsDirectory certs client.pem] -set caCert [file join $::tcltest::testsDirectory certs cacert.pem] -set serverKey [file join $::tcltest::testsDirectory certs skey.pem] -set clientKey [file join $::tcltest::testsDirectory certs ckey.pem] +set certsDir [file join [file dirname [info script]] certs] + +set serverCert [file join $certsDir server.pem] +set clientCert [file join $certsDir client.pem] +set caCert [file join $certsDir cacert.pem] +set serverKey [file join $certsDir skey.pem] +set clientKey [file join $certsDir ckey.pem] # Some tests require the testthread command set ::tcltest::testConstraints(testthread) \ [expr {[info commands testthread] != {}}]