tests: cosmetic changes in t/extra-sources.sh

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

diff --git a/t/check2.sh b/t/check2.sh
old mode 100755 (executable)
new mode 100644 (file)
index 8a05c9c..835fff6
--- a/t/check2.sh
+++ b/t/check2.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-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 @@
 
 # Test Automake style tests.
 
-. ./defs || Exit 1
+# For gen-testsuite-part: ==> try-with-serial-tests <==
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_CONFIG_FILES([dir/Makefile])
@@ -43,22 +44,19 @@ echo.sh:
 CLEANFILES = echo.sh
 END
 
-if test x"$am_parallel_tests" = x"yes"; then
-  cp "$am_scriptdir/test-driver" .
-fi
+test x"$am_serial_tests" = x"yes" || cp "$am_scriptdir/test-driver" .
 
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 ./configure
 
-$MAKE check >stdout || { cat stdout; Exit 1; }
-cat stdout
+run_make -O check
 grep '^PASS: subrun\.sh *$' stdout
-grep 'PASS.*echo\.sh' stdout && Exit 1
+grep 'PASS.*echo\.sh' stdout && exit 1
 
 # 'check' should depend directly on 'check-am' (similar tests are
-# in check.test and check3.test).
+# in 'check.sh' and 'built-sources-check.sh').
 $EGREP '^check:.* check-recursive( |$)' Makefile.in
 $EGREP '^check:.* check-am( |$)' dir/Makefile.in