diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | timezone/Makefile | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 0cdb571a19..541eecedb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 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. 2015-06-18 Joseph Myers <joseph@codesourcery.com> diff --git a/timezone/Makefile b/timezone/Makefile index 5f185458bc..24c93c6051 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) |