tests: expose automake bug#14560

[platform/upstream/automake.git] / t / parallel-tests-extra-programs.sh

diff --git a/t/parallel-tests-extra-programs.sh b/t/parallel-tests-extra-programs.sh
old mode 100755 (executable)
new mode 100644 (file)
index d95d184..0125219
--- a/t/parallel-tests-extra-programs.sh
+++ b/t/parallel-tests-extra-programs.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
@@ -18,8 +18,7 @@
 # (or even be) $(EXTRA_PROGRAMS).
 
 required='cc native'
-am_parallel_tests=yes
-. ./defs || Exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
@@ -116,16 +115,13 @@ $AUTOMAKE -a
 #    'test-suite.log' file shouldn't be created (as it depends
 #     on *all* the test logs).
 
-st=0
-$MAKE -k check >stdout 2>stderr || st=$?
-cat stdout
-cat stderr >&2
+run_make -E -O -e IGNORE -- -k check
 ls -l
 if using_gmake; then
-  test $st -gt 0 || Exit 1
+  test $am_make_rc -gt 0 || exit 1
 else
   # Don't trust exit status of "make -k" for non-GNU make.
-  $MAKE check && Exit 1
+  $MAKE check && exit 1
   : For shells with busted 'set -e'.
 fi
 
@@ -135,8 +131,8 @@ grep foofoofoo foo.log
 grep barbarbar bar.log
 grep yepyepyep baz.log
 # Files that shouldn't have been created.
-test ! -f none.log
-test ! -f test-suite.log
+test ! -e none.log
+test ! -e test-suite.log
 # Expected testsuite progress output.
 grep '^PASS: baz\.test$' stdout
 # Don't anchor the end of the next two patterns, to allow for non-empty
@@ -159,11 +155,9 @@ $sleep
 
 echo 'int main (void) { return 0; }' > none.c
 
-st=0
-RECHECK_LOGS= $MAKE -e check >stdout || st=$?
-cat stdout
-ls -l
-test $st -eq 0 || Exit 1
+run_make -O -e IGNORE check RECHECK_LOGS=
+ls -l # For debugging.
+test $am_make_rc -eq 0 || exit 1
 
 # For debugging.
 stat stamp foo.log bar.log baz.log || :
@@ -174,7 +168,7 @@ is_newest stamp foo.log bar.log baz.log
 test -f none.log
 test -f test-suite.log
 # Tests that shouldn't have been re-run.
-$EGREP '(foo|bar)\.bin|baz\.test$' stdout && Exit 1
+$EGREP '(foo|bar)\.bin|baz\.test$' stdout && exit 1
 # Tests that should have been run.  Again, we don't anchor the end
 # of the next pattern, to allow for non-empty $(EXEEXT).
 grep '^PASS: none\.bin' stdout