changeset 5:ca45780cdf8f

Merge
author Mark Wielaard <mark@klomp.org>
date Tue, 22 Feb 2011 14:25:19 +0100
parents 976dc5a103fd (diff) c9d0b3347e4d (current diff)
children 4683c27d2d1d
files icedtea/master.cfg
diffstat 1 files changed, 30 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/icedtea/master.cfg	Tue Feb 22 13:56:45 2011 +0100
+++ b/icedtea/master.cfg	Tue Feb 22 14:25:19 2011 +0100
@@ -59,6 +59,7 @@
 c['schedulers'].append(Scheduler(name="icedtea6-quick", branch="icedtea6",
                                  treeStableTimer=5*60,
                          builderNames=["icedtea6-squeeze-x86_64-quick",
+                                       "icedtea6-squeeze-x86_64-quick-hotspot",
                                        "icedtea6-natty-armv7l-quick",
                                        "icedtea6-natty-armv7l-quick-cacao",
                                        "icedtea6-natty-armv7l-quick-shark",
@@ -251,6 +252,29 @@
                       description="check-langtools",
                       workdir="build"))
 
+f3h = factory.BuildFactory()
+f3h.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
+f3h.addStep(ShellCommand(command=["./autogen.sh"],
+                        workdir="src",
+                        description="autogen"))
+f3h.addStep(ShellCommand(command=["rm", "-rf", "build"],
+                        workdir=".",
+                        description="clean build dir"))
+f3h.addStep(Configure(command=["../src/configure",
+                              "--disable-bootstrap",
+                              "--disable-optimizations",
+                              "--disable-docs",
+                              "--with-hotspot-build",
+                              "--with-parallel-jobs=4"],
+                              workdir="build"))
+f3h.addStep(Compile(workdir="build"))
+f3h.addStep(JTRegCheck(command=["make", "check-hotspot"],
+                      description="check-hotspot",
+                      workdir="build"))
+f3h.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"],
@@ -454,6 +478,11 @@
                            'slavenames': ["squeeze-x86_64"],
                            'builddir': "icedtea6-quick",
                            'factory': f3 }
+icedtea6_builder_quick_hotspot = {
+                           'name': "icedtea6-squeeze-x86_64-quick-hotspot",
+                           'slavenames': ["squeeze-x86_64"],
+                           'builddir': "icedtea6-quick-hotspot",
+                           'factory': f3h }
 icedtea6_builder_quick_arm_natty = { 'name': "icedtea6-natty-armv7l-quick",
                            'slavenames': ["natty-armv7l"],
                            'builddir': "icedtea6-natty-armv7l-quick",
@@ -550,6 +579,7 @@
                           'factory': f4 }
 
 c['builders'] = [icedtea6_builder_quick,
+                 icedtea6_builder_quick_hotspot,
                  icedtea6_builder_quick_arm_natty,
                  icedtea6_builder_quick_arm_natty_cacao,
                  icedtea6_builder_quick_arm_natty_shark,