[zorg] build.py: Allow lit test timeout value to be configurable

[bro4all]

Summary

The test timeout value that is set thru the LLVM_LIT_ARGS is currently hardcoded. This change makes timeout flag configurable.

[azharudd]

test/jenkins/test_monorepo_build.py

141

Please follow the convention for the comments (in this case whitespace missing after '#').

146

here too ...
Also please update the comment to reflect what is being tested.

zorg/jenkins/monorepo_build.py

3

Extra newline.

310–311

Can we move the timeout flag into a separate variable and use that here?

451–453

same here

1042–1043

Please expand the help message.

1042–1043

Extra whitespace.

[azharudd]

Merged in f36909d9. Thanks!

test/jenkins/test_monorepo_build.py

 
 # Make sure you can pass new test targets.
 # RUN: python %{src_root}/zorg/jenkins/monorepo_build.py cmake test --cmake-test-target foo --cmake-test-target bar | FileCheck --check-prefix CHECK-TTARGETS %s
 # CHECK-TTARGETS: '/usr/local/bin/ninja' '-v' '-k' '0' 'foo' 'bar'
 
 # Test long should always do check-all, since that is what many bots expect.
 # RUN: python %{src_root}/zorg/jenkins/monorepo_build.py cmake testlong  | FileCheck --check-prefix CHECK-TTARGETS2 %s
 # CHECK-TTARGETS2: '/usr/local/bin/ninja' '-v' '-k' '0' 'check-all'
+
+# Test to check if timeout flag is actually being set.
+# RUN: python %{src_root}/zorg/jenkins/monorepo_build.py cmake all --timeout=900 > %t-timeout.log
+# RUN: FileCheck --check-prefix CHECK-TIMEOUT < %t-timeout.log %s
+# CHECK-TIMEOUT: --timeout=900
+
+# Test to check if default timeout is being set to 600.
+# RUN: python %{src_root}/zorg/jenkins/monorepo_build.py cmake all > %t-timeout-default.log
+# RUN: FileCheck --check-prefix CHECK-TIMEOUT-DEFAULT < %t-timeout-default.log %s
+# CHECK-TIMEOUT-DEFAULT: --timeout=600
 No newline at end of file

zorg/jenkins/monorepo_build.py

 """Build and test clangs."""
 
 from __future__ import print_function
 import sys
 import logging
 import os
 import subprocess
 import datetime
 import time
 import argparse
 import shutil

 
 # Add dependency checker to the Python path.
 # For relative reference to the dependency file.
 here = os.path.dirname(os.path.abspath(__file__))
 sys.path.append(os.path.abspath(here + "/../../dep/"))
 import dep  # noqa
 
 
-
 def readme_name(repo):
     """Given a repo, return the name of the readme file."""
     if repo == "libcxx":
         return "LICENSE.TXT"
     return "README.txt"
 
 
 def next_section(name):
if conf.globalisel:
         cmake_cmd += ["-DLLVM_BUILD_GLOBAL_ISEL=ON"]
 
     if conf.sccache:
         run_ws([conf.sccache_path, "--stop-server"], env={"SCCACHE_IDLE_TIMEOUT": "0"}, err_okay=True)
         run_ws([conf.sccache_path, "--start-server"], env={"SCCACHE_IDLE_TIMEOUT": "0"})
         cmake_cmd += ['-DCMAKE_C_COMPILER_LAUNCHER=' + conf.sccache_path]
         cmake_cmd += ['-DCMAKE_CXX_COMPILER_LAUNCHER=' + conf.sccache_path]
 
-    lit_flags = ['--xunit-xml-output=testresults.xunit.xml', '-v', '-vv', '--timeout=600']
+    timeout_flag = '--timeout=' + str(conf.timeout)
+    lit_flags = ['--xunit-xml-output=testresults.xunit.xml', '-v', '-vv', timeout_flag]
     if conf.max_parallel_tests:
         lit_flags += ['-j', conf.max_parallel_tests]
     cmake_cmd += ['-DLLVM_LIT_ARGS={}'.format(' '.join(lit_flags))]
 
     ninja_cmd = env + ["/usr/local/bin/ninja", '-v']
     if conf.j_level is not None:
         ninja_cmd += ["-j", conf.j_level]
 
if target == "all" or target == "build":
 
             if libtool_path:
                 cmake_command += ['-DCMAKE_LIBTOOL=' + libtool_path]
 
             if conf.CC():
                 cmake_command.extend(['-DCMAKE_C_COMPILER=' + conf.CC(),
                                       '-DCMAKE_CXX_COMPILER=' + conf.CC() + "++"])
 
-            lit_flags = ['--xunit-xml-output=testresults.xunit.xml', '-v', '-vv', '--timeout=600']
+            timeout_flag = '--timeout=' + str(conf.timeout)
+            lit_flags = ['--xunit-xml-output=testresults.xunit.xml', '-v', '-vv', timeout_flag]
+
             if conf.max_parallel_tests:
                 lit_flags += ['-j', conf.max_parallel_tests]
             cmake_command.extend(
                 ['-DLLVM_LIT_ARGS={}'.format(' '.join(lit_flags))])
 
             if conf.thinlto:
                 cmake_command.extend(["-DLLVM_PARALLEL_LINK_JOBS=1"])
             elif conf.lto:
def lldb_cmake_builder(target, variant=None):
     log_dir = os.path.join(test_dir, 'logs')
     results_file = os.path.join(test_dir, 'results.xml')
     create_dirs([conf.lldbbuilddir(), test_dir, log_dir])
 
     cmake_build_type = conf.cmake_build_type if conf.cmake_build_type else 'RelWithDebInfo'
 
     # Construct dotest.py arguments.
     dotest_args=['--arch', 'x86_64', '--build-dir',
-                 conf.lldbbuilddir()+'/lldb-test-build.noindex',
-                 '-s='+log_dir,
-                 '-t',
-                 '--env', 'TERM=vt100']
     dotest_args.extend(conf.dotest_flags)
 
     # Construct lit arguments.
     lit_args = ['-v', '--time-tests', '--shuffle',
-    '--xunit-xml-output={}'.format(results_file), '-v']
+    '--xunit-xml-output={}'.format(results_file), '-v']
     if conf.max_parallel_tests:
         lit_args.extend(['-j', conf.max_parallel_tests])
     if variant == 'sanitized':
         lit_args.extend(['--timeout 1200'])
 
     # Construct CMake invocation.
     cmake_cmd = ["/usr/local/bin/cmake", '-G', 'Ninja',
                  conf.llvmsrcdir(),
def lldb_cmake_builder(target, variant=None):
     cmake_cmd.extend(conf.cmake_flags)
 
     if conf.CC():
         cmake_cmd.extend([
             '-DCMAKE_C_COMPILER=' + conf.CC(),
             '-DCMAKE_CXX_COMPILER=' + conf.CC() + "++"
         ])
 
-
     header("Clean")
     delete_module_caches(conf.workspace)
     footer()
 
     if target == 'all' or target == 'configure' or target == 'build':
         header("Cmake")
         run_cmd(conf.lldbbuilddir(), cmake_cmd)
         footer()
parser.add_argument('--sccache', dest='sccache',
                         action='store_true', default=False,
                         help="If the builds supports it, use sccache.")
     parser.add_argument('--globalisel', dest='globalisel',
                         action='store_true', help="Turn on the experimental"
                                                   " GlobalISel CMake flag.")
     parser.add_argument('--projects', dest='llvm_enable_projects',
                         default="clang;clang-tools-extra;compiler-rt;libcxx",
                         help="Semicolon seperated list of projects to build.")
-
+    parser.add_argument('--timeout', dest='timeout', type=int, default='600',
+                        help='individual test timeout in seconds.')
     args = parser.parse_args()
     if args.thinlto:
         args.lto = True
     return args
 
 
 def main():
     """Run a build based on command line args and ENV."""