diff options
| -rw-r--r-- | tests/data/test1013 | 2 | ||||
| -rw-r--r-- | tests/data/test1014 | 2 | ||||
| -rw-r--r-- | tests/ftpserver.pl | 6 | ||||
| -rwxr-xr-x | tests/httpserver.pl | 6 | ||||
| -rwxr-xr-x | tests/runtests.pl | 8 |
5 files changed, 12 insertions, 12 deletions
diff --git a/tests/data/test1013 b/tests/data/test1013 index cae5fb8bd..6637c4bcd 100644 --- a/tests/data/test1013 +++ b/tests/data/test1013 @@ -23,7 +23,7 @@ Compare curl --version with curl-config --protocols --version </command> <postcheck> -%SRCDIR/libtest/test1013.pl ../curl-config log/stdout1013 protocols +%SRCDIR/libtest/test1013.pl %SRCDIR/../curl-config log/stdout1013 protocols </postcheck> </client> diff --git a/tests/data/test1014 b/tests/data/test1014 index 47238d713..bb3f8ab15 100644 --- a/tests/data/test1014 +++ b/tests/data/test1014 @@ -23,7 +23,7 @@ Compare curl --version with curl-config --features --version </command> <postcheck> -%SRCDIR/libtest/test1013.pl ../curl-config log/stdout1014 features +%SRCDIR/libtest/test1013.pl %SRCDIR/../curl-config log/stdout1014 features </postcheck> </client> diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl index 02a048f13..fe916e423 100644 --- a/tests/ftpserver.pl +++ b/tests/ftpserver.pl @@ -163,7 +163,7 @@ sub sysread_or_die { } sub startsf { - my $cmd="./server/sockfilt --port $port --logfile log/sockctrl$ftpdnum$ext.log --pidfile .sockfilt$ftpdnum$ext.pid $ipv6"; + my $cmd="$srcdir/server/sockfilt --port $port --logfile log/sockctrl$ftpdnum$ext.log --pidfile .sockfilt$ftpdnum$ext.pid $ipv6"; $sfpid = open2(*SFREAD, *SFWRITE, $cmd); print STDERR "$cmd\n" if($verbose); @@ -548,7 +548,7 @@ sub PASV_command { # We fire up a new sockfilt to do the data transfer for us. $slavepid = open2(\*DREAD, \*DWRITE, - "./server/sockfilt --port 0 --logfile log/sockdata$ftpdnum$ext.log --pidfile $pidf $ipv6"); + "$srcdir/server/sockfilt --port 0 --logfile log/sockdata$ftpdnum$ext.log --pidfile $pidf $ipv6"); print DWRITE "PING\n"; my $pong; @@ -680,7 +680,7 @@ sub PORT_command { # We fire up a new sockfilt to do the data transfer for us. # FIX: make it use IPv6 if need be - my $filtcmd="./server/sockfilt --connect $port --addr $addr --logfile log/sockdata$ftpdnum$ext.log --pidfile .sockdata$ftpdnum$ext.pid $ipv6"; + my $filtcmd="$srcdir/server/sockfilt --connect $port --addr $addr --logfile log/sockdata$ftpdnum$ext.log --pidfile .sockdata$ftpdnum$ext.pid $ipv6"; $slavepid = open2(\*DREAD, \*DWRITE, $filtcmd); print STDERR "$filtcmd\n" if($verbose); diff --git a/tests/httpserver.pl b/tests/httpserver.pl index ae1bcec28..cb49fa918 100755 --- a/tests/httpserver.pl +++ b/tests/httpserver.pl @@ -4,7 +4,7 @@ use strict; my $verbose=0; # set to 1 for debugging -my $dir="."; +my $srcdir="."; my $port = 8999; # just a default my $ipv6; my $pid=".http.pid"; # name of the pidfile @@ -14,7 +14,7 @@ do { $verbose=1; } elsif($ARGV[0] eq "-d") { - $dir=$ARGV[1]; + $srcdir=$ARGV[1]; shift @ARGV; } elsif($ARGV[0] eq "-p") { @@ -33,4 +33,4 @@ do { } } while(shift @ARGV); -exec("server/sws --pidfile $pid$fork $ipv6$port $dir"); +exec("$srcdir/server/sws --pidfile $pid$fork $ipv6$port $srcdir"); diff --git a/tests/runtests.pl b/tests/runtests.pl index f2ed1650d..fbe33017e 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -86,11 +86,11 @@ my $SSHPORT; # SCP/SFTP my $SOCKSPORT; # SOCKS4/5 port my $srcdir = $ENV{'srcdir'} || '.'; -my $CURL="../src/curl"; # what curl executable to run on the tests -my $DBGCURL=$CURL; #"../src/.libs/curl"; # alternative for debugging +my $CURL="$srcdir/../src/curl"; # what curl executable to run on the tests +my $DBGCURL=$CURL; #"$srcdir/../src/.libs/curl"; # alternative for debugging my $LOGDIR="log"; my $TESTDIR="$srcdir/data"; -my $LIBDIR="./libtest"; +my $LIBDIR="$srcdir/libtest"; my $SERVERIN="$LOGDIR/server.input"; # what curl sent the server my $SERVER2IN="$LOGDIR/server2.input"; # what curl sent the second server my $CURLLOG="$LOGDIR/curl.log"; # all command lines run @@ -1000,7 +1000,7 @@ sub runtftpserver { if($ipv6) { $flag .="--ipv6 "; } - $cmd="./server/tftpd --pidfile $pidfile $flag $port"; + $cmd="$srcdir/server/tftpd --pidfile $pidfile $flag $port"; unlink($pidfile); |