X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=t%2Ftap-no-merge-stdout-stderr.sh;h=6be67a7e2a9eb0eae7643fd64242b270a52da569;hb=b9951d654abb76c5419f1e2b453f1ca06fdb331b;hp=0236ef8ac75529402e25549f66e34f3006dbf135;hpb=8a5096d150cf9803b8963768b7366cd68edcce03;p=platform%2Fupstream%2Fautomake.git

diff --git a/t/tap-no-merge-stdout-stderr.sh b/t/tap-no-merge-stdout-stderr.sh
index 0236ef8..6be67a7 100755
--- a/t/tap-no-merge-stdout-stderr.sh
+++ b/t/tap-no-merge-stdout-stderr.sh
@@ -18,15 +18,14 @@
 #  - By default, TAP input is only from the stdout (and not the stderr)
 #    of the test command.
 
-am_parallel_tests=yes
-. ./defs || Exit 1
+. test-init.sh
 
 cat > Makefile.am << 'END'
 TEST_LOG_DRIVER_FLAGS = --comments
 TESTS = all.test
 END
 
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. tap-setup.sh
 
 cat > all.test <<END
 #!/bin/sh
@@ -43,11 +42,11 @@ END
 
 chmod a+x all.test
 
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
 cat stdout
 
 count_test_results total=2 pass=1 fail=0 xpass=0 xfail=0 skip=1 error=0
 $FGREP 'foo foo foo' stdout
-$FGREP 'bar bar bar' stdout && Exit 1
+$FGREP 'bar bar bar' stdout && exit 1
 
 :