diff options
| author | Yang Tse <yangsita@gmail.com> | 2007-11-23 09:50:44 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2007-11-23 09:50:44 +0000 |
| commit | 3daa54d636f736635e03f5a896ba66f64477592d (patch) | |
| tree | 9fadc77a7fea1e3892538c4831df8c7d79638e79 /tests/ftpserver.pl | |
| parent | 8f1829d1d2f3311e109fb2e44d4b5e54048a41d3 (diff) | |
Revert last change since it breaks running the test suite
when builddir is different from srcdir.
Diffstat (limited to 'tests/ftpserver.pl')
| -rw-r--r-- | tests/ftpserver.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl index fe916e423..02a048f13 100644 --- a/tests/ftpserver.pl +++ b/tests/ftpserver.pl @@ -163,7 +163,7 @@ sub sysread_or_die { } sub startsf { - my $cmd="$srcdir/server/sockfilt --port $port --logfile log/sockctrl$ftpdnum$ext.log --pidfile .sockfilt$ftpdnum$ext.pid $ipv6"; + my $cmd="./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, - "$srcdir/server/sockfilt --port 0 --logfile log/sockdata$ftpdnum$ext.log --pidfile $pidf $ipv6"); + "./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="$srcdir/server/sockfilt --connect $port --addr $addr --logfile log/sockdata$ftpdnum$ext.log --pidfile .sockdata$ftpdnum$ext.pid $ipv6"; + my $filtcmd="./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); |