tests: avoid a spurious failure on MSYS

[platform/upstream/automake.git] / t / distcheck-missing-m4.sh

diff --git a/t/distcheck-missing-m4.sh b/t/distcheck-missing-m4.sh
old mode 100755 (executable)
new mode 100644 (file)
index 051e52d..ee492fd
--- a/t/distcheck-missing-m4.sh
+++ b/t/distcheck-missing-m4.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,11 +18,11 @@
 # missing from the dist tarball (interaction with '--install').
 # See automake bug#9037.
 
-. ./defs || Exit 1
+. test-init.sh
 
 cwd=$(pwd) || fatal_ "cannot get current working directory"
 
-cp "$am_testauxdir"/distcheck-hook-m4.am . \
+cp "$am_testaux_srcdir"/distcheck-hook-m4.am . \
   || fatal_ "cannot fetch makefile fragment 'distcheck-hook-m4.am'"
 
 cat > Makefile.am << 'END'
@@ -60,22 +60,21 @@ ACLOCAL_PATH=$cwd/pth; export ACLOCAL_PATH
 # We don't use '--install' here.  Our distcheck-hook should catch this.
 $ACLOCAL -I m4
 $AUTOCONF
-$EGREP 'MY_(FOO|BAR|BAZ|ZAR)' configure && Exit 1 # Sanity check.
+$EGREP 'MY_(FOO|BAR|BAZ|ZAR)' configure && exit 1 # Sanity check.
 $AUTOMAKE
 
 check_no_spurious_error ()
 {
-  $EGREP -i 'mkdir:|:.*(permission|denied)' output && Exit 1
+  $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 -v 'rm -rf ' output | grep -i 'autom4te.*\.cache' && exit 1
   : To placate 'set -e'.
 }
 
 ./configure
 
-$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
-cat output
+run_make -M -e FAIL distcheck
 for x in bar baz zar; do
   $EGREP "required m4 file.*not distributed.* $x.m4( |$)" output
 done
@@ -98,15 +97,14 @@ MY_BLA
 END
 
 $MAKE
-$EGREP 'MY_(FOO|BAR|BAZ|QUX|ZAR|BLA)' configure && Exit 1 # Sanity check.
+$EGREP 'MY_(FOO|BAR|BAZ|QUX|ZAR|BLA)' configure && exit 1 # Sanity check.
 
-$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
-cat output
+run_make -M -e FAIL distcheck
 $EGREP "required m4 file.*not distributed.* qux.m4( |$)" output
 $EGREP "required m4 file.*not distributed.* bla.m4( |$)" output
 check_no_spurious_error
 # Check that we don't complain for files that should have been found.
-$FGREP " (bar|baz|zar).m4" output && Exit 1
+$FGREP " (bar|baz|zar).m4" output && exit 1
 
 # Now we again use '--install', and "make distcheck" should pass.
 $ACLOCAL -I m4 --install