diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2013-04-18 13:53:21 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2013-04-18 13:53:21 +0000 |
| commit | 9e2b8f8913ee1b80c981948cfac51dc412bf1d84 (patch) | |
| tree | 113781d7b004bab3de778261b251ae666f11ed99 | |
| parent | 012b6a8f1ac575dee54d63f5c9bf390626ae87d4 (diff) | |
Avoid using the --strip-trailing-cr option of "diff" because it is not
supported on BSD.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13560 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | testsuite/tests/tool-ocamldoc/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/testsuite/tests/tool-ocamldoc/Makefile b/testsuite/tests/tool-ocamldoc/Makefile index 04a9fcab7..3912496d0 100644 --- a/testsuite/tests/tool-ocamldoc/Makefile +++ b/testsuite/tests/tool-ocamldoc/Makefile @@ -14,14 +14,11 @@ BASEDIR=../.. CUSTOM_MODULE=odoc_test ADD_COMPFLAGS=-I +ocamldoc -DIFF_OPT=--strip-trailing-cr -#DIFF_OPT=-b - run: $(CUSTOM_MODULE).cmo @for file in t*.ml; do \ printf " ... testing '$$file'"; \ $(OCAMLDOC) -hide-warnings -g $(CUSTOM_MODULE).cmo -o `basename $$file ml`result $$file; \ - $(DIFF) $(DIFF_OPT) `basename $$file ml`reference `basename $$file ml`result > /dev/null && echo " => passed" || (echo " => failed" && exit 1); \ + tr -d '\r' < `basename $$file ml`result | $(DIFF) `basename $$file ml`reference - > /dev/null && echo " => passed" || (echo " => failed" && exit 1); \ done; @$(OCAMLDOC) -hide-warnings -html t*.ml 2>&1 | grep -v test_types_display || true @$(OCAMLDOC) -hide-warnings -latex t*.ml 2>&1 | grep -v test_types_display || true |