Changeset 2402 for box/trunk/infrastructure

Timestamp:

05/12/2008 23:13:38 (3 years ago)

Author:

chris

Message:

Simplify code for killing old fart processes on Windows/Cygwin?
and make it actually work at the end of the test. man kill for
why we use /bin/kill instead of just kill on cygwin.

File:

• box/trunk/infrastructure/makebuildenv.pl.in (modified) (3 diffs)

box/trunk/infrastructure/makebuildenv.pl.in

@@ -401 +401 @@
                         print TESTFILE "#!/bin/sh\necho TEST: $module\n";
 
+                        if ($target_windows)
+                        {
+                                print TESTFILE <<__E;
+kill_process()
+{
+        test -r testfiles/$1.pid \
+        && /bin/kill -0 -f `cat testfiles/$1.pid` \
+        && /bin/kill    -f `cat testfiles/$1.pid`
+}
+__E
+                        }
+                        else
+                        {
+                                print TESTFILE <<__E;
+kill_process()
+{
+        test -r testfiles/$1.pid \
+        && kill -0 `cat testfiles/$1.pid` \
+        && kill    `cat testfiles/$1.pid`
+}
+__E
+                        }
+
                         if (-d "$module/testfiles")
                         {
-                                if ($target_windows)
-                                {
                                 print TESTFILE <<__E;
 echo Killing any running daemons...
-test -r testfiles/bbackupd.pid && /bin/kill -f `cat testfiles/bbackupd.pid`
-test -r testfiles/bbstored.pid && /bin/kill -f `cat testfiles/bbstored.pid`
-__E
-                        }
-                        else
-                        {
-                                print TESTFILE <<__E;
-echo Killing any running daemons...
-test -r testfiles/bbackupd.pid && kill `cat testfiles/bbackupd.pid`
-test -r testfiles/bbstored.pid && kill `cat testfiles/bbstored.pid`
+kill_process bbackupd
+kill_process bbstored
 __E
                         }
@@ -431 +444 @@
                         }
 
-                        if(-e "$module/testextra")
+                        if (-e "$module/testextra")
                         {
                                 open FL,"$module/testextra" or die 
@@ -441 +454 @@
                         print TESTFILE "$runcmd\n";
 
-                        if(-d "$module/testfiles")
+                        if (-d "$module/testfiles")
                         {
                                 print TESTFILE <<__E;
-
-# echo Killing any running daemons...
-test -r testfiles/bbackupd.pid \\
-&& kill -0 `cat testfiles/bbackupd.pid` \\
-&& kill `cat testfiles/bbackupd.pid`
-
-test -r testfiles/bbstored.pid \\
-&& kill -0 `cat testfiles/bbstored.pid` \\
-&& kill `cat testfiles/bbstored.pid`
+echo Killing any running daemons...
+kill_process bbackupd
+kill_process bbstored
 __E
                         }