From patchwork Fri Sep 18 18:33:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 8791 X-Patchwork-Delegate: vapier@gentoo.org Received: (qmail 113899 invoked by alias); 18 Sep 2015 18:33:28 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 113885 invoked by uid 89); 18 Sep 2015 18:33:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: smtp.gentoo.org From: Mike Frysinger To: libc-alpha@sourceware.org Subject: [PATCH v2] timezone: fix parallel check failures Date: Fri, 18 Sep 2015 14:33:22 -0400 Message-Id: <1442601202-21467-1-git-send-email-vapier@gentoo.org> In-Reply-To: <1442599289-17404-1-git-send-email-vapier@gentoo.org> References: <1442599289-17404-1-git-send-email-vapier@gentoo.org> 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.... 2015-09-18 Mike Frysinger * timezone/Makefile ($(testdata)/XT%): Call $(make-target-directory). --- v2 - use existing make-target-directory helper pointed out by Roland timezone/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/timezone/Makefile b/timezone/Makefile index 81d4a3e..bfb3463 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