From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 7 Aug 2011 20:50:23 +0000 (+0200)
Subject: testsuite: fix two spurious failures on Solaris make
X-Git-Tag: ng-0.5a~89^2~132^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b7e96983128caec94b256760ae9694c262775988;p=thirdparty%2Fautomake.git

testsuite: fix two spurious failures on Solaris make

* tests/tests-environment-and-log-compiler.test: Do not fail if
"make -n check" fails, as that is issued only for debugging, its
semantics being tested in other test scripts.
* tests/test-driver-strip-vpath.test: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 86e565b49..1f77ef2b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	testsuite: fix two spurious failures on Solaris make
+	* tests/tests-environment-and-log-compiler.test: Do not fail if
+	"make -n check" fails, as that is issued only for debugging, its
+	semantics being tested in other test scripts.
+	* tests/test-driver-strip-vpath.test: Likewise.
+
 2011-08-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	tap driver: refactor and remove dead code
diff --git a/tests/test-driver-strip-vpath.test b/tests/test-driver-strip-vpath.test
index 5b21cc0ff..7187abba9 100755
--- a/tests/test-driver-strip-vpath.test
+++ b/tests/test-driver-strip-vpath.test
@@ -79,7 +79,7 @@ mkdir build1
 cd build1
 ../src/configure
 # "$MAKE -n" is for debugging, should highlight any VPATH rewrite.
-$MAKE -n check
+$MAKE -n check || :
 $MAKE check
 cd ..
 
@@ -87,7 +87,7 @@ mkdir build2
 cd build2
 "$ocwd"/src/configure
 # "$MAKE -n" is for debugging, should highlight any VPATH rewrite.
-$MAKE -n check
+$MAKE -n check || :
 $MAKE check
 cd ..
 
diff --git a/tests/tests-environment-and-log-compiler.test b/tests/tests-environment-and-log-compiler.test
index 3753bb91a..eafc3bf88 100755
--- a/tests/tests-environment-and-log-compiler.test
+++ b/tests/tests-environment-and-log-compiler.test
@@ -65,7 +65,7 @@ $AUTOMAKE -a
 
 ./configure
 
-$MAKE -n check # For debugging.
+$MAKE -n check || : # For debugging.
 VERBOSE=yes $MAKE check
 cat a.log
 cat b.log