diff --git a/libcxx/utils/ci/macos-backdeployment.sh b/libcxx/utils/ci/macos-backdeployment.sh index 859b8e43daaafa..ae3dfa841cde57 100755 --- a/libcxx/utils/ci/macos-backdeployment.sh +++ b/libcxx/utils/ci/macos-backdeployment.sh @@ -4,13 +4,12 @@ set -ue function usage() { cat < --std --arch --deployment-target --sdk-version [--libcxx-roots ] [--lit-args ] [--no-cleanup] +$(basename ${0}) [-h|--help] --monorepo-root --std --deployment-target --sdk-version [--libcxx-roots ] [--lit-args ] [--no-cleanup] This script is used to continually test the back-deployment use case of libc++ and libc++abi on MacOS. --monorepo-root Full path to the root of the LLVM monorepo. Both libc++ and libc++abi headers from the monorepo are used. --std Version of the C++ Standard to run the tests under (c++03, c++11, etc..). - --arch Architecture to build the tests for (32, 64). --deployment-target The deployment target to run the tests for. This should be a version number of MacOS (e.g. 10.12). All MacOS versions until and including 10.9 are supported. --sdk-version The version of the SDK to test with. This should be a version number of MacOS (e.g. 10.12). We'll link against the libc++ dylib in that SDK, but we'll run against the one on the given deployment target. The SDK version must be no older than the deployment target. [--libcxx-roots] The path to previous libc++/libc++abi dylibs to use for back-deployment testing. Those are normally downloaded automatically, but if specified, this option will override the directory used. The directory should have the same layout as the roots downloaded automatically. @@ -43,10 +42,6 @@ while [[ $# -gt 0 ]]; do STD="${2}" shift; shift ;; - --arch) - ARCH="${2}" - shift; shift - ;; --deployment-target) DEPLOYMENT_TARGET="${2}" shift; shift @@ -81,7 +76,6 @@ done if [[ -z ${MONOREPO_ROOT+x} ]]; then echo "--monorepo-root is a required parameter"; usage; exit 1; fi if [[ -z ${STD+x} ]]; then echo "--std is a required parameter"; usage; exit 1; fi -if [[ -z ${ARCH+x} ]]; then echo "--arch is a required parameter"; usage; exit 1; fi if [[ -z ${DEPLOYMENT_TARGET+x} ]]; then echo "--deployment-target is a required parameter"; usage; exit 1; fi if [[ -z ${MACOS_SDK_VERSION+x} ]]; then echo "--sdk-version is a required parameter"; usage; exit 1; fi if [[ -z ${ADDITIONAL_LIT_ARGS+x} ]]; then ADDITIONAL_LIT_ARGS=""; fi @@ -113,14 +107,6 @@ PREVIOUS_DYLIBS_URL="http://lab.llvm.org:8080/roots/libcxx-roots.tar.gz" LLVM_TARBALL_URL="https://github.com/llvm-mirror/llvm/archive/master.tar.gz" -echo "@@@ Setting up LIT flags for architecture @@@" -LIT_ARCH_STRING="" -if [[ "${ARCH}" == "32" ]]; then - LIT_ARCH_STRING="--param=enable_32bit=true" -fi -echo "@@@@@@" - - echo "@@@ Configuring CMake @@@" mkdir -p "${LLVM_BUILD_DIR}" (cd "${LLVM_BUILD_DIR}" && @@ -129,7 +115,7 @@ mkdir -p "${LLVM_BUILD_DIR}" -GNinja \ -DCMAKE_INSTALL_PREFIX="${LLVM_INSTALL_DIR}" \ -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \ - -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \ + -DCMAKE_OSX_ARCHITECTURES="x86_64" \ "${MONOREPO_ROOT}/llvm" ) echo "@@@@@@" @@ -157,7 +143,6 @@ LIBCXX_IN_SDK="${PREVIOUS_DYLIBS_DIR}/macOS/${MACOS_SDK_VERSION}/libc++.dylib" echo "@@@ Running tests for libc++ @@@" "${LLVM_BUILD_DIR}/bin/llvm-lit" -sv "${MONOREPO_ROOT}/libcxx/test" \ --param=enable_experimental=false \ - ${LIT_ARCH_STRING} \ --param=cxx_headers="${LLVM_INSTALL_DIR}/include/c++/v1" \ --param=std="${STD}" \ --param=platform="macosx${DEPLOYMENT_TARGET}" \ diff --git a/libcxx/utils/ci/macos-trunk.sh b/libcxx/utils/ci/macos-trunk.sh index ea6a9b435b5a52..843d23c1d00c3e 100755 --- a/libcxx/utils/ci/macos-trunk.sh +++ b/libcxx/utils/ci/macos-trunk.sh @@ -4,13 +4,12 @@ set -ue function usage() { cat < --std --arch --libcxx-exceptions [--lit-args ] +$(basename ${0}) [-h|--help] --monorepo-root --std --libcxx-exceptions [--lit-args ] This script is used to continually test libc++ and libc++abi trunk on MacOS. --monorepo-root Full path to the root of the LLVM monorepo. Both libc++ and libc++abi from the monorepo are used. --std Version of the C++ Standard to run the tests under (c++03, c++11, etc..). - --arch Architecture to build the tests for (32, 64). --libcxx-exceptions Whether to enable exceptions when building libc++ and running the libc++ tests. libc++abi is always built with support for exceptions because other libraries in the runtime depend on it (like libobjc). This must be ON or OFF. [--cmake-args] Additional arguments to pass to CMake (both the libc++ and the libc++abi configuration). If there are multiple arguments, quote them to paass them as a single argument to this script. [--lit-args] Additional arguments to pass to lit. If there are multiple arguments, quote them to pass them as a single argument to this script. @@ -34,10 +33,6 @@ while [[ $# -gt 0 ]]; do STD="${2}" shift; shift ;; - --arch) - ARCH="${2}" - shift; shift - ;; --libcxx-exceptions) LIBCXX_EXCEPTIONS="${2}" shift; shift @@ -68,7 +63,6 @@ done if [[ -z ${MONOREPO_ROOT+x} ]]; then echo "--monorepo-root is a required parameter"; usage; exit 1; fi if [[ -z ${STD+x} ]]; then echo "--std is a required parameter"; usage; exit 1; fi -if [[ -z ${ARCH+x} ]]; then echo "--arch is a required parameter"; usage; exit 1; fi if [[ "${LIBCXX_EXCEPTIONS}" != "ON" && "${LIBCXX_EXCEPTIONS}" != "OFF" ]]; then echo "--libcxx-exceptions is a required parameter and must be either ON or OFF"; usage; exit 1; fi if [[ -z ${ADDITIONAL_CMAKE_ARGS+x} ]]; then ADDITIONAL_CMAKE_ARGS=""; fi if [[ -z ${ADDITIONAL_LIT_ARGS+x} ]]; then ADDITIONAL_LIT_ARGS=""; fi @@ -92,9 +86,6 @@ LLVM_INSTALL_DIR="${TEMP_DIR}/llvm-install" echo "@@@ Setting up LIT flags @@@" LIT_FLAGS="-sv --param=std=${STD} ${ADDITIONAL_LIT_ARGS}" -if [[ "${ARCH}" == "32" ]]; then - LIT_FLAGS+=" --param=enable_32bit=true" -fi echo "@@@@@@" @@ -110,7 +101,7 @@ mkdir -p "${LLVM_BUILD_DIR}" ${ADDITIONAL_CMAKE_ARGS} \ -DLLVM_LIT_ARGS="${LIT_FLAGS}" \ -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \ - -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \ + -DCMAKE_OSX_ARCHITECTURES="x86_64" \ "${MONOREPO_ROOT}/llvm" ) echo "@@@@@@"