]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Prevent check-local-headers.sh hang.
authorCarlos O'Donell <carlos@systemhalted.org>
Mon, 14 Sep 2015 13:57:58 +0000 (09:57 -0400)
committerCarlos O'Donell <carlos@systemhalted.org>
Mon, 14 Sep 2015 13:57:58 +0000 (09:57 -0400)
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
Makefile

index ab0bf5f54f15227a672d662f47ec2f1f031ce5c6..33d0e1ba4e6856f48cb606250248e51a9d8285a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-14  Carlos O'Donell  <carlos@redhat.com>
+
+       * Makefile ($(objpfx)check-local-headers.out): Redirect stdin from
+       /dev/null.
+
 2015-09-13  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
        * sysdeps/mach/hurd/Makefile ($(patsubst %,$(hurd-objpfx)hurd/%.%,auth
index e07309e7a1f7138d71301b1d316df8fe2f63939c..a2abfb927335ccd480b2c993967aa752c0453c44 100644 (file)
--- 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)