[zorg] r297934 - [zorg] Move AArch64 LLD bot to category lld

[Renato Golin via llvm-commits]

Author: rengolin
Date: Thu Mar 16 04:56:56 2017
New Revision: 297934

URL: http://llvm.org/viewvc/llvm-project?rev=297934&view=rev
Log:
[zorg] Move AArch64 LLD bot to category lld

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=297934&r1=297933&r2=297934&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Mar 16 04:56:56 2017
@@ -308,29 +308,6 @@ def _get_clang_builders():
                                         "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
                )},
 
-        ## AArch64 Self-hosting Clang+LLVM check-all + LLD + test-suite
-        ## TODO: Remove the X86 back-end after fixing the 90 bad tests
-        ## TODO: Add Compiler-RT after fixing all the failures
-        ## TODO: Fix the three remaining test-suite failures
-        {'name': "clang-cmake-aarch64-lld",
-         'slavenames':["linaro-apm-04"],
-         'builddir':"clang-cmake-aarch64-lld",
-         'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      jobs=8,
-                      clean=False,
-                      checkout_compiler_rt=False,
-                      checkout_lld=True,
-                      test=True,
-                      useTwoStage=True,
-                      runTestSuite=True,
-                      nt_flags=['--cflag', '-mcpu=cortex-a57', '--cflag', '-fuse-ld=lld', '--threads=8', '--build-threads=8'],
-                      env={'PATH':'/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
-                      extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
-                                        "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
-                                        "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64;X86'",
-                                        "-DLLVM_ENABLE_LLD=True"],
-               )},
-
         {'name': 'clang-x86-windows-msvc2015',
          'slavenames': ['windows-gcebot2'],
          'builddir': 'clang-x86-windows-msvc2015',
@@ -791,6 +768,31 @@ def _get_lld_builders():
                                   depends_on_projects=['llvm', 'clang', 'lld']),
          'category'   : 'lld'},
 
+        ## AArch64 Self-hosting Clang+LLVM check-all + LLD + test-suite
+        ## TODO: Remove the X86 back-end after fixing the 90 bad tests
+        ## TODO: Add Compiler-RT after fixing all the failures
+        ## TODO: Fix the three remaining test-suite failures
+        {'name': "clang-cmake-aarch64-lld",
+         'slavenames':["linaro-apm-04"],
+         'builddir':"clang-cmake-aarch64-lld",
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(
+                      jobs=8,
+                      clean=False,
+                      checkout_compiler_rt=False,
+                      checkout_lld=True,
+                      test=True,
+                      useTwoStage=True,
+                      runTestSuite=True,
+                      nt_flags=['--cflag', '-mcpu=cortex-a57', '--cflag', '-fuse-ld=lld', '--threads=8', '--build-threads=8'],
+                      env={'PATH':'/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
+                      extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
+                                        "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
+                                        "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64;X86'",
+                                        "-DLLVM_ENABLE_LLD=True"],
+               ),
+         'category'   : 'lld'},
+
+
          ]
 
 # llgo builders.