projects
/
platform
/
upstream
/
automake.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: strengthen the ylwrap tests
[platform/upstream/automake.git]
/
t
/
tap-no-merge-stdout-stderr.sh
diff --git
a/t/tap-no-merge-stdout-stderr.sh
b/t/tap-no-merge-stdout-stderr.sh
index
0236ef8
..
6be67a7
100755
(executable)
--- 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.
# - 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
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
cat > all.test <<END
#!/bin/sh
@@
-43,11
+42,11
@@
END
chmod a+x all.test
chmod a+x all.test
-$MAKE check >stdout || { cat stdout;
E
xit 1; }
+$MAKE check >stdout || { cat stdout;
e
xit 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
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 &&
E
xit 1
+$FGREP 'bar bar bar' stdout &&
e
xit 1
:
: