# HG changeset patch
# User Mark Wielaard <mark@klomp.org>
# Date 1320957522 -3600
# Node ID ec7d0609cbedb8459316acb3c89842a5494120d8
# Parent  32ff60cc1ae2db0ce2dd306e95261c8d45f43be2
Hook up icedtea6/7 builds to f15/16-x86 build slaves.

diff -r 32ff60cc1ae2 -r ec7d0609cbed icedtea/master.cfg
--- a/icedtea/master.cfg	Thu Nov 10 19:54:04 2011 +0100
+++ b/icedtea/master.cfg	Thu Nov 10 21:38:42 2011 +0100
@@ -2,7 +2,7 @@
 # ex: set syntax=python:
 
 # Python master.cfg program for IcedTea buildbot.
-# Copyright (C) 2010, Mark J. Wielaard <mark@klomp.org>
+# Copyright (C) 2010, 2011, Mark J. Wielaard <mark@klomp.org>
 
 # This file is part of the IcedTea buildbot, and is free software.
 # You can redistribute it and/or modify it under the terms of the GNU
@@ -76,6 +76,8 @@
                                        "icedtea6-squeeze-x86_64-quick-jamvm",
                                        "icedtea6-squeeze-x86_64-quick-cacao",
                                        "icedtea6-squeeze-x86_64-quick-shark",
+                                       "icedtea6-f15-x86",
+                                       "icedtea6-f16-x86",
                                        "icedtea6-natty-armv7l-quick",
                                        "icedtea6-natty-armv7l-quick-cacao",
                                        "icedtea6-natty-armv7l-quick-jamvm",
@@ -93,6 +95,8 @@
 c['schedulers'].append(Scheduler(name="icedtea7-quick", branch="icedtea7",
                                  treeStableTimer=5*60,
                                  builderNames=["icedtea7-squeeze-x86_64-quick",
+                                               "icedtea7-f15-x86",
+                                               "icedtea7-f16-x86",
                                                "icedtea7-squeeze-armv5tel-quick",
                                                "icedtea7-natty-armv7l-quick"]
                                  ))
@@ -447,6 +451,24 @@
                         alwaysRun=True,
                         description="killall"))
 
+# Default build factory that just does autogen, configure, make and make check
+fdefault = factory.BuildFactory()
+fdefault.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
+fdefault.addStep(ShellCommand(command=["./autogen.sh"], workdir="src",
+                              description="autogen"))
+fdefault.addStep(ShellCommand(command=["rm", "-rf", "build"], workdir=".",
+                           description="clean build dir"))
+fdefault.addStep(Configure(command=["../src/configure",
+                                    "--with-parallel-jobs=2"],
+                           workdir="build"))
+fdefault.addStep(Compile(workdir="build"))
+fdefault.addStep(JTRegCheck(command=["make", "check"], description="check",
+                            workdir="build"))
+fdefault.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL",
+                                       "java"], workdir=".",
+                              flunkOnFailure=False, alwaysRun=True,
+                              description="killall"))
+
 f3an7 = factory.BuildFactory()
 f3an7.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
 f3an7.addStep(ShellCommand(command=["./autogen.sh"],
@@ -843,6 +865,22 @@
                            'slavenames': ["squeeze-x86_64"],
                            'builddir': "icedtea6-quick-shark",
                            'factory': f3s }
+icedtea6_builder_f15_x86 = { 'name': "icedtea6-f15-x86",
+                           'slavenames': ["fedora15-x86"],
+                           'builddir': "icedtea6-f15-x86",
+                           'factory': fdefault }
+icedtea6_builder_f16_x86 = { 'name': "icedtea6-f16-x86",
+                           'slavenames': ["fedora16-x86"],
+                           'builddir': "icedtea6-f16-x86",
+                           'factory': fdefault }
+icedtea7_builder_f15_x86 = { 'name': "icedtea7-f15-x86",
+                           'slavenames': ["fedora15-x86"],
+                           'builddir': "icedtea7-f15-x86",
+                           'factory': fdefault }
+icedtea7_builder_f16_x86 = { 'name': "icedtea7-f16-x86",
+                           'slavenames': ["fedora16-x86"],
+                           'builddir': "icedtea7-f16-x86",
+                           'factory': fdefault }
 icedtea6_builder_quick_arm_natty = { 'name': "icedtea6-natty-armv7l-quick",
                            'slavenames': ["natty-armv7l"],
                            'builddir': "icedtea6-natty-armv7l-quick",
@@ -960,6 +998,8 @@
                  icedtea6_builder_quick_jamvm,
                  icedtea6_builder_quick_cacao,
                  icedtea6_builder_quick_shark,
+                 icedtea6_builder_f15_x86,
+                 icedtea6_builder_f16_x86,
                  icedtea6_builder_quick_arm_natty,
                  icedtea6_builder_quick_arm_natty_cacao,
                  icedtea6_builder_quick_arm_natty_jamvm,
@@ -973,6 +1013,8 @@
                  icedtea6_builder_quick_armv5tel_squeeze_jamvm,
                  icedtea6_builder_quick_armv5tel_squeeze_shark,
                  icedtea7_builder_quick,
+                 icedtea7_builder_f15_x86,
+                 icedtea7_builder_f16_x86,
                  icedtea7_builder_quick_armv5tel_squeeze,
                  icedtea7_builder_quick_arm_natty,
                  icedtea6_builder_full,