* 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.

diff --git a/ChangeLog b/ChangeLog
index b29cd8b4d195c09e90b77662450bef95ba4a854d..2657567bd603007a6a8159772084ae379d687662 100644 (file)
--- 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 dc3c9b02e112eaa8afa57806ce5b4b3b8988de14..ea30757d7e0e80921145d240a79db03ed4a1ac7c 100644 (file)
--- 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 374f990df41f45a5e3a9bde885f4fa58c8e9d004..91a8aa0c64ffd4260acd0f68b4463890bc10b551 100644 (file)
--- 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 91a2c3d2d813c8d43dff87295709a031f111f9bc..59882015c8be4290038e9bab4a46f9515434a642 100755 (executable)
--- 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