From 66e6648b744424887c7e0607476a7be6b5887a5a Mon Sep 17 00:00:00 2001 From: Fahad Nayyar Date: Tue, 17 Jun 2025 21:40:04 -0700 Subject: [PATCH] Revert "[GreenDragon] Extend lit timeout for sanitizer bot (#460)" This reverts commit 31ba2a31df0d85be74d2693beb870e805b4d9098. --- zorg/jenkins/build.py | 4 ++-- zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgSan | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zorg/jenkins/build.py b/zorg/jenkins/build.py index 9683470d1..ea9a87a31 100644 --- a/zorg/jenkins/build.py +++ b/zorg/jenkins/build.py @@ -307,7 +307,7 @@ def cmake_builder(target): cmake_cmd += ['-DCMAKE_CXX_COMPILER_LAUNCHER=' + conf.sccache_path] timeout_flag = '--timeout=' + str(conf.timeout) - lit_flags = ['--xunit-xml-output=testresults.xunit.xml', '-v', '-vv', '--time-tests', timeout_flag] + 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))] @@ -448,7 +448,7 @@ def clang_builder(target): '-DCMAKE_CXX_COMPILER=' + conf.CC() + "++"]) timeout_flag = '--timeout=' + str(conf.timeout) - lit_flags = ['--xunit-xml-output=testresults.xunit.xml', '-v', '-vv', '--time-tests', timeout_flag] + lit_flags = ['--xunit-xml-output=testresults.xunit.xml', '-v', '-vv', timeout_flag] if conf.max_parallel_tests: lit_flags += ['-j', conf.max_parallel_tests] diff --git a/zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgSan b/zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgSan index d6b356c34..80d60ec1c 100644 --- a/zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgSan +++ b/zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgSan @@ -103,7 +103,7 @@ pipeline { --projects="clang;clang-tools-extra" \ --cmake-flag='-DLLVM_USE_SANITIZER=Address;Undefined' \ --cmake-flag="-DLIBCXX_INCLUDE_TESTS=OFF" \ - --timeout=2400 \ + --timeout=1800 \ --cmake-flag="-DPython3_EXECUTABLE=$(which python)" ''' }