summary refs log tree commit diff
path: root/timezone
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2015-11-17 11:43:49 +0100
committerAndreas Schwab <schwab@suse.de>2016-01-11 16:42:25 +0100
commitc83196b0df4340209f260ffaf90e787c711c268e (patch)
tree481d023bf3a8ef8ad6e9ff64846c2f34aac6883e /timezone
parent97ee300903cdc0a0052d09ed7c3f7779a303d625 (diff)
downloadglibc-c83196b0df4340209f260ffaf90e787c711c268e.tar.gz
glibc-c83196b0df4340209f260ffaf90e787c711c268e.tar.xz
glibc-c83196b0df4340209f260ffaf90e787c711c268e.zip
Force rereading TZDEFRULES after it was used to set DST rules only (bug #19253)
If the TZDEFRULES file was used to set the DST rules when $TZ didn't
provide any we need to make sure that the next time it is used we
recompute everything as __tzfile_default changes some setting from what is
provided by TZDEFRULES.
Diffstat (limited to 'timezone')
-rw-r--r--timezone/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/timezone/Makefile b/timezone/Makefile
index e6a6a088a2..dee7568c7e 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -40,7 +40,8 @@ ifeq ($(run-built-tests),yes)
 # List zones generated by separate commands running zic on the host.
 # Each such zic run counts as a separate test.
 test-zones := America/New_York Etc/UTC UTC Europe/Berlin \
-	      Australia/Melbourne America/Sao_Paulo Asia/Tokyo
+	      Australia/Melbourne America/Sao_Paulo Asia/Tokyo \
+	      $(posixrules-file)
 tests-special += $(addprefix $(testdata)/, $(test-zones))
 endif
 
@@ -91,6 +92,8 @@ zic-deps = $(objpfx)zic $(leapseconds) yearistype
 
 $(testdata)/America/New_York: northamerica $(zic-deps)
 	$(build-testdata)
+$(testdata)/$(posixrules-file): $(testdata)/America/New_York
+	$(make-link); $(evaluate-test)
 $(testdata)/Etc/UTC: etcetera $(zic-deps)
 	$(build-testdata)
 # Use a pattern rule to indicate the command produces both targets at once.