From 86fe187471da743fa4bcf60cad7c04f8fbe010b7 Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Fri, 19 Jun 2015 13:47:59 +0200 Subject: Fix timezone tests run in parallel. The Makefile rule is called one time for target %/UTC or %/Universal. If the tests are run in parallel, UTC or Universal can trigger the rule. This patch patch generates the second test-result file as a copy of the generated one. Thus the testsuite can rely on the existence of the test-result files regardless of which target has triggered the rule. ChangeLog: * timezone/Makefile (%/UTC %/Universal): Generate test-result files for UTC and Universal. --- ChangeLog | 5 +++++ timezone/Makefile | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0cdb571..541eece 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2015-06-19 Stefan Liebler + * timezone/Makefile (%/UTC %/Universal): + Generate test-result files for UTC and Universal. + +2015-06-19 Stefan Liebler + * sysdeps/s390/fpu/libm-test-ulps: Regenerated. 2015-06-18 Joseph Myers diff --git a/timezone/Makefile b/timezone/Makefile index 5f18545..24c93c6 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -107,6 +107,12 @@ $(testdata)/Etc/UTC: etcetera $(zic-deps) # Two separate targets built separately can collide if in parallel. %/UTC %/Universal: simplebackw $(zic-deps) %/Etc/UTC $(build-testdata) + { test -r $(@D)/Universal.test-result \ + && cp $(@D)/Universal.test-result $(@D)/UTC.test-result \ + && sed -i 's/Universal/UTC/' $(@D)/UTC.test-result ; exit 0; } + { test -r $(@D)/UTC.test-result \ + && cp $(@D)/UTC.test-result $(@D)/Universal.test-result \ + && sed -i 's/UTC/Universal/' $(@D)/Universal.test-result ; exit 0; } $(testdata)/%/Berlin $(testdata)/%/London: europe $(zic-deps) $(build-testdata) $(testdata)/Australia/Melbourne: australasia $(zic-deps) -- cgit v1.1