aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Bachmeyer <jcb@gnu.org>2021-05-18 23:45:27 -0500
committerJacob Bachmeyer <jcb@gnu.org>2021-05-18 23:45:27 -0500
commit0bab163959ff64d788bbdbd1c8719c44c9d4c95a (patch)
tree71fbc31438266c457b64b2bfda9fe2e46772a93e
parent1f7ac1cf71aab35d43d4a4f16dfaf5edd1d0c2cb (diff)
downloaddejagnu-0bab163959ff64d788bbdbd1c8719c44c9d4c95a.zip
dejagnu-0bab163959ff64d788bbdbd1c8719c44c9d4c95a.tar.gz
dejagnu-0bab163959ff64d788bbdbd1c8719c44c9d4c95a.tar.bz2
Avoid hang on Solaris 10 in dejagnu auxiliary launcher
-rw-r--r--ChangeLog4
-rwxr-xr-xdejagnu2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 232db1d..1227299 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2021-05-18 Jacob Bachmeyer <jcb@gnu.org>
+ * dejagnu: Redirect input from /dev/null when testing if awk is
+ GNU Awk; this avoids a hang on Solaris 10 where awk treats
+ --version as an Awk program and attempts to read input.
+
* testsuite/report-card.all/onetest.exp: Avoid Tcl error when item
and totals lines are missing entirely.
diff --git a/dejagnu b/dejagnu
index d323a62..ee9c007 100755
--- a/dejagnu
+++ b/dejagnu
@@ -248,7 +248,7 @@ if $have_gawk ; then
fi
# is "awk" actually GNU Awk?
if $have_awk ; then
- case `"$awkbin" --version 2>&1 | sed 1q` in
+ case `"$awkbin" --version </dev/null 2>&1 | sed 1q` in
*'GNU Awk'*) have_gawk_as_awk=true ;;
*) have_gawk_as_awk=false ;;
esac