diff options
Diffstat (limited to 't/distcheck-outdated-m4.sh')
| -rw-r--r-- | t/distcheck-outdated-m4.sh | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/t/distcheck-outdated-m4.sh b/t/distcheck-outdated-m4.sh index f237c6116..a1bbb8cea 100644 --- a/t/distcheck-outdated-m4.sh +++ b/t/distcheck-outdated-m4.sh @@ -60,9 +60,7 @@ $MAKE distcheck # Sanity check. check_no_spurious_error () { $EGREP -i 'mkdir:|:.*(permission|denied)' output && exit 1 - # On failure, some make implementations (such as Solaris make) print the - # whole failed recipe on stdout. The first grep works around this. - grep -v 'rm -rf ' output | grep -i 'autom4te.*\.cache' && exit 1 + grep -i 'autom4te.*\.cache' output && exit 1 : To placate 'set -e'. } @@ -88,7 +86,6 @@ $EGREP " (foo|bar).m4" output && exit 1 # Now we again use '--install' explicitly, and "make distcheck" # should pass. $ACLOCAL -I m4 --install -using_gmake || $MAKE Makefile $MAKE distcheck # Similar to what have been done above, but this time we: @@ -108,7 +105,6 @@ ACLOCAL_PATH="$cwd/pth"; export ACLOCAL_PATH # The explicit use of '--install' here won't help when the installed file # '.m4' will become out-of-date w.r.t. the one in the system acdir. $ACLOCAL -I m4 --install -using_gmake || $MAKE Makefile $MAKE distcheck # Only increase serial number, without changing the other contents; this @@ -128,7 +124,6 @@ $EGREP " (foo|bar|baz).m4" output && exit 1 # Now we again use '--install' explicitly, and "make distcheck" # should pass. $ACLOCAL -I m4 --install -using_gmake || $MAKE Makefile $MAKE distcheck : |