From 564981f3758db766eb82dd13dbe4ea44e689abe2 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Sun, 21 Nov 2004 19:54:42 +0000
Subject: [PATCH] * lib/am/progs.am (installcheck-%DIR%PROGRAMS): Run programs
 with /dev/null as input, so we do not hang on programs that read their input
 without supporting --help and --version. * lib/am/scripts.am
 (installcheck-%DIR%SCRIPTS): Likewise for scripts. * tests/gnits2.test:
 Change scriptnok.sh to cat its input. Report and fix from James Youngman.

---
 ChangeLog         | 9 +++++++++
 lib/am/progs.am   | 3 ++-
 lib/am/scripts.am | 3 ++-
 tests/gnits2.test | 6 ++++--
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b29cd8b4..2657567b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-11-21  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* lib/am/progs.am (installcheck-%DIR%PROGRAMS): Run programs with
+	/dev/null as input, so we do not hang on programs that read their
+	input without supporting --help and --version.
+	* lib/am/scripts.am (installcheck-%DIR%SCRIPTS): Likewise for scripts.
+	* tests/gnits2.test: Change scriptnok.sh to cat its input.
+	Report and fix from James Youngman.
+
 2004-11-17  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* aclocal.in (%file_seen): Rename as ...
diff --git a/lib/am/progs.am b/lib/am/progs.am
index dc3c9b02..ea30757d 100644
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -120,7 +120,8 @@ installcheck-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
 ## Insert the directory back if nobase_ is used.
 ?!BASE?	  f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \
 	  for opt in --help --version; do \
-	    if "$(DESTDIR)$(%NDIR%dir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \
+	    if "$(DESTDIR)$(%NDIR%dir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
 		 && test -n "`cat c$${pid}_.out`" \
 		 && test -z "`cat c$${pid}_.err`"; then :; \
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
diff --git a/lib/am/scripts.am b/lib/am/scripts.am
index 374f990d..91a8aa0c 100644
--- a/lib/am/scripts.am
+++ b/lib/am/scripts.am
@@ -110,7 +110,8 @@ installcheck-%DIR%SCRIPTS: $(%DIR%_SCRIPTS)
 ## Insert the directory back if nobase_ is used.
 ?!BASE?	  f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \
 	  for opt in --help --version; do \
-	    if "$(DESTDIR)$(%NDIR%dir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \
+	    if "$(DESTDIR)$(%NDIR%dir)/$$f" $$opt >c$${pid}_.out \
+	         2>c$${pid}_.err </dev/null \
 		 && test -n "`cat c$${pid}_.out`" \
 		 && test -z "`cat c$${pid}_.err`"; then :; \
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
diff --git a/tests/gnits2.test b/tests/gnits2.test
index 91a2c3d2..59882015 100755
--- a/tests/gnits2.test
+++ b/tests/gnits2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -71,9 +71,11 @@ cat >sub/scriptok.sh <<EOF
 echo "Which version? Which usage?"
 EOF
 
+# Not only does this script not support --help/--version, but
+# it will also hang when run without input.
 cat >sub/scriptnok.sh <<EOF
 #!/bin/sh
-:
+cat
 EOF
 
 chmod +x sub/scriptok.sh
-- 
2.43.5