projects
/
platform
/
upstream
/
automake.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'maint'
[platform/upstream/automake.git]
/
t
/
parallel-tests-dry-run-2.sh
diff --git
a/t/parallel-tests-dry-run-2.sh
b/t/parallel-tests-dry-run-2.sh
index
f3ce42e
..
940cab2
100755
(executable)
--- a/
t/parallel-tests-dry-run-2.sh
+++ b/
t/parallel-tests-dry-run-2.sh
@@
-17,7
+17,7
@@
# Check interactions between the parallel test harness and "make -n".
# See also sister test 'parallel-tests-dry-run-1.test'.
# Check interactions between the parallel test harness and "make -n".
# See also sister test 'parallel-tests-dry-run-1.test'.
-. ./defs ||
E
xit 1
+. ./defs ||
e
xit 1
cat >> configure.ac << 'END'
AC_OUTPUT
cat >> configure.ac << 'END'
AC_OUTPUT
@@
-37,11
+37,11
@@
$AUTOCONF
make_n_ ()
{
st=0
make_n_ ()
{
st=0
- $MAKE -n "$@" >output 2>&1 || { cat output; ls -l;
E
xit 1; }
+ $MAKE -n "$@" >output 2>&1 || { cat output; ls -l;
e
xit 1; }
cat output
# Look out for possible errors from common tools used by recipes.
cat output
# Look out for possible errors from common tools used by recipes.
- $EGREP -i ' (exist|permission|denied|no .*(such|file))' output &&
E
xit 1
- $EGREP '(mv|cp|rm|cat|grep|sed|awk): ' output &&
E
xit 1
+ $EGREP -i ' (exist|permission|denied|no .*(such|file))' output &&
e
xit 1
+ $EGREP '(mv|cp|rm|cat|grep|sed|awk): ' output &&
e
xit 1
:
}
:
}
@@
-57,11
+57,10
@@
for target in check recheck test-suite.log; do
test ! -f test-suite.log
done
test ! -f test-suite.log
done
-# Creative quoting below to please maintainer-check.
-echo exit '0' > foo.test
-echo exit '1' > bar.test
+echo 'exit 0' > foo.test
+echo 'exit 1' > bar.test
-$MAKE check &&
E
xit 1
+$MAKE check &&
e
xit 1
chmod a-w .
chmod a-w .
@@
-71,17
+70,16
@@
test -f foo.trs
test -f foo.log
test -f bar.trs
test -f foo.log
test -f bar.trs
-# Creative quoting below to please maintainer-check.
cat > foo.test <<END
echo this is bad
exit 1
END
cat > foo.test <<END
echo this is bad
exit 1
END
-echo
exit '
0' > bar.test
+echo
'exit
0' > bar.test
for target in check recheck test-suite.log; do
make_n_ $target
grep '^:test-result: *FAIL' bar.trs
for target in check recheck test-suite.log; do
make_n_ $target
grep '^:test-result: *FAIL' bar.trs
- grep 'this is bad' foo.log test-suite.log &&
E
xit 1
+ grep 'this is bad' foo.log test-suite.log &&
e
xit 1
: For shells with busted 'set -e'.
done
: For shells with busted 'set -e'.
done
@@
-92,7
+90,7
@@
else
for target in check recheck test-suite.log; do
make_n_ $target
for f in $files; do
for target in check recheck test-suite.log; do
make_n_ $target
for f in $files; do
- test -f $f && test ! -r $f ||
E
xit 1
+ test -f $f && test ! -r $f ||
e
xit 1
done
done
fi
done
done
fi