# HG changeset patch # User Mark Wielaard # Date 1298381119 -3600 # Node ID ca45780cdf8fa8cd68d20d7323f5913e3ee9a53e # Parent 976dc5a103fd31c4a64eb07a397194d290c1cfe1# Parent c9d0b3347e4de8863fb720669177eb6ba8ff70a0 Merge diff -r 976dc5a103fd -r ca45780cdf8f icedtea/master.cfg --- a/icedtea/master.cfg Tue Feb 22 10:38:29 2011 +0100 +++ b/icedtea/master.cfg Tue Feb 22 14:25:19 2011 +0100 @@ -28,9 +28,6 @@ c['slaves'] = [BuildSlave("squeeze-x86_64", getpw("squeeze-x86_64"), max_builds=3), - BuildSlave("squeeze-armv7l", - getpw("squeeze-armv7l"), - max_builds=1), BuildSlave("natty-armv7l", getpw("natty-armv7l"), max_builds=2), @@ -63,7 +60,6 @@ treeStableTimer=5*60, builderNames=["icedtea6-squeeze-x86_64-quick", "icedtea6-squeeze-x86_64-quick-hotspot", - "icedtea6-squeeze-armv7l-quick", "icedtea6-natty-armv7l-quick", "icedtea6-natty-armv7l-quick-cacao", "icedtea6-natty-armv7l-quick-shark", @@ -78,7 +74,7 @@ c['schedulers'].append(Scheduler(name="icedtea7-quick", branch="icedtea", treeStableTimer=5*60, builderNames=["icedtea7-squeeze-x86_64-quick", - "icedtea7-squeeze-armv7l-quick", + "icedtea7-squeeze-armv5tel-quick", "icedtea7-natty-armv7l-quick"] )) @@ -88,13 +84,12 @@ c['schedulers'].append(Scheduler(name="icedtea-web", branch="icedtea-web", treeStableTimer=60, builderNames=["icedtea-web-squeeze-x86_64", - "icedtea-web-squeeze-armv7l", + "icedtea-web-squeeze-armv5tel", "icedtea-web-natty-armv7l"])) c['schedulers'].append(Scheduler(name="testrepo", branch="testrepo", treeStableTimer=60, builderNames=["testrepo-squeeze-x86_64", - "testrepo-squeeze-armv7l", "testrepo-natty-armv7l", "testrepo-jaunty-ia32", "testrepo-squeeze-armv5tel"])) @@ -202,10 +197,11 @@ f1arm.addStep(Compile(command=["make", "-j2"], workdir="build")) f1arm.addStep(Test(command=["make", "check"], workdir="build")) -icedtea_web_builder_squeeze_armv7l = { 'name': "icedtea-web-squeeze-armv7l", - 'slavenames': ["squeeze-armv7l"], - 'builddir': "icedtea-web-squeeze-armv7l", +icedtea_web_builder_squeeze_armv5tel = { 'name': "icedtea-web-squeeze-armv5tel", + 'slavenames': ["squeeze-armv5tel"], + 'builddir': "icedtea-web-squeeze-armv5tel", 'factory': f1arm } + icedtea_web_builder_natty_armv7l = { 'name': "icedtea-web-natty-armv7l", 'slavenames': ["natty-armv7l"], 'builddir': "icedtea-web-natty-armv7l", @@ -219,10 +215,6 @@ 'slavenames': ["squeeze-x86_64"], 'builddir': "testrepo", 'factory': f2 } -testrepo_builder_squeeze_armv7l = { 'name': "testrepo-squeeze-armv7l", - 'slavenames': ["squeeze-armv7l"], - 'builddir': "testrepo_squeeze_armv7l", - 'factory': f2 } testrepo_builder_natty_armv7l = { 'name': "testrepo-natty-armv7l", 'slavenames': ["natty-armv7l"], 'builddir': "testrepo_natty_armv7l", @@ -283,26 +275,6 @@ description="check-langtools", workdir="build")) -f3as = factory.BuildFactory() -f3as.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) -f3as.addStep(ShellCommand(command=["./autogen.sh"], - workdir="src", - description="autogen")) -f3as.addStep(ShellCommand(command=["rm", "-rf", "build"], - workdir=".", - description="clean build dir")) -f3as.addStep(Configure(command=["../src/configure", - "--disable-bootstrap", - "--disable-docs"], - workdir="build")) -f3as.addStep(Compile(workdir="build")) -f3as.addStep(JTRegCheck(command=["make", "check-hotspot"], - description="check-hotspot", - workdir="build")) -f3as.addStep(JTRegCheck(command=["make", "check-langtools"], - description="check-langtools", - workdir="build", timeout=2400)) - f3an = factory.BuildFactory() f3an.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) f3an.addStep(ShellCommand(command=["./autogen.sh"], @@ -380,6 +352,7 @@ "--disable-bootstrap", "--with-parallel-jobs=5", "--disable-docs", + "--with-hotspot-build", "--enable-zero"], workdir="build")) f3jz.addStep(Compile(workdir="build")) @@ -402,6 +375,7 @@ "--disable-bootstrap", "--with-parallel-jobs=5", "--disable-docs", + "--with-hotspot-build", "--enable-shark"], workdir="build")) f3js.addStep(Compile(workdir="build")) @@ -424,6 +398,7 @@ "--disable-bootstrap", "--with-parallel-jobs=5", "--disable-docs", + "--with-hotspot-build", "--enable-cacao"], workdir="build")) f3jc.addStep(Compile(workdir="build")) @@ -508,10 +483,6 @@ 'slavenames': ["squeeze-x86_64"], 'builddir': "icedtea6-quick-hotspot", 'factory': f3h } -icedtea6_builder_quick_arm_squeeze = { 'name': "icedtea6-squeeze-armv7l-quick", - 'slavenames': ["squeeze-armv7l"], - 'builddir': "icedtea6-squeeze-armv7l-quick", - 'factory': f3as } icedtea6_builder_quick_arm_natty = { 'name': "icedtea6-natty-armv7l-quick", 'slavenames': ["natty-armv7l"], 'builddir': "icedtea6-natty-armv7l-quick", @@ -561,10 +532,10 @@ 'slavenames': ["squeeze-x86_64"], 'builddir': "icedtea7-quick", 'factory': f3 } -icedtea7_builder_quick_arm_squeeze = { 'name': "icedtea7-squeeze-armv7l-quick", - 'slavenames': ["squeeze-armv7l"], - 'builddir': "icedtea7-squeeze-armv7l-quick", - 'factory': f3as } +icedtea7_builder_quick_arm_squeeze = { 'name': "icedtea7-squeeze-armv5tel-quick", + 'slavenames': ["squeeze-armv5tel"], + 'builddir': "icedtea7-squeeze-armv5tel-quick", + 'factory': f3a5 } icedtea7_builder_quick_arm_natty = { 'name': "icedtea7-natty-armv7l-quick", 'slavenames': ["natty-armv7l"], 'builddir': "icedtea7-natty-armv7l-quick", @@ -609,7 +580,6 @@ c['builders'] = [icedtea6_builder_quick, icedtea6_builder_quick_hotspot, - icedtea6_builder_quick_arm_squeeze, icedtea6_builder_quick_arm_natty, icedtea6_builder_quick_arm_natty_cacao, icedtea6_builder_quick_arm_natty_shark, @@ -620,15 +590,14 @@ icedtea6_builder_quick_armv5tel_squeeze_cacao, icedtea6_builder_quick_armv5tel_squeeze_shark, icedtea7_builder_quick, - icedtea7_builder_quick_arm_squeeze, + icedtea7_builder_quick_armv5tel_squeeze, icedtea7_builder_quick_arm_natty, icedtea6_builder_full, icedtea7_builder_full, icedtea_web_builder_x86_64, - icedtea_web_builder_squeeze_armv7l, + icedtea_web_builder_squeeze_armv5tel, icedtea_web_builder_natty_armv7l, testrepo_builder_x86_64, - testrepo_builder_squeeze_armv7l, testrepo_builder_natty_armv7l, testrepo_builder_jaunty_ia32, testrepo_builder_squeeze_armv5tel ]