use the pid file, use the automake subdir

1 files changed, 6 insertions, 2 deletions

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 4d18268d6..b88988ac7 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -140,14 +140,18 @@ sub runhttpserver {
     my $RUNNING;
     my $pid;
 
+    $pid = checkserver ($HTTPPIDFILE);
+
     # verify if our/any server is running on this port
     my $data=`$CURL --silent -i $HOSTIP:$HOSTPORT/verifiedserver`;
 
     if ( $data =~ /WE ROOLZ(: |)(\d*)/ ) {
-        $pid = 0+$2;
+        if($2) {
+            $pid = 0+$2;
+        }
 
         if(!$pid) {
-            print "Test server already running with unkown pid! Use it...\n";
+            print "Test server already running with unknown pid! Use it...\n";
             return;
         }