am-ft: make the environment available earlier

[platform/upstream/automake.git] / t / parallel-tests-dry-run-2.sh

diff --git a/t/parallel-tests-dry-run-2.sh b/t/parallel-tests-dry-run-2.sh
old mode 100755 (executable)
new mode 100644 (file)
index f3ce42e..efb96e1
--- a/t/parallel-tests-dry-run-2.sh
+++ b/t/parallel-tests-dry-run-2.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2013 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
@@ -15,9 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check interactions between the parallel test harness and "make -n".
-# See also sister test 'parallel-tests-dry-run-1.test'.
+# See also sister test 'parallel-tests-dry-run-1.sh'.
 
-. ./defs || Exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_OUTPUT
@@ -37,11 +37,10 @@ $AUTOCONF
 make_n_ ()
 {
   st=0
-  $MAKE -n "$@" >output 2>&1 || { cat output; ls -l; Exit 1; }
-  cat output
+  run_make -M -- -n "$@" || { ls -l; exit 1; }
   # Look out for possible errors from common tools used by recipes.
-  $EGREP -i ' (exist|permission|denied|no .*(such|file))' output && Exit 1
-  $EGREP '(mv|cp|rm|cat|grep|sed|awk): ' output && Exit 1
+  $EGREP -i ' (exist|permission|denied|no .*(such|file))' output && exit 1
+  $EGREP '(mv|cp|rm|cat|grep|sed|awk): ' output && exit 1
   :
 }
 
@@ -49,19 +48,19 @@ make_n_ ()
 
 files='foo.log bar.log foo.trs bar.trs'
 
+echo 'exit 0' > foo.test
+echo 'exit 1' > bar.test
+
 for target in check recheck test-suite.log; do
-  test ! -f foo.log
-  test ! -f foo.trs
-  test ! -f bar.log
-  test ! -f bar.trs
-  test ! -f test-suite.log
+  make_n_ $target
+  test ! -e foo.log
+  test ! -e foo.trs
+  test ! -e bar.log
+  test ! -e bar.trs
+  test ! -e test-suite.log
 done
 
-# Creative quoting below to please maintainer-check.
-echo exit '0' > foo.test
-echo exit '1' > bar.test
-
-$MAKE check && Exit 1
+$MAKE check && exit 1
 
 chmod a-w .
 
@@ -71,17 +70,16 @@ test -f foo.trs
 test -f foo.log
 test -f bar.trs
 
-# Creative quoting below to please maintainer-check.
 cat > foo.test <<END
 echo this is bad
 exit 1
 END
-echo exit '0' > bar.test
+echo 'exit 0' > bar.test
 
 for target in check recheck test-suite.log; do
   make_n_ $target
   grep '^:test-result: *FAIL' bar.trs
-  grep 'this is bad' foo.log test-suite.log && Exit 1
+  grep 'this is bad' foo.log test-suite.log && exit 1
   : For shells with busted 'set -e'.
 done
 
@@ -92,7 +90,7 @@ else
   for target in check recheck test-suite.log; do
     make_n_ $target
     for f in $files; do
-      test -f $f && test ! -r $f || Exit 1
+      test -f $f && test ! -r $f || exit 1
     done
   done
 fi
@@ -103,9 +101,9 @@ rm -f foo.log bar.trs
 chmod a-w .
 for target in check recheck test-suite.log $files; do
   make_n_ $target
-  test ! -f foo.log
+  test ! -e foo.log
   test -f foo.trs
-  test ! -f bar.trs
+  test ! -e bar.trs
   test -f bar.log
 done