From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 12 Aug 2011 21:33:56 +0000 (+0200)
Subject: testsuite: avoid spurious failure if rst2html program is missing
X-Git-Tag: ng-0.5a~89^2~101^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7afca964324add2466d851aa07c3c650f624ed78;p=thirdparty%2Fautomake.git

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 8b4ab342a..98ce73e9c 100644
--- 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 2c86026ec..37b93bc83 100755
--- 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
 
 :