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 86e565b..1f77ef2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 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
        * lib/tap-driver (get_tap_line): Removed, ...
        (all callers): ... updated to use $parser->next directly instead.

diff --git a/tests/test-driver-strip-vpath.test b/tests/test-driver-strip-vpath.test
index 5b21cc0..7187abb 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 3753bb9..eafc3bf 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