Changeset 51

Timestamp:

02/28/2005 09:32:05 AM (4 years ago)

Author:

jan

Message:

get pidof working on linux

Files:

• trunk/tests/run-tests.pl (modified) (4 diffs)

trunk/tests/run-tests.pl

@@ -3 +3 @@
 use strict;
 use IO::Socket;
-use Test::More tests => 87;
+use Test::More tests => 89;
 
 
@@ -17 +17 @@
         my $prog = $_[0];
 
-        system("ps ax  | grep $prog | awk '{ print \$1 }' > $pidoffile") or
-        system("ps -ef | grep $prog | awk '{ print \$1 }' > $pidoffile") or
+        open F, "ps ax  | grep $prog | awk '{ print \$1 }'|" or
+        open F, "ps -ef | grep $prog | awk '{ print \$2 }'|" or
           return -1;
 
-        open F, $pidfile or return -1;
         my $pid = <F>;
         close F;
@@ -827 +826 @@
 
 SKIP: {
-        skip "no PHP running on port 1026", 11 if pidof("php") == -1; 
+        skip "no PHP running on port 1026", 13 if pidof("php") == -1; 
 
         @request  = ( <<EOF
@@ -906 +905 @@
 EOF
  );
-        @response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'zzz.example.org' } );
+        @response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'www.example.org' } );
         ok(handle_http == 0, 'SERVER_NAME');