From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 21 May 2013 22:09:30 +0000 (+0200)
Subject: Merge branch 'micro' into maint
X-Git-Tag: v1.13b~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d56c0f3b5973e386c3e5f0fb2367d2fff00bf71;p=thirdparty%2Fautomake.git

Merge branch 'micro' into maint

* micro:
  tests: run_make: options to do command redirection
  tests: only activate 'unset' alias if required
  tests: better idiom to override make macro defs on the cmdline
  test-lib: minor style changes
  test-lib: fix botched function name in an error message

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

4d56c0f3b5973e386c3e5f0fb2367d2fff00bf71
diff --cc t/instdir-ltlib.sh
index 273206cba,0299d5a6a..4b54cab43
--- a/t/instdir-ltlib.sh
+++ b/t/instdir-ltlib.sh
@@@ -66,31 -67,18 +66,17 @@@ cd buil
  ../configure --prefix="$instdir" PYTHON="echo" \
               am_cv_python_pythondir="$instdir/python" \
               am_cv_python_pyexecdir="$instdir/pyexec"
- xMAKE ()
- {
-   # Early line break here to please maintainer-check.
-   $MAKE \
-     bindir= libdir= pyexecdir= \
-     AM_MAKEFLAGS='bindir= libdir= pyexecdir=' \
-     "$@"
- }
 -$MAKE
  
- xMAKE
+ nukedirs='bindir= libdir= pyexecdir='
  
- xMAKE install
+ run_make $nukedirs install
  test ! -e "$instdir"
- xMAKE install DESTDIR="$destdir"
+ run_make $nukedirs install DESTDIR="$destdir"
  test ! -e "$instdir"
  test ! -e "$destdir"
- xMAKE uninstall > stdout || { cat stdout; exit 1; }
+ run_make $nukedirs uninstall > stdout || { cat stdout; exit 1; }
  cat stdout
- # Creative quoting below to please maintainer-check.
- grep 'rm'' ' stdout && exit 1
- xMAKE uninstall DESTDIR="$destdir" > stdout || { cat stdout; exit 1; }
- cat stdout
- # Creative quoting below to please maintainer-check.
- grep 'rm'' ' stdout && exit 1
- 
- $MAKE
+ grep 'rm -f' stdout && exit 1
+ run_make $nukedirs uninstall DESTDIR="$destdir"
  
  :
diff --cc t/instdir-prog.sh
index f2b96b8ee,2c57157a9..b5a8addca
--- a/t/instdir-prog.sh
+++ b/t/instdir-prog.sh
@@@ -65,28 -66,17 +65,16 @@@ cd buil
  ../configure --prefix="$instdir" PYTHON="echo" \
               am_cv_python_pythondir="$instdir/python" \
               am_cv_python_pyexecdir="$instdir/pyexec"
 -$MAKE
  
- xMAKE ()
- {
-   # Early line break here to please maintainer-check.
-   $MAKE \
-     bindir= libdir= pyexecdir= \
-     AM_MAKEFLAGS='bindir= libdir= pyexecdir=' \
-     "$@"
- }
+ nukedirs='bindir= libdir= pyexecdir='
  
- xMAKE
- 
- xMAKE install
+ run_make $nukedirs install
  test ! -e "$instdir"
- xMAKE install DESTDIR="$destdir"
+ run_make $nukedirs install DESTDIR="$destdir"
  test ! -e "$instdir"
  test ! -e "$destdir"
- xMAKE uninstall > stdout || { cat stdout; exit 1; }
- cat stdout
- # Creative quoting below to please maintainer-check.
- grep 'rm'' ' stdout && exit 1
- xMAKE uninstall DESTDIR="$destdir" > stdout || { cat stdout; exit 1; }
+ run_make $nukedirs uninstall > stdout \
+   || { cat stdout; exit 1; }
  cat stdout
  # Creative quoting below to please maintainer-check.
  grep 'rm'' ' stdout && exit 1