summaryrefslogtreecommitdiff
path: root/test/scalatest
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2008-01-23 16:13:27 +0000
committerMartin Odersky <odersky@gmail.com>2008-01-23 16:13:27 +0000
commit0dd548a5ea3f076ed639e565589d592ba588a388 (patch)
tree889cea678726ccf7227118bc13923a2cc87c7cfa /test/scalatest
parent628029724b6ebc987aa38d80d72e061d52f5c66d (diff)
downloadscala-0dd548a5ea3f076ed639e565589d592ba588a388.tar.gz
scala-0dd548a5ea3f076ed639e565589d592ba588a388.tar.bz2
scala-0dd548a5ea3f076ed639e565589d592ba588a388.zip
lifts synchronized when target is MSIL; ignore ...
lifts synchronized when target is MSIL; ignore CR's in scalatest diffs.
Diffstat (limited to 'test/scalatest')
-rwxr-xr-xtest/scalatest2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/scalatest b/test/scalatest
index b0e2048594..0c200f40c7 100755
--- a/test/scalatest
+++ b/test/scalatest
@@ -711,7 +711,7 @@ esac;
case "$UNAME" in
CYGWIN* ) DIFF="diff --text --strip-trailing-cr";;
- * ) DIFF="diff";;
+ * ) DIFF="diff --strip-trailing-cr";;
esac;
while [ $# -gt 0 ]; do