[zorg] r259200 - [powerpc] Switch powerpc64 lnt buildbots to use cmake/ninja

[Bill Seurer via llvm-commits]

Author: seurer
Date: Fri Jan 29 10:05:46 2016
New Revision: 259200

URL: http://llvm.org/viewvc/llvm-project?rev=259200&view=rev
Log:
[powerpc] Switch powerpc64 lnt buildbots to use cmake/ninja

The lnt buildbots were using configure/make which is no
longer supported.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.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=259200&r1=259199&r2=259200&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Jan 29 10:05:46 2016
@@ -292,18 +292,22 @@ def _get_clang_builders():
         {'name' : "clang-ppc64be-linux-lnt",
          'slavenames' :["ppc64be-clang-lnt-test"],
          'builddir' :"clang-ppc64be-lnt",
-         'factory' : LNTBuilder.getLNTFactory(triple='ppc64-elf-linux1',
-                                              nt_flags=['--cflag','-mcpu=native', '-j16'],
-                                              jobs=16,  use_pty_in_tests=True,
-                                              testerName='O3-plain', run_cxx_tests=True)},
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(clean=False,
+                                                            useTwoStage=False,
+                                                            runTestSuite=True,
+                                                            stage1_config='Release',
+                                                            extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"]),
+         'category' : 'clang'},
 
         {'name' : "clang-ppc64le-linux-lnt",
          'slavenames' :["ppc64le-clang-lnt-test"],
          'builddir' :"clang-ppc64le-lnt",
-         'factory' : LNTBuilder.getLNTFactory(triple='ppc64le-elf-linux1',
-                                              nt_flags=['--cflag','-mcpu=native', '-j6'],
-                                              jobs=6,  use_pty_in_tests=True,
-                                              testerName='ppc64le-plain', run_cxx_tests=True)},
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(clean=False,
+                                                            useTwoStage=False,
+                                                            runTestSuite=True,
+                                                            stage1_config='Release',
+                                                            extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"]),
+         'category' : 'clang'},
 
         {'name' : "clang-ppc64be-linux-multistage",
          'slavenames' :["ppc64be-clang-multistage-test"],
@@ -312,7 +316,8 @@ def _get_clang_builders():
                                                             useTwoStage=True,
                                                             stage1_config='Release',
                                                             stage2_config='Release',
-                                                            extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"])},
+                                                            extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"]),
+         'category' : 'clang'},
 
         {'name' : "clang-ppc64le-linux-multistage",
          'slavenames' :["ppc64le-clang-multistage-test"],
@@ -321,7 +326,8 @@ def _get_clang_builders():
                                                             useTwoStage=True,
                                                             stage1_config='Release',
                                                             stage2_config='Release',
-                                                            extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"])},
+                                                            extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"]),
+         'category' : 'clang'},
 
         {'name': "clang-ppc64be-linux",
          'slavenames':["ppc64be-clang-test"],