diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-09-18 13:49:08 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-09-18 16:03:42 -0400 |
| commit | 3cc652e951c71785032019fec82e3b8543d85305 (patch) | |
| tree | f735f2051358bf13f45fbdc22d5726a6d78f2571 | |
| parent | c8235dda728c4452f57c4c0d1bccc4e9a67da80c (diff) | |
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....
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | timezone/Makefile | 1 |
2 files changed, 5 insertions, 0 deletions
@@ -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 81d4a3e0b5..bfb3463373 100644 --- 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 |