Changeset 2409 for box/trunk/infrastructure

Timestamp:

16/12/2008 17:37:08 (3 years ago)

Author:

chris

Message:

Fix process kill function, fixes [2402] [2404].

Delete stale PID files after killing processes on Windows, as that
fine OS doesn't give them a chance to clean up for themselves.

File:

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

box/trunk/infrastructure/makebuildenv.pl.in

@@ -406 +406 @@
 kill_process()
 {
-        test -r testfiles/$1.pid \\
-        && /bin/kill -0 -f `cat testfiles/$1.pid` \\
-        && /bin/kill    -f `cat testfiles/$1.pid`
+        if test -r testfiles/\$1.pid; then
+                /bin/kill -0 -f `cat testfiles/\$1.pid` \\
+                && /bin/kill -f `cat testfiles/\$1.pid`
+                rm testfiles/\$1.pid
+        fi
 }
 __E
@@ -417 +419 @@
 kill_process()
 {
-        test -r testfiles/$1.pid \\
-        && kill -0 `cat testfiles/$1.pid` \\
-        && kill    `cat testfiles/$1.pid`
+        test -r testfiles/\$1.pid \\
+        && kill -0 `cat testfiles/\$1.pid` \\
+        && kill    `cat testfiles/\$1.pid`
 }
 __E