Merge branch 'maint'

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

diff --git a/t/silent-many-generic.sh b/t/silent-many-generic.sh
index cd37672..0837a5d 100755 (executable)
--- a/t/silent-many-generic.sh
+++ b/t/silent-many-generic.sh
@@ -23,7 +23,7 @@
 # and forces the use of gcc depmode.
 
 required='cc c++ fortran fortran77 lex yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
 
 # Avoids too much code duplication.
 do_and_check_silent_build ()
@@ -33,15 +33,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
@@ -59,7 +59,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
@@ -77,17 +77,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
@@ -215,7 +215,7 @@ cp foo6.y sub/baz6.y
 
 mkdir bin
 saved_PATH=$PATH; export saved_PATH
-PATH=`pwd`/bin$PATH_SEPARATOR$PATH; export PATH
+PATH=$(pwd)/bin$PATH_SEPARATOR$PATH; export PATH
 
 $ACLOCAL
 $AUTOMAKE --add-missing