summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Dan Liew <daniel.liew@imperial.ac.uk>2014-05-11 15:34:42 +0100
committerGravatar Dan Liew <daniel.liew@imperial.ac.uk>2014-05-11 15:34:42 +0100
commit57617e67a31bd8615abd04dd7565000c3d34395a (patch)
tree3535603107e554e9cf4c664fd6d45009a7796381
parentaf063a30fa05405d35aa7d49243cd488d9471b11 (diff)
Made lit tests slightly less fragile under OSX/Linux by passing flags to ignore
DOS line endings and whitespace to diff tool.
-rw-r--r--Test/lit.site.cfg2
1 files changed, 1 insertions, 1 deletions
diff --git a/Test/lit.site.cfg b/Test/lit.site.cfg
index f9bed3c8..e5ac6593 100644
--- a/Test/lit.site.cfg
+++ b/Test/lit.site.cfg
@@ -107,7 +107,7 @@ if not solverFound:
# Add diff tool substitution
diffExecutable = None
if os.name == 'posix':
- diffExecutable = 'diff --unified=3'
+ diffExecutable = 'diff --unified=3 --strip-trailing-cr --ignore-all-space'
elif os.name == 'nt':
diffExecutable = 'fc /W'
else: