aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2017-06-07 17:14:28 +0000
committerJoseph Myers <joseph@codesourcery.com>2017-06-07 17:14:28 +0000
commitbd6193907a09f874553886f0986ba16b961fab8d (patch)
tree507af304dd968b799d05b4c1af6b852c1c58e700
parent2e87c7d1582461044f8cd983fd9be121cf23803f (diff)
downloadglibc-bd6193907a09f874553886f0986ba16b961fab8d.tar
glibc-bd6193907a09f874553886f0986ba16b961fab8d.tar.gz
glibc-bd6193907a09f874553886f0986ba16b961fab8d.tar.bz2
glibc-bd6193907a09f874553886f0986ba16b961fab8d.zip
Fix tst-timezone race (bug 14096).
I observed a failure of timezone/tst-timezone with the same symptoms as reported in bug 14096. I was unable to reproduce the failure on testing again. However, from inspection, the cause is as follows. tst-timezone uses time zones compiled from the northamerica file, but has no dependency on any such zones, so with a parallel build it is possible that they do not get compiled until after tst-timezone is run. This patch adds a dependency on the compiled America/New_York zone (the one used as a makefile target to cause such zones to be compiled, rather than one which is actually used in that test) to fix the race. Tested for x86_64. [BZ #14096] * timezone/Makefile ($(objpfx)tst-timezone.out): Depend on America/New_York.
-rw-r--r--ChangeLog6
-rw-r--r--timezone/Makefile1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1106110d62..b9c7e28f4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-07 Joseph Myers <joseph@codesourcery.com>
+
+ [BZ #14096]
+ * timezone/Makefile ($(objpfx)tst-timezone.out): Depend on
+ America/New_York.
+
2017-06-07 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/x86_64/multiarch/ifunc-sse4_1.h: Removed and folded
diff --git a/timezone/Makefile b/timezone/Makefile
index ab9d55b6be..35e6a95e6b 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -79,6 +79,7 @@ $(objpfx)test-tz.out: $(addprefix $(testdata)/, America/New_York Etc/UTC UTC)
$(objpfx)tst-timezone.out: $(addprefix $(testdata)/, \
Europe/Berlin Universal \
Australia/Melbourne \
+ America/New_York \
America/Sao_Paulo Asia/Tokyo \
Europe/London)
$(objpfx)tst-tzset.out: $(addprefix $(testdata)/XT, 1 2 3 4)