# HG changeset patch
# User Mark Wielaard <mark@klomp.org>
# Date 1298496413 -3600
# Node ID 08aadbc57f2942a0a108e7ad2baabe1b658e3b63
# Parent  f644988c61fd9304870ee9c607d12469aa6eb0ef
Add icedtea6-squeeze-x86_64-quick-jamvm and -cacao builders.

Don't bootstrap, only run langtools checks.

diff -r f644988c61fd -r 08aadbc57f29 icedtea/master.cfg
--- a/icedtea/master.cfg	Wed Feb 23 14:37:20 2011 +0100
+++ b/icedtea/master.cfg	Wed Feb 23 22:26:53 2011 +0100
@@ -60,6 +60,8 @@
                                  treeStableTimer=5*60,
                          builderNames=["icedtea6-squeeze-x86_64-quick",
                                        "icedtea6-squeeze-x86_64-quick-hotspot",
+                                       "icedtea6-squeeze-x86_64-quick-jamvm",
+                                       "icedtea6-squeeze-x86_64-quick-cacao",
                                        "icedtea6-natty-armv7l-quick",
                                        "icedtea6-natty-armv7l-quick-cacao",
                                        "icedtea6-natty-armv7l-quick-jamvm",
@@ -278,6 +280,42 @@
                       description="check-langtools",
                       workdir="build"))
 
+f3j = factory.BuildFactory()
+f3j.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
+f3j.addStep(ShellCommand(command=["./autogen.sh"],
+                        workdir="src",
+                        description="autogen"))
+f3j.addStep(ShellCommand(command=["rm", "-rf", "build"],
+                        workdir=".",
+                        description="clean build dir"))
+f3j.addStep(Configure(command=["../src/configure",
+                              "--disable-bootstrap",
+                              "--disable-docs",
+                              "--enable-jamvm"],
+                              workdir="build"))
+f3j.addStep(Compile(workdir="build"))
+f3j.addStep(JTRegCheck(command=["make", "check-langtools"],
+                      description="check-langtools",
+                      workdir="build"))
+
+f3c = factory.BuildFactory()
+f3c.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
+f3c.addStep(ShellCommand(command=["./autogen.sh"],
+                        workdir="src",
+                        description="autogen"))
+f3c.addStep(ShellCommand(command=["rm", "-rf", "build"],
+                        workdir=".",
+                        description="clean build dir"))
+f3c.addStep(Configure(command=["../src/configure",
+                              "--disable-bootstrap",
+                              "--disable-docs",
+                              "--enable-cacao"],
+                              workdir="build"))
+f3c.addStep(Compile(workdir="build"))
+f3c.addStep(JTRegCheck(command=["make", "check-langtools"],
+                      description="check-langtools",
+                      workdir="build"))
+
 f3an = factory.BuildFactory()
 f3an.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
 f3an.addStep(ShellCommand(command=["./autogen.sh"],
@@ -556,6 +594,16 @@
                            'slavenames': ["squeeze-x86_64"],
                            'builddir': "icedtea6-quick-hotspot",
                            'factory': f3h }
+icedtea6_builder_quick_jamvm = {
+                           'name': "icedtea6-squeeze-x86_64-quick-jamvm",
+                           'slavenames': ["squeeze-x86_64"],
+                           'builddir': "icedtea6-quick-jamvm",
+                           'factory': f3j }
+icedtea6_builder_quick_cacao = {
+                           'name': "icedtea6-squeeze-x86_64-quick-cacao",
+                           'slavenames': ["squeeze-x86_64"],
+                           'builddir': "icedtea6-quick-cacao",
+                           'factory': f3c }
 icedtea6_builder_quick_arm_natty = { 'name': "icedtea6-natty-armv7l-quick",
                            'slavenames': ["natty-armv7l"],
                            'builddir': "icedtea6-natty-armv7l-quick",
@@ -668,6 +716,8 @@
 
 c['builders'] = [icedtea6_builder_quick,
                  icedtea6_builder_quick_hotspot,
+                 icedtea6_builder_quick_jamvm,
+                 icedtea6_builder_quick_cacao,
                  icedtea6_builder_quick_arm_natty,
                  icedtea6_builder_quick_arm_natty_cacao,
                  icedtea6_builder_quick_arm_natty_jamvm,