# HG changeset patch
# User Mark Wielaard <mark@klomp.org>
# Date 1300184640 -3600
# Node ID 47fe70931ef28fa8de81880d1d447a70295f38aa
# Parent  188ff8275f720f5ab8433f15b0d18e82071bc1e2
Split squeeze quick setup, icedtea6 has jamvm, icedtea7 doesn't.

diff -r 188ff8275f72 -r 47fe70931ef2 icedtea/master.cfg
--- a/icedtea/master.cfg	Thu Mar 10 19:13:05 2011 +0100
+++ b/icedtea/master.cfg	Tue Mar 15 11:24:00 2011 +0100
@@ -233,15 +233,15 @@
                                   'builddir': "testrepo_squeeze_armv5tel",
                                   'factory': f2 }
 
-f3 = factory.BuildFactory()
-f3.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
-f3.addStep(ShellCommand(command=["./autogen.sh"],
+f3s6 = factory.BuildFactory()
+f3s6.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
+f3s6.addStep(ShellCommand(command=["./autogen.sh"],
                         workdir="src",
                         description="autogen"))
-f3.addStep(ShellCommand(command=["rm", "-rf", "build"],
+f3s6.addStep(ShellCommand(command=["rm", "-rf", "build"],
                         workdir=".",
                         description="clean build dir"))
-f3.addStep(Configure(command=["../src/configure",
+f3s6.addStep(Configure(command=["../src/configure",
                               "--disable-bootstrap",
                               "--disable-optimizations",
                               "--disable-docs",
@@ -249,11 +249,35 @@
                               "--with-parallel-jobs=4",
                               "--with-llvm-config=llvm-config-2.7"],
                               workdir="build"))
-f3.addStep(Compile(workdir="build"))
-f3.addStep(JTRegCheck(command=["make", "check-hotspot"],
+f3s6.addStep(Compile(workdir="build"))
+f3s6.addStep(JTRegCheck(command=["make", "check-hotspot"],
                       description="check-hotspot",
                       workdir="build"))
-f3.addStep(JTRegCheck(command=["make", "check-langtools"],
+f3s6.addStep(JTRegCheck(command=["make", "check-langtools"],
+                      description="check-langtools",
+                      workdir="build"))
+
+f3s7 = factory.BuildFactory()
+f3s7.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
+f3s7.addStep(ShellCommand(command=["./autogen.sh"],
+                        workdir="src",
+                        description="autogen"))
+f3s7.addStep(ShellCommand(command=["rm", "-rf", "build"],
+                        workdir=".",
+                        description="clean build dir"))
+f3s7.addStep(Configure(command=["../src/configure",
+                              "--disable-bootstrap",
+                              "--disable-optimizations",
+                              "--disable-docs",
+                              "--with-additional-vms=cacao,shark",
+                              "--with-parallel-jobs=4",
+                              "--with-llvm-config=llvm-config-2.7"],
+                              workdir="build"))
+f3s7.addStep(Compile(workdir="build"))
+f3s7.addStep(JTRegCheck(command=["make", "check-hotspot"],
+                      description="check-hotspot",
+                      workdir="build"))
+f3s7.addStep(JTRegCheck(command=["make", "check-langtools"],
                       description="check-langtools",
                       workdir="build"))
 
@@ -606,7 +630,7 @@
 icedtea6_builder_quick = { 'name': "icedtea6-squeeze-x86_64-quick",
                            'slavenames': ["squeeze-x86_64"],
                            'builddir': "icedtea6-quick",
-                           'factory': f3 }
+                           'factory': f3s6 }
 icedtea6_builder_quick_hotspot = {
                            'name': "icedtea6-squeeze-x86_64-quick-hotspot",
                            'slavenames': ["squeeze-x86_64"],
@@ -689,7 +713,7 @@
 icedtea7_builder_quick = { 'name': "icedtea7-squeeze-x86_64-quick",
                            'slavenames': ["squeeze-x86_64"],
                            'builddir': "icedtea7-quick",
-                           'factory': f3 }
+                           'factory': f3s7 }
 icedtea7_builder_quick_armv5tel_squeeze = {
                            'name': "icedtea7-squeeze-armv5tel-quick",
                            'slavenames': ["squeeze-armv5tel"],