summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2001-09-20 12:08:37 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2001-09-20 12:08:37 (GMT)
commit022c68f3b3a4b6031b0d7ddbfc4530e866c8867c (patch)
treef9ccbdcd27fd881c6c6e02589cbf8de202d8abb0
parent32d25a83797b68399f879b2bbdc6555c639487eb (diff)
downloadtcl-022c68f3b3a4b6031b0d7ddbfc4530e866c8867c.zip
tcl-022c68f3b3a4b6031b0d7ddbfc4530e866c8867c.tar.gz
tcl-022c68f3b3a4b6031b0d7ddbfc4530e866c8867c.tar.bz2
removed dependence on socket.test being run from same dir as remote.tcl,
which only now needs to be in the same dir as it. [Bug #219326]
-rw-r--r--ChangeLog6
-rw-r--r--tests/socket.test7
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e8a368e..d4384bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-20 Donal K. Fellows <fellowsd@cs.man.ac.uk>
+
+ * tests/socket.test: removed dependence on being run from same dir
+ as remote.tcl, which only now needs to be in the same dir as this
+ file. [Bug #219326]
+
2001-09-19 Jeff Hobbs <jeffh@ActiveState.com>
* tests/winPipe.test: removed obsolete cat16 tests
diff --git a/tests/socket.test b/tests/socket.test
index 46a3e72..da8612a 100644
--- a/tests/socket.test
+++ b/tests/socket.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: socket.test,v 1.18 2001/09/14 00:43:21 hobbs Exp $
+# RCS: @(#) $Id: socket.test,v 1.19 2001/09/20 12:08:37 dkf Exp $
# Running socket tests with a remote server:
# ------------------------------------------
@@ -123,7 +123,10 @@ if {$doTestsWithRemoteServer} {
set doTestsWithRemoteServer 0
} else {
set remoteServerIP 127.0.0.1
- set remoteFile [file join [pwd] remote.tcl]
+ # Be *extra* careful in case this file is sourced from
+ # a directory other than the current one...
+ set remoteFile [file join [pwd] [file dirname [info script]] \
+ remote.tcl]
if {[catch {set remoteProcChan \
[open "|[list $::tcltest::tcltest $remoteFile \
-serverIsSilent \