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 86e565b493c0a54b6472a558f0cae2043f6df746..1f77ef2b40ac0cf92c45f28c3bb6cbec0859890b 100644 (file)
--- 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 5b21cc0ff3d67b6ca6df1c03572e322f2a5c0ab3..7187abba983bc6c74501479e59d3f8d827272470 100755 (executable)
--- 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 3753bb91ad0be706739cd4c94ed7c765c77483ef..eafc3bf88eb3cc81c520b5cc8cce18910004494d 100755 (executable)
--- 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