[zorg] r316438 - Switch ARM & AArch64 test-suite builders to CMake

[Diana Picus via llvm-commits]

Author: rovka
Date: Tue Oct 24 07:04:31 2017
New Revision: 316438

URL: http://llvm.org/viewvc/llvm-project?rev=316438&view=rev
Log:
Switch ARM & AArch64 test-suite builders to CMake

Move from the nt producer to the test-suite one by defining
testsuite_flags instead of nt_flags. This affects 5 buildbots (4 AArch64
and one ARM; we already had one ARM bot using the test-suite producer).

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=316438&r1=316437&r2=316438&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Tue Oct 24 07:04:31 2017
@@ -216,8 +216,8 @@ def _get_clang_builders():
                       useTwoStage=False,
                       runTestSuite=True,
                       env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
-                      nt_flags=['--cflag', '-mcpu=cortex-a15 -marm',
-                                '--threads=4', '--build-threads=4'],
+                      testsuite_flags=['--cppflags', '-mcpu=cortex-a15 -marm',
+                                       '--threads=4', '--build-threads=4'],
                       extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -marm'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM'",
@@ -304,7 +304,8 @@ def _get_clang_builders():
                       test=True,
                       useTwoStage=False,
                       runTestSuite=True,
-                      nt_flags=['--cflag', '-mcpu=cortex-a57', '--threads=8', '--build-threads=8'],
+                      testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
+                                       '--threads=8', '--build-threads=8'],
                       env={'PATH':'/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
                            'BOTO_CONFIG':'/var/buildbot/llvmlab-build-artifacts.boto'},
                       extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
@@ -327,7 +328,9 @@ def _get_clang_builders():
                       test=True,
                       useTwoStage=True,
                       runTestSuite=True,
-                      nt_flags=['--cflag', '-mcpu=cortex-a57', '--cflag', '-fuse-ld=lld', '--threads=8', '--build-threads=8'],
+                      testsuite_flags=['--cppflags',
+                                       '-mcpu=cortex-a57 -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'",
@@ -348,7 +351,9 @@ def _get_clang_builders():
                       test=True,
                       useTwoStage=False,
                       runTestSuite=True,
-                      nt_flags=['--cflag', '-mcpu=cortex-a57', '--cflag', '-O0', '--mllvm=-global-isel', '--mllvm=-global-isel-abort=0', '--threads=8', '--build-threads=8'],
+                      testsuite_flags=['--cppflags',
+                                       '-mcpu=cortex-a57 -O0 -mllvm -global-isel -mllvm -global-isel-abort=0',
+                                       '--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'",
@@ -1059,7 +1064,8 @@ def _get_sanitizer_builders():
                       useTwoStage=True,
                       testStage1=False,
                       runTestSuite=True,
-                      nt_flags=['--cflag', '-mcpu=cortex-a57', '--threads=8', '--build-threads=8'],
+                      testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
+                                       '--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'",