[llvm-commits] [zorg] r146298 - in /zorg/trunk/buildbot/osuosl/master/config: builders.py slaves.py

[Galina Kistanova]

Author: gkistanova
Date: Fri Dec  9 17:54:29 2011
New Revision: 146298

URL: http://llvm.org/viewvc/llvm-project?rev=146298&view=rev
Log:
Add two cross clang builders:
--build=x86_64-apple-darwin11 --host=x86_64-apple-darwin11 --target=arm-eabi
--build=x86_64-apple-darwin11 --host=x86_64-apple-darwin11 --target=i686-pc-linux-gnu
Prepare to move existing cross clang builders to new slave Mac OS Lion.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/buildbot/osuosl/master/config/slaves.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=146298&r1=146297&r2=146298&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Dec  9 17:54:29 2011
@@ -240,6 +240,42 @@
                                                                              '--host=x86_64-apple-darwin10',
                                                                              '--target=i686-pc-mingw32'])},
 
+        {'name' : "clang-x86_64-darwin11-cross-mingw32",
+         'slavenames' :["as-bldslv11"],
+         'builddir' :"clang-x86_64-darwin11-cross-mingw32",
+         'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4,  use_pty_in_tests=True,
+                                                       run_cxx_tests=True,
+                                                       extra_configure_args=['--build=x86_64-apple-darwin11',
+                                                                             '--host=x86_64-apple-darwin11',
+                                                                             '--target=i686-pc-mingw32'])},
+
+        {'name': "clang-x86_64-darwin11-self-mingw32",
+         'slavenames':["as-bldslv11"],
+         'builddir':"clang-x86_64-darwin11-self-mingw32",
+         'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4, test=False,
+                                                       extra_configure_args=['--build=x86_64-apple-darwin11',
+                                                                             '--host=i686-pc-mingw32',
+                                                                             '--target=i686-pc-mingw32'])},
+
+        {'name' : "clang-x86_64-darwin11-cross-arm",
+         'slavenames' :["as-bldslv11"],
+         'builddir' :"clang-x86_64-darwin11-cross-arm",
+         'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4,  use_pty_in_tests=True,
+                                                       run_cxx_tests=True,
+                                                       extra_configure_args=['--build=x86_64-apple-darwin11',
+                                                                             '--host=x86_64-apple-darwin11',
+                                                                             '--target=arm-eabi',
+                                                                             '--enable-targets=cbe,arm'])},
+
+        {'name' : "clang-x86_64-darwin11-cross-linux-gnu",
+         'slavenames' :["as-bldslv11"],
+         'builddir' :"clang-x86_64-darwin11-cross-linux-gnu",
+         'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4,  use_pty_in_tests=True,
+                                                       run_cxx_tests=True,
+                                                       extra_configure_args=['--build=x86_64-apple-darwin11',
+                                                                             '--host=x86_64-apple-darwin11',
+                                                                             '--target=i686-pc-linux-gnu '])},
+
         ]
 
 # Offline.

Modified: zorg/trunk/buildbot/osuosl/master/config/slaves.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/slaves.py?rev=146298&r1=146297&r2=146298&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Fri Dec  9 17:54:29 2011
@@ -20,6 +20,9 @@
         # Quad Core Mac Pro running Leopard.
         create_slave("kistanova1", properties={'jobs' : 1}, max_builds=4),
 
+        # Quad Core Mac Pro running Lion.
+        create_slave("as-bldslv11", properties={'jobs' : 1}, max_builds=4),
+
         # Win XP SP3.
         create_slave("kistanova2", properties={'jobs' : 1}, max_builds=1),