[zorg] r369681 - [monorepo_build] Allow test commands to fail

Vedant Kumar via llvm-commits llvm-commits at lists.llvm.org
Thu Aug 22 11:21:21 PDT 2019


Author: vedantk
Date: Thu Aug 22 11:21:21 2019
New Revision: 369681

URL: http://llvm.org/viewvc/llvm-project?rev=369681&view=rev
Log:
[monorepo_build] Allow test commands to fail


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=369681&r1=369680&r2=369681&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/monorepo_build.py (original)
+++ zorg/trunk/zorg/jenkins/monorepo_build.py Thu Aug 22 11:21:21 2019
@@ -594,7 +594,7 @@ def lldb_cmake_builder(target, variant=N
 
     for test_target in conf.cmake_test_targets:
         header("Run Custom Test: {0}".format(test_target))
-        run_cmd(conf.lldbbuilddir(), [NINJA, '-k', '0', '-v', test_target])
+        run_cmd(conf.lldbbuilddir(), [NINJA, '-k', '0', '-v', test_target], err_okay=True)
         footer()
 
 
@@ -867,28 +867,6 @@ def run_cmd(working_dir, cmd, env=None,
     return return_code
 
 
-def run_cmd_errors_okay(working_dir, cmd, env=None):
-    """Run a command in a working directory, reporting return value.
-    Non-zero exit codes do not generate an exception.
-    """
-    old_cwd = os.getcwd()
-    cmd_to_print = ' '.join([quote_sh_string(x) for x in cmd])
-    sys.stdout.write("cd {}\n{}\n".format(working_dir, cmd_to_print))
-    sys.stdout.flush()
-
-    start_time = datetime.datetime.now()
-    if not os.environ.get('TESTING', False):
-        try:
-            os.chdir(working_dir)
-            result = subprocess.call(cmd, env=env)
-        finally:
-            os.chdir(old_cwd)
-    end_time = datetime.datetime.now()
-
-    logging.info("Command took {} seconds: return code {}".format(
-        (end_time - start_time).seconds, result))
-
-
 KNOWN_TARGETS = ['all', 'configure', 'build', 'test', 'testlong', 'install']
 KNOWN_BUILDS = [
     'clang', 'cmake', 'lldb-cmake', 'lldb-cmake-standalone',




More information about the llvm-commits mailing list