From 7810a65de4899ef3c6489fb30cc2458c24c25ca8 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 14 May 2013 15:50:12 +0200
Subject: [PATCH] tests: less uses of "make -e"; avoid spurious failures in
 'check-cc-no-c-o'

That is, when the testsuite is run using a fake C compiler that doesn't
grasp the '-c' and '-o' options together.

* t/instdir-prog.sh: Adjust.
* t/instdir-ltlib.sh: Likewise.
* t/python-virtualenv.sh: Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---
 t/instdir-ltlib.sh     | 23 ++++++++++++++++-------
 t/instdir-prog.sh      | 22 +++++++++++++++-------
 t/python-virtualenv.sh |  9 ++++-----
 3 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/t/instdir-ltlib.sh b/t/instdir-ltlib.sh
index 726f809..273206c 100755
--- a/t/instdir-ltlib.sh
+++ b/t/instdir-ltlib.sh
@@ -66,22 +66,31 @@ cd build
 ../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=' \
+    "$@"
+}
+
+xMAKE
 
-bindir= libdir= pyexecdir=
-export bindir libdir pyexecdir
-$MAKE -e install
+xMAKE install
 test ! -e "$instdir"
-$MAKE -e install DESTDIR="$destdir"
+xMAKE install DESTDIR="$destdir"
 test ! -e "$instdir"
 test ! -e "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; exit 1; }
+xMAKE uninstall > stdout || { cat stdout; exit 1; }
 cat stdout
 # Creative quoting below to please maintainer-check.
 grep 'rm'' ' stdout && exit 1
-$MAKE -e uninstall DESTDIR="$destdir" > stdout || { cat 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
+
 :
diff --git a/t/instdir-prog.sh b/t/instdir-prog.sh
index f916a11..f2b96b8 100755
--- a/t/instdir-prog.sh
+++ b/t/instdir-prog.sh
@@ -65,20 +65,28 @@ cd build
 ../configure --prefix="$instdir" PYTHON="echo" \
              am_cv_python_pythondir="$instdir/python" \
              am_cv_python_pyexecdir="$instdir/pyexec"
-$MAKE
 
-bindir= libdir= pyexecdir=
-export bindir libdir pyexecdir
-$MAKE -e install
+xMAKE ()
+{
+  # Early line break here to please maintainer-check.
+  $MAKE \
+    bindir= libdir= pyexecdir= \
+    AM_MAKEFLAGS='bindir= libdir= pyexecdir=' \
+    "$@"
+}
+
+xMAKE
+
+xMAKE install
 test ! -e "$instdir"
-$MAKE -e install DESTDIR="$destdir"
+xMAKE install DESTDIR="$destdir"
 test ! -e "$instdir"
 test ! -e "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; exit 1; }
+xMAKE uninstall > stdout || { cat stdout; exit 1; }
 cat stdout
 # Creative quoting below to please maintainer-check.
 grep 'rm'' ' stdout && exit 1
-$MAKE -e uninstall DESTDIR="$destdir" > stdout || { cat 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
diff --git a/t/python-virtualenv.sh b/t/python-virtualenv.sh
index a67e7c2..faf1d5a 100755
--- a/t/python-virtualenv.sh
+++ b/t/python-virtualenv.sh
@@ -178,13 +178,12 @@ $MAKE distclean
 
 # Overriding pythondir and pyexecdir at make time should be enough.
 ./configure --prefix="$cwd/bad-prefix"
-pythondir=$py_site pyexecdir=$py_site
-export pythondir pyexecdir
-check_install -e
+check_install pythondir="$py_site" pyexecdir="$py_site" \
+              AM_MAKEFLAGS="pythondir='$py_site' pyexecdir='$py_site'"
 test ! -e bad-prefix
 $MAKE test-run
-check_uninstall -e
-unset pythondir pyexecdir
+check_uninstall pythondir="$py_site" pyexecdir="$py_site" \
+                AM_MAKEFLAGS="pythondir='$py_site' pyexecdir='$py_site'"
 
 # Also check that the distribution is self-contained, for completeness.
 $MAKE distcheck
-- 
2.7.4