adjusted to the correct treatmeant of file:// URLs

2 files changed, 7 insertions, 2 deletions

diff --git a/tests/data/test200 b/tests/data/test200
index 19d44eb16..709de52fe 100644
--- a/tests/data/test200
+++ b/tests/data/test200
@@ -12,10 +12,10 @@ moo
 # Client-side
 <client>
  <name>
-file:// with relative path
+basic file:// file
  </name>
  <command>
-file://log/test200.txt
+file://localhost/%PWD/log/test200.txt
 </command>
 <file name="log/test200.txt">
 foo
diff --git a/tests/runtests.pl b/tests/runtests.pl
index ac87beb09..d2132c325 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -68,6 +68,9 @@ my $debugprotocol;
 my $anyway;
 my $gdbthis;      # run test case with gdb debugger
 my $keepoutfiles; # keep stdout and stderr files after tests
+my $pwd;          # current working directory
+
+chomp($pwd = `pwd`);
 
 #######################################################################
 # Return the pid of the server as found in the given pid file
@@ -443,6 +446,8 @@ sub singletest {
     $cmd =~ s/%FTPPORT/$FTPPORT/g;
     $cmd =~ s/%FTPSPORT/$FTPSPORT/g;
     $cmd =~ s/%SRCDIR/$srcdir/g;
+    $cmd =~ s/%PWD/$pwd/g;
+
     #$cmd =~ s/%HOSTNAME/$HOSTNAME/g;
 
     if($memory_debug) {