summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorDavid Allsopp <david.allsopp@metastack.com>2017-08-11 10:43:11 +0100
committerDavid Allsopp <david.allsopp@metastack.com>2017-08-11 11:25:32 +0100
commit28be78fc80f88b03f791fbb15b9fd45d371d767c (patch)
tree8f587c709da46843764facf32068bcebebe747f9 /.gitattributes
parent7d671fc1d1122d35391f5fadc4f586209bbda508 (diff)
downloadocaml-28be78fc80f88b03f791fbb15b9fd45d371d767c.tar.gz
\r testsuite issues on Windows
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes10
1 files changed, 4 insertions, 6 deletions
diff --git a/.gitattributes b/.gitattributes
index da3b3e07e5..84c0627d69 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -131,14 +131,12 @@ manual/tools/htmltbl text eol=lf
manual/tools/htmlthread text eol=lf
manual/tools/texexpand text eol=lf
-# Checking out the parsetree test files with \r\n endings causes all the
-# locations to change, so use \n endings only, even on Windows
+# Tests which include references spanning multiple lines fail with \r\n
+# endings, so use \n endings only, even on Windows.
testsuite/tests/parsing/*.ml text eol=lf
-
-# Similarly, the docstring tests fail for the same reason on Windows
testsuite/tests/docstrings/empty.ml text eol=lf
-
-# And w04.ml
+testsuite/tests/functors/functors.ml.reference text eol=lf
+testsuite/tests/translprim/module_coercion.ml
testsuite/tests/warnings/w04.ml text eol=lf
# These are forced to \n to allow the Cygwin testsuite to pass on a