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.

diff --git a/ChangeLog b/ChangeLog
index 1106110d629b7d20e26ba11ed33403d9070214e7..b9c7e28f4c6f9518f0f271f1f9ab26cd0a77286f 100644 (file)
--- 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 ab9d55b6be6502ad098c245c3253436d5f5913f1..35e6a95e6b9bcaa996baa1fe5c1e33e24b8cefd2 100644 (file)
--- 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)