diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2017-08-29 13:09:37 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2017-08-29 13:09:37 +0200 |
| commit | 799d17738ebbae30a007b308998a669a9139cf1d (patch) | |
| tree | 9a10365b80b5320938c0a7ef1e6e392b49f52fb4 | |
| parent | ef0450ded84d0fc27b5051baf94acfb6e541a7bf (diff) | |
| parent | af6a390219de9eb1a91ffd9f5ca15a2d2253e978 (diff) | |
Merge PR #985: Fix coqdoc test-suite target on Windows.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | test-suite/Makefile | 4 | ||||
| -rw-r--r-- | tools/coqdoc/index.ml | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 5ee2f3f77..36536ec96 100644 --- a/.gitignore +++ b/.gitignore @@ -86,6 +86,7 @@ test-suite/coq-makefile/plugin-reach-outside-API-and-fail/_CoqProject test-suite/coq-makefile/plugin-reach-outside-API-and-succeed-by-bypassing-the-API/_CoqProject test-suite/coqdoc/Coqdoc.* test-suite/coqdoc/index.html +test-suite/coqdoc/coqdoc.css # documentation diff --git a/test-suite/Makefile b/test-suite/Makefile index 1268ed14b..78d90aad8 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"; \ diff --git a/tools/coqdoc/index.ml b/tools/coqdoc/index.ml index 8ba615670..1bbf76490 100644 --- a/tools/coqdoc/index.ml +++ b/tools/coqdoc/index.ml @@ -117,7 +117,7 @@ let find_module m = if Hashtbl.mem local_modules m then Local else - try External (Filename.concat (find_external_library m) m) + try External (find_external_library m ^ "/" ^ m) with Not_found -> Unknown |