Merge branch 'pkgconfing-tests-requirement' into maint

[platform/upstream/automake.git] / t / tap-planskip-and-logging.sh

diff --git a/t/tap-planskip-and-logging.sh b/t/tap-planskip-and-logging.sh
index 48b3e12..33e5f7f 100755 (executable)
--- a/t/tap-planskip-and-logging.sh
+++ b/t/tap-planskip-and-logging.sh
@@ -18,10 +18,9 @@
 #  - interactions between "TAP plan with SKIP" and logging of earlier or
 #    later TAP or non-TAP text
 
-am_parallel_tests=yes
-. ./defs || Exit 1
+. ./defs || exit 1
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 echo TEST_LOG_DRIVER_FLAGS = --comments >> Makefile
 
@@ -47,7 +46,7 @@ a later non-TAP line
 END
 
 TESTS='foo.test foo2.test bar.test' $MAKE -e check >stdout \
-  || { cat stdout; Exit 1; }
+  || { cat stdout; exit 1; }
 cat stdout
 
 count_test_results total=3 pass=0 fail=0 xpass=0 xfail=0 skip=3 error=0