aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2007-01-09 07:40:00 +0000
committerfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2007-01-09 07:40:00 +0000
commit46580147a5e4590e87bfe5e9b0f4c3ff50e59821 (patch)
tree8f71f94a0a384ae42cdc6aa1f6b9d82c92895baf
parentedfac2b4915bae0fd253cef9a5c3f558f1d98556 (diff)
downloadpandoc-46580147a5e4590e87bfe5e9b0f4c3ff50e59821.tar.gz
Reverted r471. My alternative to --strip-trailing-cr didn't
work. This only affects the test target on systems without GNU diff (rare), so I'm not too worried about it. git-svn-id: https://pandoc.googlecode.com/svn/trunk@480 788f1e2b-df1e-0410-8736-df70ead52e1b
-rw-r--r--tests/runtests.pl3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 6292f4962..754b6e75e 100644
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -23,8 +23,7 @@ sub test_results
my $testname = $_[0];
my $output = $_[1];
my $norm = $_[2];
- $output =~ s/\r$//; # remove DOS line endings if present
- my $diffoutput = `diff $output $norm`;
+ my $diffoutput = `diff --strip-trailing-cr $output $norm`;
if ($diffoutput eq "")
{
print "PASSED\n";