From 7db02b704b9b99e364d23f5ac4ed24594a31f88e Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Mon, 21 Aug 2017 15:30:48 +0200
Subject: Fix coqdoc test-suite target on Windows.

Commit 8f12597 introduced new output tests but these were broken on Windows.
We fix them by using --strip-trailing-cr option of diff, like in other
output tests in the test-suite.
---
 test-suite/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test-suite/Makefile b/test-suite/Makefile
index 1268ed14bc..78d90aad81 100644
--- a/test-suite/Makefile
+++ b/test-suite/Makefile
@@ -528,8 +528,8 @@ $(addsuffix .log,$(wildcard coqdoc/*.v)): %.v.log: %.v %.html.out %.tex.out $(PR
 	  f=`basename $*`; \
 	  $(coqdoc) -R . Coqdoc -coqlib http://coq.inria.fr/stdlib --html $$f.v; \
 	  $(coqdoc) -R . Coqdoc -coqlib http://coq.inria.fr/stdlib --latex $$f.v; \
-	  diff -u $$f.html.out Coqdoc.$$f.html 2>&1; R=$$?; times; \
-	  grep -v "^%%" Coqdoc.$$f.tex | diff -u $$f.tex.out - 2>&1; S=$$?; times; \
+	  diff -u --strip-trailing-cr $$f.html.out Coqdoc.$$f.html 2>&1; R=$$?; times; \
+	  grep -v "^%%" Coqdoc.$$f.tex | diff -u --strip-trailing-cr $$f.tex.out - 2>&1; S=$$?; times; \
 	  if [ $$R = 0 -a $$S = 0 ]; then \
 	    echo $(log_success); \
 	    echo "    $<...Ok"; \
-- 
cgit v1.2.3