[zorg] r370997 - [lldb] Shuffle and time tests for the CMake builder

[Jonas Devlieghere via llvm-commits]

Author: jdevlieghere
Date: Wed Sep  4 16:04:58 2019
New Revision: 370997

URL: http://llvm.org/viewvc/llvm-project?rev=370997&view=rev
Log:
[lldb] Shuffle and time tests for the CMake builder

 - Pass the arguments to the right builder.
 - Remove the unused arguments from the standalone builder.

Modified:
    zorg/trunk/zorg/jenkins/monorepo_build.py

Modified: zorg/trunk/zorg/jenkins/monorepo_build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/monorepo_build.py?rev=370997&r1=370996&r2=370997&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/monorepo_build.py (original)
+++ zorg/trunk/zorg/jenkins/monorepo_build.py Wed Sep  4 16:04:58 2019
@@ -507,7 +507,8 @@ def lldb_cmake_builder(target, variant=N
     dotest_args.extend(conf.dotest_flags)
 
     # Construct lit arguments.
-    lit_args = ['--xunit-xml-output={}'.format(results_file), '-v']
+    lit_args = ['-v', '--time-tests', '--shuffle',
+		'--xunit-xml-output={}'.format(results_file), '-v']
     if conf.max_parallel_tests:
         lit_args.extend(['-j', conf.max_parallel_tests])
     if variant == 'sanitized':
@@ -642,10 +643,6 @@ def lldb_cmake_standalone_builder(target
                  '-DLLVM_VERSION_PATCH=99']
     cmake_cmd.extend(conf.cmake_flags)
 
-    if standalone_type == "install-tree":
-        external_lit = os.path.join(conf.builddir(), 'bin', 'llvm-lit')
-        cmake_cmd.extend(['-DLLVM_LIT_ARGS=--xunit-xml-output={} -v --time-tests --shuffle'.format(results_file)])
-
     if conf.CC():
         cmake_cmd.extend(['-DCMAKE_C_COMPILER=' + conf.CC(),
                           '-DCMAKE_CXX_COMPILER=' + conf.CC() + "++"])