test: Use diff --strip-trailing-cr to fix tests on windows

libimobiledevice · Dec 18, 2019 · 4c573c1 · 4c573c1
1 parent ba52a04
commit 4c573c1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git 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 $DATAOUT1
diff --git 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
@@ -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