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

[Galina Kistanova]

Author: gkistanova
Date: Tue Jun 19 15:10:21 2012
New Revision: 158736

URL: http://llvm.org/viewvc/llvm-project?rev=158736&view=rev
Log:
Patch by Mikael Lyngvig!

Change in  getClangMinGWBuildFactory() method:
1. The new build tool for MinGW is Ninja.
2. The default number of jobs has been increased to six from one (Ninja uses 6 as its default number of jobs).
3. My build machine now specifies jobs=6 in case somebody messes with the default jobs arg to getClangMinGWBuildFactory().
4. A long-standing issue where the build on my buildslave partially failed due to a missing test suite has been fixed by disabling the code that does "make check".


Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/ClangBuilder.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=158736&r1=158735&r2=158736&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Tue Jun 19 15:10:21 2012
@@ -462,7 +462,7 @@
         {'name'      : "clang-native-mingw64-win7",
          'slavenames': ["milyng1"],
          'builddir'  : "clang-native-mingw64-win7",
-         'factory'   : ClangBuilder.getClangMinGWBuildFactory(),
+         'factory'   : ClangBuilder.getClangMinGWBuildFactory(jobs=6),
          'category'  : 'clang'},
 
         {'name' : "clang-x86_64-darwin10-nt-O3-vectorize",

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=158736&r1=158735&r2=158736&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Tue Jun 19 15:10:21 2012
@@ -424,7 +424,7 @@
     return f
 
 # Builds on Windows using CMake, MinGW(32|64), and no Microsoft tools.
-def getClangMinGWBuildFactory(update=True, clean=True, jobs=1, cmake=r"cmake"):
+def getClangMinGWBuildFactory(update=True, clean=True, jobs=6, cmake=r"cmake"):
     f = buildbot.process.factory.BuildFactory()
 
     if update:
@@ -466,7 +466,7 @@
                                          "-DLLVM_INCLUDE_TESTS:=OFF",
                                          "-DLLVM_TARGETS_TO_BUILD:=X86",
                                          "-G",
-                                         "MinGW Makefiles",
+                                         "Ninja",
                                          ".."],
                                 workdir="llvm\\build"))
     f.addStep(ShellCommand(name='cmake',
@@ -477,7 +477,7 @@
 
     # Build it.
     f.addStep(BatchFileDownload(name='makeall',
-                                command=["make", "-j%d" % jobs],
+                                command=["ninja", "-j", "%d" % jobs],
                                 haltOnFailure=True,
                                 workdir='llvm\\build'))
 
@@ -487,18 +487,19 @@
                                           description='makeall',
                                           workdir='llvm\\build'))
 
-    # Build global check project (make check).
-    f.addStep(BatchFileDownload(name='makecheck',
-                                command=["make", "check"],
-                                workdir='llvm\\build'))
-    f.addStep(WarningCountingShellCommand(name='check',
-                                          command=['makecheck.bat'],
-                                          description='make check',
-                                          workdir='llvm\\build'))
+    # Build global check project (make check) (sources not checked out...).
+    if 0:
+        f.addStep(BatchFileDownload(name='makecheck',
+                                    command=["ninja", "check"],
+                                    workdir='llvm\\build'))
+        f.addStep(WarningCountingShellCommand(name='check',
+                                              command=['makecheck.bat'],
+                                              description='make check',
+                                              workdir='llvm\\build'))
 
     # Build clang-test project (make clang-test).
     f.addStep(BatchFileDownload(name='maketest',
-                                command=["make", "clang-test"],
+                                command=["ninja", "clang-test"],
                                 workdir="llvm\\build"))
     f.addStep(ClangTestCommand(name='clang-test',
                                command=["maketest.bat"],