# HG changeset patch
# User Xerxes Ranby <xerxes@zafena.se>
# Date 1313054969 -7200
# Node ID abc2e1778aeff411b5c753e376603f27fed40b12
# Parent  ce2d40e0fa045d90b43b2dfcdc93a6eca61b8889
Add check-jdk to most of the icedtea6 builders.

Increased timeout for check-jdk to 7200sec.
Some of the jtreg nio tests like FindDecoderBugs and FindEncoderBugs
do take a lot of time to compete.

diff -r ce2d40e0fa04 -r abc2e1778aef icedtea/master.cfg
--- a/icedtea/master.cfg	Mon Aug 08 21:35:00 2011 +0200
+++ b/icedtea/master.cfg	Thu Aug 11 11:29:29 2011 +0200
@@ -53,9 +53,10 @@
 c['schedulers'] = []
 
 # "Quick" schedulers for icedtea6 and 7
-# Schedules a quick build (no jdk-check, no documentation)
-# after waiting 5 minutes for any more changes. Should finish in less
-# than an hour.
+# Schedules a quick build (no bootstrap, no documentation)
+# after waiting 5 minutes for any more changes.
+# the x85_64 builders also skips check-jdk to prevent server hickups since
+# they are running on the buildmaster.
 c['schedulers'].append(Scheduler(name="icedtea6-quick", branch="icedtea6",
                                  treeStableTimer=5*60,
                          builderNames=["icedtea6-squeeze-x86_64-quick",
@@ -379,6 +380,9 @@
 f3an.addStep(JTRegCheck(command=["make", "check-langtools"],
                       description="check-langtools",
                       workdir="build", timeout=2400))
+f3an.addStep(JTRegCheck(command=["make", "check-jdk"],
+                      description="check-jdk",
+                      workdir="build", timeout=7200))
 
 f3an7 = factory.BuildFactory()
 f3an7.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -401,6 +405,9 @@
 f3an7.addStep(JTRegCheck(command=["make", "check-langtools"],
                       description="check-langtools",
                       workdir="build", timeout=2400))
+f3an7.addStep(JTRegCheck(command=["make", "check-jdk"],
+                      description="check-jdk",
+                      workdir="build", timeout=7200))
 
 f3anc = factory.BuildFactory()
 f3anc.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -417,7 +424,6 @@
                               "--enable-cacao"],
                               workdir="build"))
 f3anc.addStep(Compile(command=["make",
-                                "CACAO_CONFIGURE_ARGS=\"--enable-softfloat\""],
                       workdir="build"))
 f3anc.addStep(JTRegCheck(command=["make", "check-hotspot"],
                       description="check-hotspot",
@@ -425,6 +431,9 @@
 f3anc.addStep(JTRegCheck(command=["make", "check-langtools"],
                       description="check-langtools",
                       workdir="build", timeout=2400))
+f3anc.addStep(JTRegCheck(command=["make", "check-jdk"],
+                      description="check-jdk",
+                      workdir="build", timeout=7200))
 
 f3anj = factory.BuildFactory()
 f3anj.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -447,6 +456,9 @@
 f3anj.addStep(JTRegCheck(command=["make", "check-langtools"],
                       description="check-langtools",
                       workdir="build", timeout=2400))
+f3anj.addStep(JTRegCheck(command=["make", "check-jdk"],
+                      description="check-jdk",
+                      workdir="build", timeout=7200))
 
 f3ans = factory.BuildFactory()
 f3ans.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -469,6 +481,9 @@
 f3ans.addStep(JTRegCheck(command=["make", "check-langtools"],
                       description="check-langtools",
                       workdir="build", timeout=2400))
+f3ans.addStep(JTRegCheck(command=["make", "check-jdk"],
+                      description="check-jdk",
+                      workdir="build", timeout=7200))
 
 f3lz = factory.BuildFactory()
 f3lz.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -492,6 +507,9 @@
 f3lz.addStep(JTRegCheck(command=["make", "check-langtools"],
                       description="check-langtools",
                       workdir="build", timeout=2400))
+f3lz.addStep(JTRegCheck(command=["make", "check-jdk"],
+                      description="check-jdk",
+                      workdir="build", timeout=7200))
 
 f3ls = factory.BuildFactory()
 f3ls.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -517,7 +535,7 @@
                       workdir="build", timeout=2400))
 f3ls.addStep(JTRegCheck(command=["make", "check-jdk"],
                       description="check-jdk",
-                      workdir="build", timeout=2400))
+                      workdir="build", timeout=7200))
 
 f3lc = factory.BuildFactory()
 f3lc.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -543,7 +561,7 @@
                       workdir="build", timeout=2400))
 f3lc.addStep(JTRegCheck(command=["make", "check-jdk"],
                       description="check-jdk",
-                      workdir="build", timeout=2400))
+                      workdir="build", timeout=7200))
 
 f3lj = factory.BuildFactory()
 f3lj.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -568,7 +586,7 @@
                       workdir="build", timeout=2400))
 f3lj.addStep(JTRegCheck(command=["make", "check-jdk"],
                       description="check-jdk",
-                      workdir="build", timeout=2400))
+                      workdir="build", timeout=7200))
 
 f3a5 = factory.BuildFactory()
 f3a5.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -590,7 +608,10 @@
                       workdir="build"))
 f3a5.addStep(JTRegCheck(command=["make", "check-langtools"],
                       description="check-langtools",
-                      workdir="build"))
+                      workdir="build", timeout=2400))
+f3a5.addStep(JTRegCheck(command=["make", "check-jdk"],
+                      description="check-jdk",
+                      workdir="build", timeout=7200))
 
 f3a5c = factory.BuildFactory()
 f3a5c.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -615,6 +636,9 @@
 f3a5c.addStep(JTRegCheck(command=["make", "check-langtools"],
                       description="check-langtools",
                       workdir="build"))
+f3a5c.addStep(JTRegCheck(command=["make", "check-jdk"],
+                      description="check-jdk",
+                      workdir="build", timeout=7200))
 
 f3a5j = factory.BuildFactory()
 f3a5j.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -637,6 +661,9 @@
 f3a5j.addStep(JTRegCheck(command=["make", "check-langtools"],
                       description="check-langtools",
                       workdir="build", timeout=2400))
+f3a5j.addStep(JTRegCheck(command=["make", "check-jdk"],
+                      description="check-jdk",
+                      workdir="build", timeout=7200))
 
 f3a5s = factory.BuildFactory()
 f3a5s.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -658,7 +685,10 @@
                       workdir="build"))
 f3a5s.addStep(JTRegCheck(command=["make", "check-langtools"],
                       description="check-langtools",
-                      workdir="build"))
+                      workdir="build", timeout=2400))
+f3a5s.addStep(JTRegCheck(command=["make", "check-jdk"],
+                      description="check-jdk",
+                      workdir="build", timeout=7200))
 
 icedtea6_builder_quick = { 'name': "icedtea6-squeeze-x86_64-quick",
                            'slavenames': ["squeeze-x86_64"],