diff options
| author | 2019-12-18 03:53:18 +0100 | |
|---|---|---|
| committer | 2019-12-18 03:53:18 +0100 | |
| commit | 25ab3ae7a474e4d7f165d62865552359b8773860 (patch) | |
| tree | 7b41de3a7713c8bd3f497a1a4d30b72278c5c8ce | |
| parent | ba52a043997efd69d0423080638e01fe7f88d9cd (diff) | |
| download | libplist-25ab3ae7a474e4d7f165d62865552359b8773860.tar.gz libplist-25ab3ae7a474e4d7f165d62865552359b8773860.tar.bz2 | |
test: Use diff --strip-trailing-cr to fix tests on windows
| -rwxr-xr-x | test/signedunsigned1.test | 4 | ||||
| -rwxr-xr-x | test/signedunsigned2.test | 7 | ||||
| -rwxr-xr-x | 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 | |||
| 19 | $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0 | 19 | $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0 |
| 20 | $top_builddir/tools/plistutil -i $DATAIN1 -o $DATAOUT1 | 20 | $top_builddir/tools/plistutil -i $DATAIN1 -o $DATAOUT1 |
| 21 | 21 | ||
| 22 | diff $DATACMP0 $DATAOUT0 | 22 | diff --strip-trailing-cr $DATACMP0 $DATAOUT0 |
| 23 | diff $DATACMP1 $DATAOUT1 | 23 | 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 | |||
| 17 | DATAOUT1=$top_builddir/test/data/$TESTFILE1.bin | 17 | DATAOUT1=$top_builddir/test/data/$TESTFILE1.bin |
| 18 | 18 | ||
| 19 | $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0 | 19 | $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0 |
| 20 | cat $DATAOUT0 | ||
| 21 | |||
| 22 | $top_builddir/tools/plistutil -i $DATAIN1 -o $DATAOUT1 | 20 | $top_builddir/tools/plistutil -i $DATAIN1 -o $DATAOUT1 |
| 23 | cat $DATAOUT1 | ||
| 24 | 21 | ||
| 25 | diff $DATACMP0 $DATAOUT0 | 22 | diff --strip-trailing-cr $DATACMP0 $DATAOUT0 |
| 26 | diff $DATACMP1 $DATAOUT1 | 23 | 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 | |||
| 19 | $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0 | 19 | $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0 |
| 20 | $top_builddir/tools/plistutil -i $DATAIN1 -o $DATAOUT1 | 20 | $top_builddir/tools/plistutil -i $DATAIN1 -o $DATAOUT1 |
| 21 | 21 | ||
| 22 | diff $DATACMP0 $DATAOUT0 | 22 | diff --strip-trailing-cr $DATACMP0 $DATAOUT0 |
| 23 | diff $DATACMP1 $DATAOUT1 | 23 | diff --strip-trailing-cr $DATACMP1 $DATAOUT1 |
