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

[platform/upstream/automake.git] / t / parallel-tests-log-override-2.sh

diff --git a/t/parallel-tests-log-override-2.sh b/t/parallel-tests-log-override-2.sh
old mode 100755 (executable)
new mode 100644 (file)
index eccefcc..b08f756
--- a/t/parallel-tests-log-override-2.sh
+++ b/t/parallel-tests-log-override-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
@@ -18,7 +18,7 @@
 #  - $(TEST_SUITE_LOG) and $(TESTS)
 #  - $(TEST_SUITE_LOG) and $(TEST_LOGS)
 
-. ./defs || Exit 1
+. test-init.sh
 
 cat >> configure.ac <<'END'
 AC_OUTPUT
@@ -60,24 +60,22 @@ for test_list_override in \
   'TESTS=pass.test skip.test' \
   'TEST_LOGS=pass.log skip.log'
 do
-  env TEST_SUITE_LOG=partial.log "$test_list_override" \
-    $MAKE -e check >stdout || { cat stdout; Exit 1; }
-  cat stdout
+  run_make -O TEST_SUITE_LOG=partial.log "$test_list_override" check
   ls -l
   count_test_results total=2 pass=1 fail=0 skip=1 xfail=0 xpass=0 error=0
   cat pass.log
   cat skip.log
   cat partial.log
-  test ! -f test-suite.log
-  test ! -f pass2.log
-  test ! -f skip2.log
-  test ! -f fail.log
+  test ! -e test-suite.log
+  test ! -e pass2.log
+  test ! -e skip2.log
+  test ! -e fail.log
   grep '^PASS: pass\.test$' stdout
   grep '^SKIP: skip\.test$' stdout
   $FGREP 'SKIP: skip' partial.log
   $FGREP '% skipped test %' partial.log
-  $EGREP '(pass2|skip2|fail)\.test' stdout && Exit 1
-  $EGREP '(pass2|skip2|fail)' partial.log && Exit 1
+  $EGREP '(pass2|skip2|fail)\.test' stdout && exit 1
+  $EGREP '(pass2|skip2|fail)' partial.log && exit 1
   rm -f *.log
 done