From 4b65075a739f557782ef11e04f306212a21c0394 Mon Sep 17 00:00:00 2001
From: Abseil Team <absl-team@google.com>
Date: Mon, 14 Nov 2022 08:27:52 -0800
Subject: [PATCH] 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
---
 absl/time/BUILD.bazel               |  4 ++++
 absl/time/internal/cctz/BUILD.bazel | 13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/absl/time/BUILD.bazel b/absl/time/BUILD.bazel
index b5f03980..a6ea3506 100644
--- a/absl/time/BUILD.bazel
+++ b/absl/time/BUILD.bazel
@@ -87,6 +87,8 @@ cc_test(
         "time_zone_test.cc",
     ],
     copts = ABSL_TEST_COPTS,
+    data = ["//absl/time/internal/cctz:zoneinfo"],
+    env = {"TZDIR": "absl/time/internal/cctz/testdata/zoneinfo"},
     linkopts = ABSL_DEFAULT_LINKOPTS,
     deps = [
         ":test_util",
@@ -133,6 +135,8 @@ cc_test(
         "time_benchmark.cc",
     ],
     copts = ABSL_TEST_COPTS,
+    data = ["//absl/time/internal/cctz:zoneinfo"],
+    env = {"TZDIR": "absl/time/internal/cctz/testdata/zoneinfo"},
     linkopts = ABSL_DEFAULT_LINKOPTS,
     tags = [
         "benchmark",
diff --git a/absl/time/internal/cctz/BUILD.bazel b/absl/time/internal/cctz/BUILD.bazel
index 047e889a..edeabd81 100644
--- a/absl/time/internal/cctz/BUILD.bazel
+++ b/absl/time/internal/cctz/BUILD.bazel
@@ -16,11 +16,6 @@ package(features = ["-parse_headers"])
 
 licenses(["notice"])
 
-filegroup(
-    name = "zoneinfo",
-    srcs = glob(["testdata/zoneinfo/**"]),
-)
-
 ### libraries
 
 cc_library(
@@ -96,6 +91,7 @@ cc_test(
     size = "small",
     srcs = ["src/time_zone_format_test.cc"],
     data = [":zoneinfo"],
+    env = {"TZDIR": "absl/time/internal/cctz/testdata/zoneinfo"},
     tags = [
         "no_test_android_arm",
         "no_test_android_arm64",
@@ -116,6 +112,7 @@ cc_test(
     timeout = "moderate",
     srcs = ["src/time_zone_lookup_test.cc"],
     data = [":zoneinfo"],
+    env = {"TZDIR": "absl/time/internal/cctz/testdata/zoneinfo"},
     tags = [
         "no_test_android_arm",
         "no_test_android_arm64",
@@ -151,6 +148,12 @@ cc_test(
     ],
 )
 
+filegroup(
+    name = "zoneinfo",
+    srcs = glob(["testdata/zoneinfo/**"]),
+    visibility = ["//absl/time:__subpackages__"],
+)
+
 ### examples
 
 ### binaries