diff options
| author |  Abseil Team <absl-team@google.com> | 2021-02-22 13:18:10 -0800 |
|---|---|---|
| committer |  vslashg <gfalcon@google.com> | 2021-02-22 16:20:19 -0500 |
| commit | a50ae369a30f99f79d7559002aba3413dac1bd48 (patch) | |
| tree | 89fd47210f4ec6885bcd47691533fd4ebbed3fbd /ci | |
| parent | a2d7f453c635e90b356017dd47049b89407c2d88 (diff) | |
Export of internal Abseil changes
--
4ceae78ecef025a331985958bba12ce12d4d0a68 by Derek Mauro <dmauro@google.com>:
Internal change
PiperOrigin-RevId: 358888936
--
48f69b0b46e2041bb321e8af7374d7e0b45efc25 by Derek Mauro <dmauro@google.com>:
Use the standard CTest mechanism BUILD_TESTING for enabling/disabling tests
in CMake
Fixes #901
PiperOrigin-RevId: 358822190
GitOrigin-RevId: 4ceae78ecef025a331985958bba12ce12d4d0a68
Change-Id: Ib1ca69a42355f2a4cd4c7f5a47184c4fd8441f35
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/linux_gcc-latest_libstdcxx_cmake.sh | 2 | ||||
| -rwxr-xr-x | ci/linux_gcc_alpine_cmake.sh | 2 | ||||
| -rwxr-xr-x | ci/macos_xcode_cmake.sh | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ci/linux_gcc-latest_libstdcxx_cmake.sh b/ci/linux_gcc-latest_libstdcxx_cmake.sh index ed9cfa38..ab06aa05 100755 --- a/ci/linux_gcc-latest_libstdcxx_cmake.sh +++ b/ci/linux_gcc-latest_libstdcxx_cmake.sh @@ -53,8 +53,8 @@ for std in ${ABSL_CMAKE_CXX_STANDARDS}; do /bin/bash -c " cmake /abseil-cpp \ -DABSL_GOOGLETEST_DOWNLOAD_URL=${ABSL_GOOGLETEST_DOWNLOAD_URL} \ - -DABSL_RUN_TESTS=ON \ -DBUILD_SHARED_LIBS=${build_shared} \ + -DBUILD_TESTING=ON \ -DCMAKE_BUILD_TYPE=${compilation_mode} \ -DCMAKE_CXX_STANDARD=${std} \ -DCMAKE_MODULE_LINKER_FLAGS=\"-Wl,--no-undefined\" && \ diff --git a/ci/linux_gcc_alpine_cmake.sh b/ci/linux_gcc_alpine_cmake.sh index 31310ac7..bce27d29 100755 --- a/ci/linux_gcc_alpine_cmake.sh +++ b/ci/linux_gcc_alpine_cmake.sh @@ -53,7 +53,7 @@ for std in ${ABSL_CMAKE_CXX_STANDARDS}; do /bin/sh -c " cmake /abseil-cpp \ -DABSL_GOOGLETEST_DOWNLOAD_URL=${ABSL_GOOGLETEST_DOWNLOAD_URL} \ - -DABSL_RUN_TESTS=ON \ + -DBUILD_TESTING=ON \ -DCMAKE_BUILD_TYPE=${compilation_mode} \ -DCMAKE_CXX_STANDARD=${std} \ -DCMAKE_MODULE_LINKER_FLAGS=\"-Wl,--no-undefined\" && \ diff --git a/ci/macos_xcode_cmake.sh b/ci/macos_xcode_cmake.sh index 0847b3ea..2a870cf4 100755 --- a/ci/macos_xcode_cmake.sh +++ b/ci/macos_xcode_cmake.sh @@ -45,11 +45,11 @@ for compilation_mode in ${ABSL_CMAKE_BUILD_TYPES}; do time cmake ${ABSEIL_ROOT} \ -GXcode \ -DBUILD_SHARED_LIBS=${build_shared} \ + -DBUILD_TESTING=ON \ -DCMAKE_BUILD_TYPE=${compilation_mode} \ -DCMAKE_CXX_STANDARD=11 \ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined" \ - -DABSL_GOOGLETEST_DOWNLOAD_URL="${ABSL_GOOGLETEST_DOWNLOAD_URL}" \ - -DABSL_RUN_TESTS=ON + -DABSL_GOOGLETEST_DOWNLOAD_URL="${ABSL_GOOGLETEST_DOWNLOAD_URL}" time cmake --build . time ctest -C ${compilation_mode} --output-on-failure done |