tests: avoid use of redirected 'run_make' invocations

[platform/upstream/automake.git] / t / tap-plan-malformed.sh

diff --git a/t/tap-plan-malformed.sh b/t/tap-plan-malformed.sh
old mode 100755 (executable)
new mode 100644 (file)
index 8aca466..82da569
--- a/t/tap-plan-malformed.sh
+++ b/t/tap-plan-malformed.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
@@ -17,9 +17,9 @@
 # TAP support: a malformed TAP plan is not recognized.  The checks in
 # here should be consistent with the behaviour of the 'prove' utility.
 
-. ./defs || Exit 1
+. test-init.sh
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > a.test <<END
 1..1 foo
@@ -45,11 +45,9 @@ cat > e.test <<END
 0..0
 END
 
-tests_list=`echo *.test`
-
-TESTS="$tests_list" $MAKE -e check >stdout && { cat stdout; Exit 1; }
-cat stdout
+tests_list=$(echo *.test)
 
+run_make -O -e FAIL TESTS="$tests_list" check
 count_test_results total=9 pass=2 fail=0 xpass=0 xfail=2 skip=0 error=5
 
 for tst in $tests_list; do