timezone: fix parallel check failures

The XT testdata install rules expect the testdata dir to already exist in
the build tree, but it doesn't actually create it.  Instead, it relies on
the build-testdata define happening to be executed before it (which runs
zic which creates the dir).  When we run in parallel though, it's easy to
hit a failure:
$ cd timezone
$ rm -rf $objdir/timezone/testdata
$ make check -j
...
cp testdata/XT1 .../timezone/testdata/XT1
cp: cannot create regular file '.../timezone/testdata/XT1': No such file or directory
Makefile:116: recipe for target '.../timezone/testdata/XT1' failed
make: *** [.../timezone/testdata/XT1] Error 1
make: *** Waiting for unfinished jobs....

diff --git a/ChangeLog b/ChangeLog
index 57b07b36ee85ec8abf055629af382109d7dc12dc..7d2bf7fff81d1d6f43c69f8b54180c8a023f578b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-09-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * timezone/Makefile ($(testdata)/XT%): Call $(make-target-directory).
+
 2015-09-18  Joseph Myers  <joseph@codesourcery.com>
 
        [BZ #18980]

diff --git a/timezone/Makefile b/timezone/Makefile
index 81d4a3e0b52bb762fe90e35e5aef568dce470a46..bfb346337364e1e50f3322022fca4d3f20d1aca7 100644 (file)
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -113,6 +113,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps)
        $(build-testdata)
 
 $(testdata)/XT%: testdata/XT%
+       $(make-target-directory)
        cp $< $@
 
 $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make