provide a source path to the servers to make them find the tests when run

outside the source dir, not needing any symlinks

1 files changed, 8 insertions, 1 deletions

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 00c2c81bc..f0ca9963c 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -39,7 +39,7 @@ my $FTPSPORT=8821;  # this is the FTPS server port
 my $CURL="../src/curl"; # what curl executable to run on the tests
 my $DBGCURL=$CURL; #"../src/.libs/curl";  # alternative for debugging
 my $LOGDIR="log";
-my $TESTDIR="data";
+my $TESTDIR="$srcdir/data";
 my $LIBDIR="./libtest";
 my $SERVERIN="$LOGDIR/server.input"; # what curl sent the server
 my $CURLLOG="$LOGDIR/curl.log"; # all command lines run
@@ -354,6 +354,10 @@ sub runhttpserver {
     }
 
     my $flag=$debugprotocol?"-v ":"";
+    my $dir=$ENV{'srcdir'};
+    if($dir) {
+        $flag .= "-d \"$dir\" ";
+    }
     $cmd="$perl $srcdir/httpserver.pl $flag $HOSTPORT &";
     system($cmd);
     if($verbose) {
@@ -691,6 +695,9 @@ sub checkcurl {
             }
         }
     }
+    if(!$curl) {
+        die "couldn't run curl!"
+    }
 
     my $hostname=`hostname`;
     my $hosttype=`uname -a`;