[jenkins] Update script to use cross-project lit test suite

[mib]

Summary

To reflect changes announced in https://lists.llvm.org/pipermail/llvm-dev/2021-January/148048.html, this patch updates all occurrences of debuginfo-tests to cross-project-debuginfo-tests.

Signed-off-by: Med Ismail Bennani <[e-mail]>

[JDevlieghere]

LGTM!

[jhenderson]

Looks good, with the exception of my inline comment.

zorg/jenkins/build.py

619

Either I made a typo somewhere, or my comments were unclear apparently. This should be one of:

check-cross-project

or

check-debuginfo

There is no need to change it from what was there before, if you wish to maintain the behaviour as it was. If you change it to check-cross-project, additional tests may start getting picked up as they are added that aren't specifically debug info tests.

[mib]

Address @jhenderson comment.

zorg/jenkins/build.py

def lldb_cmake_builder():
     footer()
 
     header("Build")
     run_cmd(conf.lldbbuilddir(), [NINJA, '-v'])
     footer()
 
     header("Run Tests")
     run_cmd(conf.lldbbuilddir(), ['/usr/bin/env', 'TERM=vt100', NINJA, '-v',
-                                  'check-debuginfo', 'check-lldb', '-k2'])
+                                  'check-cross_project-debuginfo-tests', 'check-lldb', '-k2'])
     footer()
 
 
 def static_analyzer_benchmarks_builder():
     """Run static analyzer benchmarks"""
     header("Static Analyzer Benchmarks")
 
     benchmark_script = conf.workspace + "/utils-analyzer/SATestBuild.py"

zorg/jenkins/jobs/jobs/lldb-cmake

stages {
                     sha=$(echo ${git_desc} | cut -f 3 -d "-")
                     export GIT_SHA=${sha:1}
 
                     cd -
 
                     export MAX_PARALLEL_TESTS=$(sysctl hw.physicalcpu |awk '{print $2}')
                     python llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake build \
                       --assertions \
-                      --projects="clang;libcxx;libcxxabi;compiler-rt;lld;lldb;debuginfo-tests"  \
+                      --projects="clang;libcxx;libcxxabi;compiler-rt;lld;lldb;cross-project-tests"  \
                       --compiler-flag="-Wdocumentation" \
                       --cmake-type=Release || (echo "Retrying. debuginfo-tests may have failed due to high load."; sleep 30; python llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake build \
                       --assertions \
-                      --projects="clang;libcxx;libcxxabi;compiler-rt;lld;lldb;debuginfo-tests"  \
+                      --projects="clang;libcxx;libcxxabi;compiler-rt;lld;lldb;cross-project-tests"  \
                       --compiler-flag="-Wdocumentation" \
                       --cmake-type=Release)
                       '''
                 }
             }
         }
         stage('Test') {
             steps {

zorg/jenkins/jobs/jobs/llvm-coverage

 #!/usr/bin/env groovy
 pipeline {
     agent { label 'green-dragon-23' }
-    
     parameters {
         string(name: 'GIT_REVISION', defaultValue: '*/main', description: 'Git revision to build')
         string(name: 'ARTIFACT', defaultValue: 'clang-stage1-RA/latest', description: 'Compiler artifact to use for building the project')
         string(name: 'BUILD_TYPE', defaultValue: 'Release', description: 'Default CMake build type; one of: Release, Debug, ...')
         string(name: 'CLEAN', defaultValue: "false", description: 'Whether or not to clean the build directory before building')
     }
 
     stages {
stages {
             }
         }
         stage('Build') {
             steps {
                 timeout(300) {
                     sh '''
                     set -u
                     rm -rf build.properties
-        
                     cd llvm-project
                     git tag -a -m "First Commit" first_commit 97724f18c79c7cc81ced24239eb5e883bf1398ef || true
-        
                     git_desc=$(git describe --match "first_commit")
-        
                     export GIT_DISTANCE=$(echo ${git_desc} | cut -f 2 -d "-")
-        
                     sha=$(echo ${git_desc} | cut -f 3 -d "-")
                     export GIT_SHA=${sha:1}
-        
                     cd -
 
                     export PATH=$PATH:/usr/bin:/usr/local/bin
-                    
                     python llvm-zorg/zorg/jenkins/monorepo_build.py cmake build \
                       --cmake-build-target FileCheck \
                       --cmake-build-target count \
                       --cmake-build-target not \
                       --cmake-flag="-DLLVM_TARGETS_TO_BUILD=host" \
                       --cmake-type=Release \
                       --projects "" \
                       --noinstall \
                       --noupload
-                    
                     python llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake build \
                       --assertions \
-                      --projects="clang;libcxx;libcxxabi;lldb;debuginfo-tests"  \
+                      --projects="clang;libcxx;libcxxabi;lldb;cross-project-tests"  \
                       --cmake-flag="-DPYTHON_LIBRARY=/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/libpython3.7.dylib" \
                       --cmake-flag="-DPYTHON_INCLUDE_DIR=/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m" \
                       --cmake-flag="-DPYTHON_LIBRARY_DEBUG=/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/libpython3.7.dylib" \
                       --cmake-flag="-DPYTHON_EXECUTABLE=/usr/local/Cellar/python/3.7.0/bin/python3.7" \
                       --cmake-flag="-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" \
                       --cmake-flag="-DLLVM_BUILD_INSTRUMENTED_COVERAGE=ON" \
                       --cmake-flag="-DLLVM_PROFILE_MERGE_POOL_SIZE=1" \
                       --cmake-flag="-DLLVM_ENABLE_MODULES=Off" \
                       --cmake-type=Release \
                       --noupload
                     '''
                 }
             }
         }
         stage('Test') {
             steps {
                 timeout(300) {
                     sh '''
                     set -u
                     export PATH=$PATH:/usr/bin:/usr/local/bin
 
                     rm -rf test/results.xml
-                    
                     BUILD_DIR=$(pwd)/lldb-build
                     FAST_BUILD_DIR=$(pwd)/clang-build
                     REPORT_DIR=$(pwd)/coverage-reports
                     HOST=$(pwd)/host-compiler/bin
                     LLVM_PROFDATA=$HOST/llvm-profdata
                     LLVM_COV=$HOST/llvm-cov
                     ARTIFACT_PREP_SCRIPT=$WORKSPACE/llvm-project/llvm/utils/prepare-code-coverage-artifact.py
-                    
                     FAST_TOOLS=(FileCheck count not)
                     for TOOL in ${FAST_TOOLS[@]}; do
                       cp $FAST_BUILD_DIR/bin/$TOOL $BUILD_DIR/bin/$TOOL
                     done
-                    
                     # Clear out any stale profiles.
                     rm -rf $BUILD_DIR/profiles
 
                     # Run the tests.
                     IGNORE_ERRORS_OVERRIDE=1 python llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake testlong || echo "Some tests may have failed."
-                    
                     cd $BUILD_DIR
                     ninja -k 0 check-llvm check-clang || echo "Some tests may have failed."
                     cd -
-                    
                     COV_BINARIES=$(find $BUILD_DIR/bin $BUILD_DIR/lib -depth 1 -type f -exec file {} \\; | grep Mach-O | cut -d':' -f1 | grep -vE '/(FileCheck|count|not)$' | xargs)
-                    
                     rm -rf $REPORT_DIR
                     mkdir -p $REPORT_DIR
                     python $ARTIFACT_PREP_SCRIPT $LLVM_PROFDATA $LLVM_COV $BUILD_DIR/profiles $REPORT_DIR $COV_BINARIES --unified-report --restrict $WORKSPACE/llvm-project
-                    
                     scp -r $REPORT_DIR [e-mail]:/Library/WebServer/Documents/coverage
                     ssh [e-mail] "chmod -R 777 /Library/WebServer/Documents/coverage"
-                    
                     rm -rf lldb-build/profiles
                     '''
                 }
             }
         }
     }
 
     post {
         always {    
             scanForIssues tool: clang()
             junit 'test/results.xml'
         }
     }
 }

zorg/jenkins/monorepo_build.py

def lldb_cmake_builder(target, variant=None):
 
     if target == 'all' or target == 'test' or target == 'testlong':
         header("Run Tests")
         if variant == 'matrix' or variant == 'sanitized':
             test_command = ['/usr/bin/env', 'TERM=vt100', NINJA,
                             '-v', 'check-lldb']
         else:
             test_command = ['/usr/bin/env', 'TERM=vt100', NINJA,
-                            '-v', 'check-debuginfo', 'check-lldb', '-k2']
+                            '-v', 'check-cross_project-debuginfo-tests', 'check-lldb', '-k2']
         run_cmd(conf.lldbbuilddir(), test_command)
         footer()
 
     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])
         footer()