Avoid possible false negatives in dejagnu7.test.

* tests/dejagnu7.test: Enable shell `errexit' flag.  Also, avoid
unportable use of fgrep option `-e'.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 2f1a33a13b881670dbc915af977a4429c6bea3ea..9a33a676de669e9b4925c46589ad8d9355527fff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-05-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
+       Avoid possible false negatives in dejagnu7.test.
+       * tests/dejagnu7.test: Enable shell `errexit' flag.  Also, avoid
+       unportable use of fgrep option `-e'.
+
        * tests/conflnk3.test: Use `test -r FILE' and `test ! -r FILE'
        instead of respectively `test -e FILE' and `test ! -e FILE',
        since Solaris Sh doesn't grok the latter.  Do not SKIP the test

diff --git a/tests/dejagnu7.test b/tests/dejagnu7.test
index 9abd42890206504ff8926e30b21a61deb53e296d..552c2caa1687a327abbfbe18e5fc120fc6557d2e 100755 (executable)
--- a/tests/dejagnu7.test
+++ b/tests/dejagnu7.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,8 +20,10 @@
 required=runtest
 . ./defs || Exit 1
 
+set -e
+
 # Check whether DejaGnu supports --status
-runtest --help | $FGREP -e --status || Exit 77
+runtest --help | grep '.*--status' || Exit 77
 
 cat > failtcl << 'END'
 #! /bin/sh