Skip to content

A
abseil-cpp
Commit d6fa16c8 by Abseil Team Committed by Copybara-Service
Options

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
parent 3ed4ca1f
Showing with 5 additions and 109 deletions
absl/time/BUILD.bazel
...@@ -59,10 +59,7 @@ cc_library( ...@@ -59,10 +59,7 @@ cc_library(
cc_library( cc_library(
name = "test_util", name = "test_util",
testonly = 1, testonly = 1,
srcs = [ srcs = ["internal/test_util.cc"],
"internal/test_util.cc",
"internal/zoneinfo.inc",
],
hdrs = ["internal/test_util.h"], hdrs = ["internal/test_util.h"],
copts = ABSL_DEFAULT_COPTS, copts = ABSL_DEFAULT_COPTS,
linkopts = ABSL_DEFAULT_LINKOPTS, linkopts = ABSL_DEFAULT_LINKOPTS,
...@@ -71,8 +68,6 @@ cc_library( ...@@ -71,8 +68,6 @@ cc_library(
":time", ":time",
"//absl/base:config", "//absl/base:config",
"//absl/base:raw_logging_internal", "//absl/base:raw_logging_internal",
"//absl/time/internal/cctz:time_zone",
"@com_google_googletest//:gtest",
], ],
) )
......
absl/time/CMakeLists.txt
...@@ -95,7 +95,6 @@ absl_cc_library( ...@@ -95,7 +95,6 @@ absl_cc_library(
"internal/test_util.h" "internal/test_util.h"
SRCS SRCS
"internal/test_util.cc" "internal/test_util.cc"
"internal/zoneinfo.inc"
COPTS COPTS
${ABSL_DEFAULT_COPTS} ${ABSL_DEFAULT_COPTS}
DEPS DEPS
...@@ -103,7 +102,6 @@ absl_cc_library( ...@@ -103,7 +102,6 @@ absl_cc_library(
absl::config absl::config
absl::raw_logging_internal absl::raw_logging_internal
absl::time_zone absl::time_zone
GTest::gmock
TESTONLY TESTONLY
) )
......
absl/time/internal/test_util.cc
...@@ -14,16 +14,8 @@ ...@@ -14,16 +14,8 @@
#include "absl/time/internal/test_util.h" #include "absl/time/internal/test_util.h"
#include <algorithm>
#include <cstddef>
#include <cstring>
#include <memory>
#include "absl/base/config.h" #include "absl/base/config.h"
#include "absl/base/internal/raw_logging.h" #include "absl/base/internal/raw_logging.h"
#include "absl/time/internal/cctz/include/cctz/zone_info_source.h"
namespace cctz = absl::time_internal::cctz;
namespace absl { namespace absl {
ABSL_NAMESPACE_BEGIN ABSL_NAMESPACE_BEGIN
...@@ -38,95 +30,3 @@ TimeZone LoadTimeZone(const std::string& name) { ...@@ -38,95 +30,3 @@ TimeZone LoadTimeZone(const std::string& name) {
} // namespace time_internal } // namespace time_internal
ABSL_NAMESPACE_END ABSL_NAMESPACE_END
} // namespace absl } // namespace absl
namespace absl {
ABSL_NAMESPACE_BEGIN
namespace time_internal {
namespace cctz_extension {
namespace {
// Embed the zoneinfo data for time zones used during tests and benchmarks.
// The data was generated using "xxd -i zoneinfo-file". There is no need
// to update the data as long as the tests do not depend on recent changes
// (and the past rules remain the same).
#include "absl/time/internal/zoneinfo.inc"
const struct ZoneInfo {
const char* name;
const char* data;
std::size_t length;
} kZoneInfo[] = {
// The three real time zones used by :time_test and :time_benchmark.
{"America/Los_Angeles", //
reinterpret_cast<char*>(America_Los_Angeles), America_Los_Angeles_len},
{"America/New_York", //
reinterpret_cast<char*>(America_New_York), America_New_York_len},
{"Australia/Sydney", //
reinterpret_cast<char*>(Australia_Sydney), Australia_Sydney_len},
// Other zones named in tests but which should fail to load.
{"Invalid/TimeZone", nullptr, 0},
{"", nullptr, 0},
// Allows use of the local time zone from a system-specific location.
#ifdef _MSC_VER
{"localtime", //
reinterpret_cast<char*>(America_Los_Angeles), America_Los_Angeles_len},
#else
{"/etc/localtime", //
reinterpret_cast<char*>(America_Los_Angeles), America_Los_Angeles_len},
#endif
};
class TestZoneInfoSource : public cctz::ZoneInfoSource {
public:
TestZoneInfoSource(const char* data, std::size_t size)
: data_(data), end_(data + size) {}
std::size_t Read(void* ptr, std::size_t size) override {
const std::size_t len =
std::min(size, static_cast<std::size_t>(end_ - data_));
memcpy(ptr, data_, len);
data_ += len;
return len;
}
int Skip(std::size_t offset) override {
data_ += std::min(offset, static_cast<std::size_t>(end_ - data_));
return 0;
}
private:
const char* data_;
const char* const end_;
};
std::unique_ptr<cctz::ZoneInfoSource> TestFactory(
const std::string& name,
const std::function<std::unique_ptr<cctz::ZoneInfoSource>(
const std::string& name)>& /*fallback_factory*/) {
for (const ZoneInfo& zoneinfo : kZoneInfo) {
if (name == zoneinfo.name) {
if (zoneinfo.data == nullptr) return nullptr;
return std::unique_ptr<cctz::ZoneInfoSource>(
new TestZoneInfoSource(zoneinfo.data, zoneinfo.length));
}
}
// The embedded zoneinfo data does not include the zone, so fallback to
// built-in UTC. The tests have been crafted so that this should only
// happen when testing absl::LocalTimeZone() with an unconstrained ${TZ}.
return nullptr;
}
} // namespace
#if !defined(__MINGW32__)
// MinGW does not support the weak symbol extension mechanism.
ZoneInfoSourceFactory zone_info_source_factory = TestFactory;
#endif
} // namespace cctz_extension
} // namespace time_internal
ABSL_NAMESPACE_END
} // namespace absl
ci/linux_gcc-latest_libstdcxx_cmake.sh
...@@ -59,6 +59,7 @@ for std in ${ABSL_CMAKE_CXX_STANDARDS}; do ...@@ -59,6 +59,7 @@ for std in ${ABSL_CMAKE_CXX_STANDARDS}; do
-DCMAKE_CXX_STANDARD=${std} \ -DCMAKE_CXX_STANDARD=${std} \
-DCMAKE_MODULE_LINKER_FLAGS=\"-Wl,--no-undefined\" && \ -DCMAKE_MODULE_LINKER_FLAGS=\"-Wl,--no-undefined\" && \
make -j$(nproc) && \ make -j$(nproc) && \
TZDIR=/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo \
ctest -j$(nproc) --output-on-failure" ctest -j$(nproc) --output-on-failure"
done done
done done
......
ci/linux_gcc_alpine_cmake.sh
...@@ -58,6 +58,7 @@ for std in ${ABSL_CMAKE_CXX_STANDARDS}; do ...@@ -58,6 +58,7 @@ for std in ${ABSL_CMAKE_CXX_STANDARDS}; do
-DCMAKE_CXX_STANDARD=${std} \ -DCMAKE_CXX_STANDARD=${std} \
-DCMAKE_MODULE_LINKER_FLAGS=\"-Wl,--no-undefined\" && \ -DCMAKE_MODULE_LINKER_FLAGS=\"-Wl,--no-undefined\" && \
make -j$(nproc) && \ make -j$(nproc) && \
TZDIR=/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo \
ctest -j$(nproc) --output-on-failure" ctest -j$(nproc) --output-on-failure"
done done
done done
......
ci/macos_xcode_cmake.sh
...@@ -51,6 +51,7 @@ for compilation_mode in ${ABSL_CMAKE_BUILD_TYPES}; do ...@@ -51,6 +51,7 @@ for compilation_mode in ${ABSL_CMAKE_BUILD_TYPES}; do
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined" \ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined" \
-DABSL_GOOGLETEST_DOWNLOAD_URL="${ABSL_GOOGLETEST_DOWNLOAD_URL}" -DABSL_GOOGLETEST_DOWNLOAD_URL="${ABSL_GOOGLETEST_DOWNLOAD_URL}"
time cmake --build . 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
done done
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment