From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 4 Apr 2012 10:03:33 +0000 (+0200)
Subject: [ng] maintcheck: avoid failures due to recent merge
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5edc5fc4b997d2748967a054638ca0190f10be51;p=thirdparty%2Fautomake.git

[ng] maintcheck: avoid failures due to recent merge

* tests/link_cond.test: Avoid using "make -e".
* tests/vala-mix2.test: Do not require GNU make explicitly.

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

diff --git a/tests/link_cond.test b/tests/link_cond.test
index 7b9fd5a3c..6d1761aad 100755
--- a/tests/link_cond.test
+++ b/tests/link_cond.test
@@ -62,11 +62,11 @@ main ()
 END
 
 ./configure have_cxx=no
-CXX=false $MAKE -e
+$MAKE CXX=false
 
 # Sanity check.
 rm -f foo foo.exe
-CC=false $MAKE -e && Exit 99
+$MAKE CC=false && Exit 99
 
 $MAKE distclean
 
@@ -81,10 +81,10 @@ int main (void)
 END
 
 ./configure have_cxx=yes
-CC=false $MAKE -e
+$MAKE CC=false
 
 # Sanity check.
 rm -f foo foo.exe
-CXX=false $MAKE -e && Exit 99
+$MAKE CXX=false && Exit 99
 
 :
diff --git a/tests/vala-mix2.test b/tests/vala-mix2.test
index 516246724..5da56295d 100755
--- a/tests/vala-mix2.test
+++ b/tests/vala-mix2.test
@@ -17,7 +17,7 @@
 # Vala sources, C and C++ sources and C and C++ headers in the same
 # program.  Functional test.  See automake bug#10894.
 
-required='valac cc c++ GNUmake'
+required='valac cc c++'
 . ./defs || Exit 1
 
 cat >> configure.ac <<'END'