testsuite: avoid spurious failure if rst2html program is missing

* tests/test-driver-custom-no-html.test: Account for the
possibility of a lacking `rst2html' program in our final
grepping of make output.

diff --git a/ChangeLog b/ChangeLog
index 8b4ab342a302b37a4d088bff4665967ac21b39fc..98ce73e9c4f0204bd67dbdb01ba9a069ccca69b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       testsuite: avoid spurious failure if rst2html program is missing
+       * tests/test-driver-custom-no-html.test: Account for the
+       possibility of a lacking `rst2html' program in our final
+       grepping of make output.
+
 2011-08-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        tap: improve diagnosing and reporting of plan mismatches

diff --git a/tests/test-driver-custom-no-html.test b/tests/test-driver-custom-no-html.test
index 2c86026eca5393b4dc258b8ebacfad4db3e084d6..37b93bc831e9b48b0d2da1363fcdc4f584aaaa2e 100755 (executable)
--- a/tests/test-driver-custom-no-html.test
+++ b/tests/test-driver-custom-no-html.test
@@ -62,6 +62,8 @@ $FGREP 'dummy title' test-suite.log
 # Sanity check: trying to produce HTML output should fail.
 $MAKE check-html >output 2>&1 && { cat output; Exit 1; }
 cat output
-$FGREP SEVERE output
+# The second grep is to avoid spurious failures on systems without
+# a working `rst2html' program.
+$FGREP SEVERE output || $FGREP 'cannot find rst2html' output
 
 :