From 3b2cc56dbcbee6bc211cbb58a08384aa6147f825 Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Mon, 14 Sep 2015 09:57:58 -0400 Subject: [PATCH] Prevent check-local-headers.sh hang. Consensus in [1] was that the right way to fix this was simply to redirect from /dev/null to terminate the test if no inputs was found by the tests own globbing e.g. "*/*.{o,os,oS}.d" This can happen when the build is incomplete and the tests are started. This failure causes check-local-headers.sh to hang forever waiting for input from stdin. This change makes the test terminate immediately if the glob doesn't return any files. [1] https://sourceware.org/ml/libc-alpha/2014-12/msg00337.html --- ChangeLog | 5 +++++ Makefile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ab0bf5f54f..33d0e1ba4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-09-14 Carlos O'Donell + + * Makefile ($(objpfx)check-local-headers.out): Redirect stdin from + /dev/null. + 2015-09-13 Samuel Thibault * sysdeps/mach/hurd/Makefile ($(patsubst %,$(hurd-objpfx)hurd/%.%,auth diff --git a/Makefile b/Makefile index e07309e7a1..a2abfb9273 100644 --- a/Makefile +++ b/Makefile @@ -262,7 +262,7 @@ endif $(objpfx)check-local-headers.out: scripts/check-local-headers.sh AWK='$(AWK)' scripts/check-local-headers.sh \ - "$(includedir)" "$(objpfx)" > $@; \ + "$(includedir)" "$(objpfx)" < /dev/null > $@; \ $(evaluate-test) ifneq ($(PERL),no)