tests: avoid use of redirected 'run_make' invocations

[platform/upstream/automake.git] / t / check11.sh

diff --git a/t/check11.sh b/t/check11.sh
old mode 100755 (executable)
new mode 100644 (file)
index e78da0f..6be5aad
--- a/t/check11.sh
+++ b/t/check11.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-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
@@ -16,7 +16,8 @@
 
 # Check skip summary.
 
-. ./defs || Exit 1
+# For gen-testsuite-part: ==> try-with-serial-tests <==
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_OUTPUT
@@ -39,22 +40,20 @@ $AUTOMAKE -a
 
 ./configure
 
-env TESTS=skip $MAKE -e check >stdout || { cat stdout; Exit 1; }
-cat stdout
-if test x"$am_parallel_tests" = x"yes"; then
-  count_test_results total=1 pass=0 fail=0 skip=1 xfail=0 xpass=0 error=0
-else
-  grep '1.*passed' stdout && Exit 1
+run_make -O TESTS=skip check
+if test x"$am_serial_tests" = x"yes"; then
+  grep '1.*passed' stdout && exit 1
   : For shells with buggy 'set -e'.
+else
+  count_test_results total=1 pass=0 fail=0 skip=1 xfail=0 xpass=0 error=0
 fi
 
-env TESTS="skip skip2" $MAKE -e check >stdout || { cat stdout; Exit 1; }
-cat stdout
-if test x"$am_parallel_tests" = x"yes"; then
-  count_test_results total=2 pass=0 fail=0 skip=2 xfail=0 xpass=0 error=0
-else
-  grep '2.*passed' stdout && Exit 1
+run_make -O TESTS="skip skip2" check
+if test x"$am_serial_tests" = x"yes"; then
+  grep '2.*passed' stdout && exit 1
   : For shells with buggy 'set -e'.
+else
+  count_test_results total=2 pass=0 fail=0 skip=2 xfail=0 xpass=0 error=0
 fi
 
 :