From 25ab3ae7a474e4d7f165d62865552359b8773860 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Wed, 18 Dec 2019 03:53:18 +0100 Subject: test: Use diff --strip-trailing-cr to fix tests on windows --- test/signedunsigned1.test | 4 ++-- test/signedunsigned2.test | 7 ++----- test/signedunsigned3.test | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/test/signedunsigned1.test b/test/signedunsigned1.test index dc752df..798de86 100755 --- a/test/signedunsigned1.test +++ b/test/signedunsigned1.test @@ -19,5 +19,5 @@ DATAOUT1=$top_builddir/test/data/$TESTFILE1.bin $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0 $top_builddir/tools/plistutil -i $DATAIN1 -o $DATAOUT1 -diff $DATACMP0 $DATAOUT0 -diff $DATACMP1 $DATAOUT1 +diff --strip-trailing-cr $DATACMP0 $DATAOUT0 +diff --strip-trailing-cr $DATACMP1 $DATAOUT1 diff --git a/test/signedunsigned2.test b/test/signedunsigned2.test index 8ae862c..2ea8b49 100755 --- a/test/signedunsigned2.test +++ b/test/signedunsigned2.test @@ -17,10 +17,7 @@ DATAOUT0=$top_builddir/test/data/$TESTFILE0.bin DATAOUT1=$top_builddir/test/data/$TESTFILE1.bin $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0 -cat $DATAOUT0 - $top_builddir/tools/plistutil -i $DATAIN1 -o $DATAOUT1 -cat $DATAOUT1 -diff $DATACMP0 $DATAOUT0 -diff $DATACMP1 $DATAOUT1 +diff --strip-trailing-cr $DATACMP0 $DATAOUT0 +diff --strip-trailing-cr $DATACMP1 $DATAOUT1 diff --git a/test/signedunsigned3.test b/test/signedunsigned3.test index 9bada3e..d732e72 100755 --- a/test/signedunsigned3.test +++ b/test/signedunsigned3.test @@ -19,5 +19,5 @@ DATAOUT1=$top_builddir/test/data/$TESTFILE1.xml $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0 $top_builddir/tools/plistutil -i $DATAIN1 -o $DATAOUT1 -diff $DATACMP0 $DATAOUT0 -diff $DATACMP1 $DATAOUT1 +diff --strip-trailing-cr $DATACMP0 $DATAOUT0 +diff --strip-trailing-cr $DATACMP1 $DATAOUT1 -- cgit v1.1-32-gdbae