[libc++] Switch a few CI jobs to the minimal Lit configuration

[ldionne]

Summary

Eventually, this should become the default way of running the tests.
For now, only move a few CI nodes to it, and keep a node that runs the
legacy configuration.

[ldionne]

Rebase

[ldionne]

Update commit message.

[ldionne]

Rebase and move a few CI jobs to the new configuration

libcxx/cmake/caches/Generic-static.cmake

 set(LIBCXX_ENABLE_SHARED OFF CACHE BOOL "")
 set(LIBCXXABI_ENABLE_SHARED OFF CACHE BOOL "")
 set(LIBUNWIND_ENABLE_SHARED OFF CACHE BOOL "")
-
-# TODO: We should switch this to a from-sratch config with static libraries
-# instead and get rid of these options.
-set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI OFF CACHE BOOL "")
-set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXX OFF CACHE BOOL "")
-set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXXABI OFF CACHE BOOL "")
-set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXX OFF CACHE BOOL "")

libcxx/test/configs/libcxx-trunk-shared.cfg.in

config.substitutions.append(('%{flags}',
     '-isysroot {}'.format(CMAKE_OSX_SYSROOT) if CMAKE_OSX_SYSROOT else ''
 ))
 config.substitutions.append(('%{compile_flags}',
     '-nostdinc++ -isystem {} -I {}'.format(
         os.path.join(INSTALL_ROOT, 'include', 'c++', 'v1'),
         os.path.join(LIBCXX_ROOT, 'test', 'support'))
 ))
 config.substitutions.append(('%{link_flags}',
-    '-nostdlib++ -L {0} -lc++ -Wl,-rpath,{0}'.format(
+    '-nostdlib++ -L {0} -lc++ -Wl,-rpath,{0} -pthread'.format(
         os.path.join(INSTALL_ROOT, 'lib'))
 ))
 config.substitutions.append(('%{exec}',
     '{} {} --execdir %T -- '.format(
         pipes.quote(sys.executable),
         pipes.quote(runPy))
 ))
 
 # Add parameters and features to the config
 libcxx.test.newconfig.configure(
     libcxx.test.params.DEFAULT_PARAMETERS,
     libcxx.test.features.DEFAULT_FEATURES,
     config,
     lit_config
 )

libcxx/test/configs/libcxx-trunk-static.cfg.in

config.substitutions.append(('%{flags}',
     '-isysroot {}'.format(CMAKE_OSX_SYSROOT) if CMAKE_OSX_SYSROOT else ''
 ))
 config.substitutions.append(('%{compile_flags}',
     '-nostdinc++ -isystem {} -I {}'.format(
         os.path.join(INSTALL_ROOT, 'include', 'c++', 'v1'),
         os.path.join(LIBCXX_ROOT, 'test', 'support'))
 ))
 config.substitutions.append(('%{link_flags}',
-    '-nostdlib++ {} {}'.format(
+    '-nostdlib++ {} {} -pthread'.format(
         os.path.join(INSTALL_ROOT, 'lib', 'libc++.a'),
         os.path.join(INSTALL_ROOT, 'lib', 'libc++abi.a'))
 ))
 config.substitutions.append(('%{exec}',
     '{} {} --execdir %T -- '.format(
         pipes.quote(sys.executable),
         pipes.quote(runPy))
 ))
 
 # Add parameters and features to the config
 libcxx.test.newconfig.configure(
     libcxx.test.params.DEFAULT_PARAMETERS,
     libcxx.test.features.DEFAULT_FEATURES,
     config,
     lit_config
 )

libcxx/utils/ci/buildkite-pipeline.yml

artifact_paths:
       - "**/test-results.xml"
     agents:
       queue: "libcxx-builders"
     retry:
       automatic:
         - exit_status: -1  # Agent was lost
           limit: 2
 
+  # TODO: This can be removed once this becomes the default
+  - label: "New Lit configuration"
+    command: "libcxx/utils/ci/run-buildbot new-test-config"
+    artifact_paths:
+      - "**/test-results.xml"
+    agents:
+      queue: "libcxx-builders"
+    retry:
+      automatic:
+        - exit_status: -1  # Agent was lost
+          limit: 2
+
+  - label: "Legacy Lit configuration"
+    command: "libcxx/utils/ci/run-buildbot legacy-test-config"
+    artifact_paths:
+      - "**/test-results.xml"
+    agents:
+      queue: "libcxx-builders"
+    retry:
+      automatic:
+        - exit_status: -1  # Agent was lost
+          limit: 2
+
   - label: "Legacy standalone build"
     command: "libcxx/utils/ci/run-buildbot legacy-standalone"
     artifact_paths:
       - "**/test-results.xml"
     agents:
       queue: "libcxx-builders"
     retry:
       automatic:

libcxx/utils/ci/run-buildbot

generic-noexceptions)
     clean
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-noexceptions.cmake"
     check-cxx-cxxabi
 ;;
 generic-static)
     export CC=clang
     export CXX=clang++
     clean
-    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-static.cmake"
+    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-static.cmake" \
+                   -DLIBCXX_TEST_CONFIG="${MONOREPO_ROOT}/libcxx/test/configs/libcxx-trunk-static.cfg.in"
     check-cxx-cxxabi
 ;;
 generic-32bit)
     export CC=clang
     export CXX=clang++
     clean
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-32bits.cmake"
     check-cxx-cxxabi
x86_64-apple-system-backdeployment-*)
 
     PARAMS="target_triple=x86_64-apple-macosx${DEPLOYMENT_TARGET}"
     PARAMS+=";cxx_runtime_root=${OSX_ROOTS}/macOS/libc++/${DEPLOYMENT_TARGET}"
     PARAMS+=";abi_runtime_root=${OSX_ROOTS}/macOS/libc++abi/${DEPLOYMENT_TARGET}"
     PARAMS+=";use_system_cxx_lib=True"
 
     export CC=clang
     export CXX=clang++
+    # TODO: In the future, we should create a minimal testing config for back-deployment
+    #       and use that instead of the legacy config.
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake" \
                    -DLIBCXX_TEST_PARAMS="${PARAMS}" \
-                   -DLIBCXXABI_TEST_PARAMS="${PARAMS}"
+                   -DLIBCXXABI_TEST_PARAMS="${PARAMS}" \
+                   -DLIBCXX_TEST_CONFIG="${MONOREPO_ROOT}/libcxx/test/configs/legacy.cfg.in" \
 
     check-cxx-cxxabi
 ;;
 benchmarks)
     export CC=clang
     export CXX=clang++
     clean
     generate-cmake
     check-cxx-benchmarks
 ;;
 documentation)
     export CC=clang
     export CXX=clang++
     clean
     generate-cmake -DLLVM_ENABLE_SPHINX=ON
 
     echo "+++ Generating documentation"
     ${NINJA} -vC "${BUILD_DIR}" docs-libcxx-html
 ;;
+new-test-config)
+    export CC=clang
+    export CXX=clang++
+    clean
+    generate-cmake -DLIBCXX_TEST_CONFIG="${MONOREPO_ROOT}/libcxx/test/configs/libcxx-trunk-shared.cfg.in"
+    check-cxx-cxxabi
+;;
 unified-standalone)
     export CC=clang
     export CXX=clang++
 
     clean
 
     echo "--- Generating CMake"
     cmake -S "${MONOREPO_ROOT}/libcxx/utils/ci/runtimes" \
cmake -S "${MONOREPO_ROOT}/llvm" \
           -DLLVM_RUNTIME_TARGETS="x86_64-unknown-linux-gnu"
 
     echo "+++ Running the libc++ and libc++abi tests"
     ${NINJA} -C "${BUILD_DIR}" check-runtimes
 
     echo "--- Installing libc++ and libc++abi to a fake location"
     ${NINJA} -C "${BUILD_DIR}" install-cxx install-cxxabi
 ;;
+legacy-test-config)
+    export CC=clang
+    export CXX=clang++
+    clean
+    generate-cmake -DLIBCXX_TEST_CONFIG="${MONOREPO_ROOT}/libcxx/test/configs/legacy.cfg.in"
+    check-cxx-cxxabi
+;;
 legacy-standalone)
     export CC=clang
     export CXX=clang++
 
     clean
 
     echo "--- Generating CMake"
     cmake -S "${MONOREPO_ROOT}/libcxx" \