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.
This commit is contained in:
Stefan Liebler 2015-06-19 13:47:59 +02:00 committed by Andreas Krebbel
parent 52e9636260
commit 86fe187471
2 changed files with 11 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2015-06-19 Stefan Liebler <stli@linux.vnet.ibm.com>
* timezone/Makefile (%/UTC %/Universal):
Generate test-result files for UTC and Universal.
2015-06-19 Stefan Liebler <stli@linux.vnet.ibm.com>
* sysdeps/s390/fpu/libm-test-ulps: Regenerated.

View File

@ -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)