# HG changeset patch
# User Xerxes Ranby <xerxes@zafena.se>
# Date 1320416200 -3600
# Node ID 315332789cb6f3006eed7c199ddf02528dd65b90
# Parent  51a64788c03bfb601e781ce9dce54b8f9990a8ab
Make the ARM builders terminate stale java test processes and unbreak squeeze icedtea7 builders.

2011-11-04  Xerxes Ranby  <xerxes@zafena.se>

        f3an7, f3anc, f3anj, f3ans, f3a5, f3a5c, f3a5j, f3a5s: add killall step
        Make the ARM builders terminate stale java test processes.

        f3an7, f3a5, f4: add --disable-system-gio
        Unbreak squeeze icedtea7 builders.

diff -r 51a64788c03b -r 315332789cb6 icedtea/master.cfg
--- a/icedtea/master.cfg	Mon Sep 05 18:40:06 2011 +0200
+++ b/icedtea/master.cfg	Fri Nov 04 15:16:40 2011 +0100
@@ -273,6 +273,7 @@
                               "--with-additional-vms=shark",
                               "--with-parallel-jobs=4",
                               "--with-llvm-config=llvm-config-2.7",
+                              "--disable-system-gio",
                               "--disable-system-lcms"],
                               workdir="build"))
 f3s7.addStep(Compile(workdir="build"))
@@ -417,6 +418,12 @@
 f3an7.addStep(JTRegCheck(command=["make", "check-jdk"],
                       description="check-jdk",
                       workdir="build", timeout=7200))
+f3an7.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"],
+                        workdir=".",
+                        flunkOnFailure="False",
+                        alwaysRun="True",
+                        description="killall"))
+
 
 f3anc = factory.BuildFactory()
 f3anc.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -442,6 +449,12 @@
 f3anc.addStep(JTRegCheck(command=["make", "check-jdk"],
                       description="check-jdk",
                       workdir="build", timeout=7200))
+f3anc.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"],
+                        workdir=".",
+                        flunkOnFailure="False",
+                        alwaysRun="True",
+                        description="killall"))
+
 
 f3anj = factory.BuildFactory()
 f3anj.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -467,6 +480,12 @@
 f3anj.addStep(JTRegCheck(command=["make", "check-jdk"],
                       description="check-jdk",
                       workdir="build", timeout=7200))
+f3anj.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"],
+                        workdir=".",
+                        flunkOnFailure="False",
+                        alwaysRun="True",
+                        description="killall"))
+
 
 f3ans = factory.BuildFactory()
 f3ans.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -492,6 +511,11 @@
 f3ans.addStep(JTRegCheck(command=["make", "check-jdk"],
                       description="check-jdk",
                       workdir="build", timeout=7200))
+f3ans.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"],
+                        workdir=".",
+                        flunkOnFailure="False",
+                        alwaysRun="True",
+                        description="killall"))
 
 f3lz = factory.BuildFactory()
 f3lz.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -604,13 +628,11 @@
 f3a5.addStep(ShellCommand(command=["rm", "-rf", "build"],
                         workdir=".",
                         description="clean build dir"))
-f3a5.addStep(ShellCommand(command=["killall", "-s", "KILL", "java"],
-                        workdir=".",
-                        description="killall"))
 f3a5.addStep(Configure(command=["../src/configure",
                               "--disable-bootstrap",
                               "--with-parallel-jobs=1",
                               "--disable-docs",
+                              "--disable-system-gio",
                               "--disable-system-lcms"],
                               workdir="build"))
 f3a5.addStep(Compile(workdir="build"))
@@ -623,6 +645,12 @@
 f3a5.addStep(JTRegCheck(command=["make", "check-jdk"],
                       description="check-jdk",
                       workdir="build", timeout=7200))
+f3a5.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"],
+                        workdir=".",
+                        flunkOnFailure="False",
+                        alwaysRun="True",
+                        description="killall"))
+
 
 f3a5c = factory.BuildFactory()
 f3a5c.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -650,6 +678,12 @@
 f3a5c.addStep(JTRegCheck(command=["make", "check-jdk"],
                       description="check-jdk",
                       workdir="build", timeout=7200))
+f3a5c.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"],
+                        workdir=".",
+                        flunkOnFailure="False",
+                        alwaysRun="True",
+                        description="killall"))
+
 
 f3a5j = factory.BuildFactory()
 f3a5j.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -675,6 +709,11 @@
 f3a5j.addStep(JTRegCheck(command=["make", "check-jdk"],
                       description="check-jdk",
                       workdir="build", timeout=7200))
+f3a5j.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"],
+                        workdir=".",
+                        flunkOnFailure="False",
+                        alwaysRun="True",
+                        description="killall"))
 
 f3a5s = factory.BuildFactory()
 f3a5s.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -700,6 +739,12 @@
 f3a5s.addStep(JTRegCheck(command=["make", "check-jdk"],
                       description="check-jdk",
                       workdir="build", timeout=7200))
+f3a5s.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"],
+                        workdir=".",
+                        flunkOnFailure="False",
+                        alwaysRun="True",
+                        description="killall"))
+
 
 icedtea6_builder_quick = { 'name': "icedtea6-squeeze-x86_64-quick",
                            'slavenames': ["squeeze-x86_64"],
@@ -814,6 +859,7 @@
                               "--with-additional-vms=shark",
                               "--with-parallel-jobs=4",
                               "--with-llvm-config=llvm-config-2.7",
+                              "--disable-system-gio",
                               "--disable-system-lcms"],
                               workdir="build"))
 f4.addStep(Compile(workdir="build"))