Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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....
  • Loading branch information
Mike Frysinger committed Sep 18, 2015
1 parent c8235dd commit 3cc652e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
4 changes: 4 additions & 0 deletions 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]
Expand Down
1 change: 1 addition & 0 deletions timezone/Makefile
Expand Up @@ -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
Expand Down

0 comments on commit 3cc652e

Please sign in to comment.