From d0e9cd18c7bc7777d18b8cff00ab55191283783e Mon Sep 17 00:00:00 2001
From: Tommy Sparber <tommy@sparber.net>
Date: Fri, 30 Oct 2015 11:44:48 +1100
Subject: [PATCH] doxygen regression test: Tolerate only warning-free builds

This commit simplifies the regression test for the doxygen build to
allow only 0 warnings.

Clean doxygen.runlog and doxygen.runerr for clean target
and ignore them in .gitignore.
---
 .gitignore                                 |  2 ++
 regression-tests/00-doxygen/Makefile       | 13 ++++++++-----
 regression-tests/00-doxygen/doxyerrors.cnt |  1 -
 3 files changed, 10 insertions(+), 6 deletions(-)
 delete mode 100644 regression-tests/00-doxygen/doxyerrors.cnt

diff --git a/.gitignore b/.gitignore
index 88fae42fc..e74d14e4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,8 @@
 *.report
 summary
 *.summary
+*.runerr
+*.runlog
 *.faillog
 *.orig
 *~
diff --git a/regression-tests/00-doxygen/Makefile b/regression-tests/00-doxygen/Makefile
index 17313aef4..86196d6bf 100644
--- a/regression-tests/00-doxygen/Makefile
+++ b/regression-tests/00-doxygen/Makefile
@@ -33,22 +33,25 @@ doxygen:
 	@make -C $(DOCDIR) doxygen.log 2> doxygen.runerr > doxygen.runlog
 
 summary: doxygen
-	@( doxyerr=`cat doxyerrors.cnt`; curerr=`cat $(DOCDIR)/doxygen.log | grep ": warning: " | wc -l` ; delta=`expr $$curerr - $$doxyerr`;  \
-		if [ $$delta -lt 0 ] ; then  echo "doxygen: FAIL ಠ_ಠ\nCongratulations you fixed `expr $$delta \"*\" -1 ` of doxyen's warnings (old: $$doxyerr new: $$curerr). Please adjust regression-tests/00-doxygen/doxyerrors.cnt accordingly." > summary; fi ;\
-		if [ $$delta -gt 0 ] ; then  echo "doxygen: FAIL ಠ_ಠ\nYou increased the number of warnings caused by doxygen by $$delta (old: $$doxyerr new: $$curerr). Please fix these." > summary; fi ; \
-		if [ $$delta -eq 0 ] ; then  echo "doxygen: OK\nDoxygen found $$doxyerr errors" > summary ; fi ; \
+	@( \
+		1> summary; \
 		if [ -s doxygen.runerr ] ; then \
+			echo "doxygen: FAIL ಠ_ಠ\nDoxygen caused some runtime warnings. Please fix these." >> summary; \
 			echo "Runtime warnings:" >> summary; \
 			cat doxygen.runerr >> summary; \
 			echo >> summary; \
 		fi ; \
 		if [ -s $(DOCDIR)/doxygen.log ] ; then \
+			echo "doxygen: FAIL ಠ_ಠ\nDoxygen caused some warnings. Please fix these." >> summary; \
 			echo "Warnings:" >> summary; \
 			cat $(DOCDIR)/doxygen.log >> summary; \
 		fi ; \
+		if [ ! -s summary ] ; then \
+			echo "doxygen: OK\nDoxygen found no warnings" >> summary; \
+		fi ; \
 		cat summary \
 	)
 
-
 clean:
+	@rm -f summary doxygen.runlog doxygen.runerr
 	@make -C $(DOCDIR) clean
diff --git a/regression-tests/00-doxygen/doxyerrors.cnt b/regression-tests/00-doxygen/doxyerrors.cnt
deleted file mode 100644
index 405e2afe8..000000000
--- a/regression-tests/00-doxygen/doxyerrors.cnt
+++ /dev/null
@@ -1 +0,0 @@
-134