Merge branch 'maint'

[platform/upstream/automake.git] / t / silent-many-gcc.sh

diff --git a/t/silent-many-gcc.sh b/t/silent-many-gcc.sh
index 8ad0720..2e5d203 100755 (executable)
--- a/t/silent-many-gcc.sh
+++ b/t/silent-many-gcc.sh
@@ -15,14 +15,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check silent-rules mode, with gcc depmode and many languages at once.
-# This test partly overlaps with other silent*.test, but it serves as
+# This test partly overlaps with other 'silent*.sh', but it serves as
 # a stress test by using many different languages at once -- so don't
 # remove this test script.
 # This test requires the GNU compilers; keep it in sync with sister test
-# 'silent-many-generic.test', which should work with generic compilers.
+# 'silent-many-generic.sh', which should work with generic compilers.
 
 required='gcc g++ gfortran lex yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
 
 # Avoids too much code duplication.
 do_and_check_silent_build ()
@@ -32,15 +32,15 @@ do_and_check_silent_build ()
             *) rebuild=false;;
   esac
 
-  $MAKE >stdout || { cat stdout; Exit 1; }
+  $MAKE >stdout || { cat stdout; exit 1; }
   cat stdout
   # Avoid spurious failures with SunStudio Fortran compilers.
   sed '/^NOTICE:/d' stdout > t
   mv -f t stdout
   cat stdout
 
-  $EGREP ' (-c|-o)' stdout && Exit 1
-  $EGREP '(mv|ylwrap) ' stdout && Exit 1
+  $EGREP ' (-c|-o)' stdout && exit 1
+  $EGREP '(mv|ylwrap) ' stdout && exit 1
 
   grep 'CXX .*foo1\.' stdout
   grep 'CXX .*baz1\.' stdout
@@ -58,7 +58,7 @@ do_and_check_silent_build ()
   grep 'CXXLD .*baz' stdout
   grep 'CCLD .*bla'  stdout
 
-  if $rebuild; then :; else
+  if ! $rebuild; then
     grep 'YACC .*foo6\.' stdout
     grep 'YACC .*baz6\.' stdout
     grep 'LEX .*foo5\.'  stdout
@@ -76,17 +76,17 @@ do_and_check_verbose_build ()
             *) rebuild=false;;
   esac
 
-  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
+  $MAKE V=1 >stdout || { cat stdout; exit 1; }
   cat stdout
 
   grep ' -c ' stdout
   grep ' -o ' stdout
 
-  $EGREP '(CC|CXX|FC|F77|LD) ' stdout && Exit 1
+  $EGREP '(CC|CXX|FC|F77|LD) ' stdout && exit 1
 
-  if $rebuild; then :; else
+  if ! $rebuild; then
     grep 'ylwrap ' stdout
-    $EGREP '(LEX|YACC) ' stdout && Exit 1
+    $EGREP '(LEX|YACC) ' stdout && exit 1
   fi
 
   unset rebuild
@@ -204,7 +204,7 @@ $FGREP 'fo2-foo6.c' Makefile.in
 depmodes="am_cv_CC_dependencies_compiler_type=gcc \
           am_cv_CXX_dependencies_compiler_type=gcc"
 # This apparently useless "for" loop is here to simplify the syncing
-# with sister test 'silent-many-generic.test'.
+# with sister test 'silent-many-generic.sh'.
 for config_args in \
   "$depmodes"
 do