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

Merge branch 'micro' into maint

* micro:
  tests: remove some code duplication
  cosmetics: remove a couple of extra whitespaces in tests
  tests: two minor fixups
---

8d7108702485dca61841a642202b892f8038e15c
diff --cc t/instdir-ltlib.sh
index 4b54cab43,526e29cdf..92e844089
--- a/t/instdir-ltlib.sh
+++ b/t/instdir-ltlib.sh
@@@ -66,17 -67,9 +66,8 @@@ cd buil
  ../configure --prefix="$instdir" PYTHON="echo" \
               am_cv_python_pythondir="$instdir/python" \
               am_cv_python_pyexecdir="$instdir/pyexec"
 -$MAKE
  
- nukedirs='bindir= libdir= pyexecdir='
- 
- run_make $nukedirs install
- test ! -e "$instdir"
- run_make $nukedirs install DESTDIR="$destdir"
- test ! -e "$instdir"
- test ! -e "$destdir"
- run_make $nukedirs uninstall > stdout || { cat stdout; exit 1; }
- cat stdout
- grep 'rm -f' stdout && exit 1
- run_make $nukedirs uninstall DESTDIR="$destdir"
+ nulldirs='bindir= libdir= pyexecdir='
+ null_install
  
  :
diff --cc t/instdir-prog.sh
index b5a8addca,26e6c42fe..73296f5ee
--- a/t/instdir-prog.sh
+++ b/t/instdir-prog.sh
@@@ -65,20 -66,9 +65,8 @@@ cd buil
  ../configure --prefix="$instdir" PYTHON="echo" \
               am_cv_python_pythondir="$instdir/python" \
               am_cv_python_pyexecdir="$instdir/pyexec"
 -$MAKE
  
- nukedirs='bindir= libdir= pyexecdir='
- 
- run_make $nukedirs install
- test ! -e "$instdir"
- run_make $nukedirs install DESTDIR="$destdir"
- test ! -e "$instdir"
- test ! -e "$destdir"
- run_make $nukedirs uninstall > stdout \
-   || { cat stdout; exit 1; }
- cat stdout
- # Creative quoting below to please maintainer-check.
- grep 'rm'' ' stdout && exit 1
- run_make $nukedirs uninstall DESTDIR="$destdir" > stdout \
-   || { cat stdout; exit 1; }
+ nulldirs='bindir= libdir= pyexecdir='
+ null_install
  
  :