From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 26 Sep 2010 19:50:06 +0000 (-0700)
Subject: autobuild: use killbysubdir if available
X-Git-Tag: samba-4.0.0alpha14~2776
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=5ffacff5c4a4799aacf97cbc28581f8e302c145c

autobuild: use killbysubdir if available

this will reduce the spurious test output while processes are being
killed
---

diff --git a/script/autobuild.py b/script/autobuild.py
index 856ea625e53..5d7228b0515 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -72,7 +72,7 @@ retry_task = [ '''set -e
                 done
                ''' % samba_master]
 
-def run_cmd(cmd, dir=".", show=None, output=False):
+def run_cmd(cmd, dir=".", show=None, output=False, checkfail=True):
     cwd = os.getcwd()
     os.chdir(dir)
     if show is None:
@@ -85,8 +85,9 @@ def run_cmd(cmd, dir=".", show=None, output=False):
         return ret
     ret = os.system(cmd)
     os.chdir(cwd)
-    if ret != 0:
+    if checkfail and ret != 0:
         raise Exception("FAILED %s: %d" % (cmd, ret))
+    return ret
 
 class builder:
     '''handle build of one directory'''
@@ -165,6 +166,7 @@ class buildlist:
             self.retry = None
         for b in self.tlist:
             if b.proc is not None:
+                run_cmd("killbysubdir %s > /dev/null 2>&1" % b.sdir, checkfail=False)
                 b.proc.terminate()
                 b.proc.wait()
                 b.proc = None