tests: better idiom to override make macro defs on the cmdline

[platform/upstream/automake.git] / t / tap-test-number-0.sh

diff --git a/t/tap-test-number-0.sh b/t/tap-test-number-0.sh
old mode 100755 (executable)
new mode 100644 (file)
index cf75cef..a42ff54
--- a/t/tap-test-number-0.sh
+++ b/t/tap-test-number-0.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 @@
 #  - a test result numbered as 0 is to be considered out-of-order
 # This is consistent with the behaviour of the 'prove' utility.
 
-am_parallel_tests=yes
-. ./defs || Exit 1
+. test-init.sh
 
 if test $am_tap_implementation = perl; then
   $PERL -MTAP::Parser -e 1 \
@@ -44,7 +43,7 @@ if test $am_tap_implementation = perl; then
   fi
 fi
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > a.test <<END
 1..1
@@ -71,8 +70,8 @@ cat > e.test <<END
 ok 0 # TODO
 END
 
-TESTS='a.test b.test c.test d.test e.test' $MAKE -e check >stdout \
-  && { cat stdout; Exit 1; }
+run_make TESTS='a.test b.test c.test d.test e.test' check >stdout \
+  && { cat stdout; exit 1; }
 cat stdout
 
 count_test_results total=5 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=5