diff options
| author |  Abseil Team <absl-team@google.com> | 2022-11-15 09:08:33 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-worker@google.com> | 2022-11-15 09:09:28 -0800 |
| commit | d6fa16c8c5a067382ba991fe9765772ee2698088 (patch) | |
| tree | ff0836e9476d56f23569fec2fa3f894f2c8f7f9a /ci | |
| parent | 3ed4ca1f7f6a32cbfaabb095dcd6a2b81c5a3155 (diff) | |
Remove absl/time/internal/zoneinfo.inc. It was used to guarantee
availability of a few timezones for "time_test" and "time_benchmark",
but (file-based) zoneinfo is now secured via existing Bazel data/env
attributes, or new CMake environment settings.
This also avoids the need for employing the CCTZ zone-info-source
extension mechanism (which is a win).
PiperOrigin-RevId: 488673952
Change-Id: I9def9d705c8f0dca3c0bcddc2406edb098ea5da3
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/linux_gcc-latest_libstdcxx_cmake.sh | 1 | ||||
| -rwxr-xr-x | ci/linux_gcc_alpine_cmake.sh | 1 | ||||
| -rwxr-xr-x | ci/macos_xcode_cmake.sh | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/ci/linux_gcc-latest_libstdcxx_cmake.sh b/ci/linux_gcc-latest_libstdcxx_cmake.sh index ba65853f..1f721236 100755 --- a/ci/linux_gcc-latest_libstdcxx_cmake.sh +++ b/ci/linux_gcc-latest_libstdcxx_cmake.sh @@ -59,6 +59,7 @@ for std in ${ABSL_CMAKE_CXX_STANDARDS}; do -DCMAKE_CXX_STANDARD=${std} \ -DCMAKE_MODULE_LINKER_FLAGS=\"-Wl,--no-undefined\" && \ make -j$(nproc) && \ + TZDIR=/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo \ ctest -j$(nproc) --output-on-failure" done done diff --git a/ci/linux_gcc_alpine_cmake.sh b/ci/linux_gcc_alpine_cmake.sh index 10540130..b784456f 100755 --- a/ci/linux_gcc_alpine_cmake.sh +++ b/ci/linux_gcc_alpine_cmake.sh @@ -58,6 +58,7 @@ for std in ${ABSL_CMAKE_CXX_STANDARDS}; do -DCMAKE_CXX_STANDARD=${std} \ -DCMAKE_MODULE_LINKER_FLAGS=\"-Wl,--no-undefined\" && \ make -j$(nproc) && \ + TZDIR=/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo \ ctest -j$(nproc) --output-on-failure" done done diff --git a/ci/macos_xcode_cmake.sh b/ci/macos_xcode_cmake.sh index 97988631..690f86b8 100755 --- a/ci/macos_xcode_cmake.sh +++ b/ci/macos_xcode_cmake.sh @@ -51,6 +51,7 @@ for compilation_mode in ${ABSL_CMAKE_BUILD_TYPES}; do -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined" \ -DABSL_GOOGLETEST_DOWNLOAD_URL="${ABSL_GOOGLETEST_DOWNLOAD_URL}" time cmake --build . - time ctest -C ${compilation_mode} --output-on-failure + time TZDIR=${ABSEIL_ROOT}/absl/time/internal/cctz/testdata/zoneinfo \ + ctest -C ${compilation_mode} --output-on-failure done done |