Changeset 2209 for box/trunk/infrastructure

Timestamp:

03/08/2008 07:57:27 (4 years ago)

Author:

chris

Message:

Kill running daemons using kill -f on Windows (cygwin) which kills
by Windows PID.

File:

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

box/trunk/infrastructure/makebuildenv.pl.in

@@ -409 +409 @@
                         print TESTFILE "#!/bin/sh\necho TEST: $module\n";
 
-                        if(-d "$module/testfiles")
+                        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;
@@ -415 +425 @@
 test -r testfiles/bbackupd.pid && kill `cat testfiles/bbackupd.pid`
 test -r testfiles/bbstored.pid && kill `cat testfiles/bbstored.pid`
-
+__E
+                        }
+
+
+                        print TESTFILE <<__E;
 echo Removing old test files...
 chmod -R a+rwx testfiles