Commit 4b65075a by Abseil Team Committed by Copybara-Service

Run the //absl/time timezone tests with a data dependency on, and a

matching ${TZDIR} setting for, //absl/time/internal/cctz:zoneinfo.

This eliminates any hidden dependency on /usr/share/zoneinfo, and
enables the upcoming deletion of the embedded internal/zoneinfo.inc
data from //absl/time:test_util.

PiperOrigin-RevId: 488372848
Change-Id: If1c8525b5ca4348cb2fc3b4760819f791b6e9725
parent 1b976982
...@@ -87,6 +87,8 @@ cc_test( ...@@ -87,6 +87,8 @@ cc_test(
"time_zone_test.cc", "time_zone_test.cc",
], ],
copts = ABSL_TEST_COPTS, copts = ABSL_TEST_COPTS,
data = ["//absl/time/internal/cctz:zoneinfo"],
env = {"TZDIR": "absl/time/internal/cctz/testdata/zoneinfo"},
linkopts = ABSL_DEFAULT_LINKOPTS, linkopts = ABSL_DEFAULT_LINKOPTS,
deps = [ deps = [
":test_util", ":test_util",
...@@ -133,6 +135,8 @@ cc_test( ...@@ -133,6 +135,8 @@ cc_test(
"time_benchmark.cc", "time_benchmark.cc",
], ],
copts = ABSL_TEST_COPTS, copts = ABSL_TEST_COPTS,
data = ["//absl/time/internal/cctz:zoneinfo"],
env = {"TZDIR": "absl/time/internal/cctz/testdata/zoneinfo"},
linkopts = ABSL_DEFAULT_LINKOPTS, linkopts = ABSL_DEFAULT_LINKOPTS,
tags = [ tags = [
"benchmark", "benchmark",
......
...@@ -16,11 +16,6 @@ package(features = ["-parse_headers"]) ...@@ -16,11 +16,6 @@ package(features = ["-parse_headers"])
licenses(["notice"]) licenses(["notice"])
filegroup(
name = "zoneinfo",
srcs = glob(["testdata/zoneinfo/**"]),
)
### libraries ### libraries
cc_library( cc_library(
...@@ -96,6 +91,7 @@ cc_test( ...@@ -96,6 +91,7 @@ cc_test(
size = "small", size = "small",
srcs = ["src/time_zone_format_test.cc"], srcs = ["src/time_zone_format_test.cc"],
data = [":zoneinfo"], data = [":zoneinfo"],
env = {"TZDIR": "absl/time/internal/cctz/testdata/zoneinfo"},
tags = [ tags = [
"no_test_android_arm", "no_test_android_arm",
"no_test_android_arm64", "no_test_android_arm64",
...@@ -116,6 +112,7 @@ cc_test( ...@@ -116,6 +112,7 @@ cc_test(
timeout = "moderate", timeout = "moderate",
srcs = ["src/time_zone_lookup_test.cc"], srcs = ["src/time_zone_lookup_test.cc"],
data = [":zoneinfo"], data = [":zoneinfo"],
env = {"TZDIR": "absl/time/internal/cctz/testdata/zoneinfo"},
tags = [ tags = [
"no_test_android_arm", "no_test_android_arm",
"no_test_android_arm64", "no_test_android_arm64",
...@@ -151,6 +148,12 @@ cc_test( ...@@ -151,6 +148,12 @@ cc_test(
], ],
) )
filegroup(
name = "zoneinfo",
srcs = glob(["testdata/zoneinfo/**"]),
visibility = ["//absl/time:__subpackages__"],
)
### examples ### examples
### binaries ### binaries
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