From 11e33402ca0ed949241133aef1959f8d937982a5 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Mon, 14 May 2012 22:31:08 +0100 Subject: fate: use standard diff options diff -w is not a standard option. This fixes the reference files to match what the tests actually output and switches to using the standard diff -b which is sufficient to handle different line ending styles. Signed-off-by: Mans Rullgard --- tests/fate-run.sh | 2 +- tests/ref/fate/crc | 8 ++++---- tests/ref/lavf/pam | 2 +- tests/ref/vsynth1/cljr | 2 +- tests/ref/vsynth1/dnxhd_720p_10bit | 2 +- tests/ref/vsynth1/error | 2 +- tests/ref/vsynth1/ffvhuff | 2 +- tests/ref/vsynth2/cljr | 2 +- tests/ref/vsynth2/dnxhd_720p_10bit | 2 +- tests/ref/vsynth2/error | 2 +- tests/ref/vsynth2/ffvhuff | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tests') diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 636fc2d599..a933fa1ab7 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -157,7 +157,7 @@ fi if test -e "$ref" || test $cmp = "oneline" ; then case $cmp in - diff) diff -u -w "$ref" "$outfile" >$cmpfile ;; + diff) diff -u -b "$ref" "$outfile" >$cmpfile ;; oneoff) oneoff "$ref" "$outfile" >$cmpfile ;; stddev) stddev "$ref" "$outfile" >$cmpfile ;; oneline)oneline "$ref" "$outfile" >$cmpfile ;; diff --git a/tests/ref/fate/crc b/tests/ref/fate/crc index 4a82680490..1c24aea74a 100644 --- a/tests/ref/fate/crc +++ b/tests/ref/fate/crc @@ -1,4 +1,4 @@ -crc EDB88320 =3D5CDD04 -crc 04C11DB7 =E0BAF5C0 -crc 00008005 =BB1F -crc 00000007 =E3 +crc EDB88320 = 3D5CDD04 +crc 04C11DB7 = E0BAF5C0 +crc 00008005 = BB1F +crc 00000007 = E3 diff --git a/tests/ref/lavf/pam b/tests/ref/lavf/pam index 972d72825e..e53132a312 100644 --- a/tests/ref/lavf/pam +++ b/tests/ref/lavf/pam @@ -1,3 +1,3 @@ 0dce5565222cf0f8b309467f279aecd2 *./tests/data/images/pam/02.pam ./tests/data/images/pam/%02d.pam CRC=0x6da01946 - 304191 ./tests/data/images/pam/02.pam +304191 ./tests/data/images/pam/02.pam diff --git a/tests/ref/vsynth1/cljr b/tests/ref/vsynth1/cljr index 4978344bd3..4eb6483fed 100644 --- a/tests/ref/vsynth1/cljr +++ b/tests/ref/vsynth1/cljr @@ -1,4 +1,4 @@ b4d3d31da0b4b6873ad8239d113c91d2 *./tests/data/vsynth1/cljr.avi - 5075660 ./tests/data/vsynth1/cljr.avi +5075660 ./tests/data/vsynth1/cljr.avi 4debaab994c2c7273bebaa0c5733017b *./tests/data/cljr.vsynth1.out.yuv stddev: 30.75 PSNR: 18.37 MAXDIFF: 225 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/dnxhd_720p_10bit b/tests/ref/vsynth1/dnxhd_720p_10bit index ad97b66b7d..499714c80b 100644 --- a/tests/ref/vsynth1/dnxhd_720p_10bit +++ b/tests/ref/vsynth1/dnxhd_720p_10bit @@ -1,4 +1,4 @@ b5e24a055af02edec8674333260214fd *./tests/data/vsynth1/dnxhd-720p-10bit.dnxhd - 2293760 ./tests/data/vsynth1/dnxhd-720p-10bit.dnxhd +2293760 ./tests/data/vsynth1/dnxhd-720p-10bit.dnxhd 4466ff3d73d01bbe75ea25001d379b63 *./tests/data/dnxhd_720p_10bit.vsynth1.out.yuv stddev: 6.27 PSNR: 32.18 MAXDIFF: 64 bytes: 760320/ 7603200 diff --git a/tests/ref/vsynth1/error b/tests/ref/vsynth1/error index bc24d5b2af..4d1e9e5b0c 100644 --- a/tests/ref/vsynth1/error +++ b/tests/ref/vsynth1/error @@ -1,4 +1,4 @@ 7416dfd319f04044d4575dc9d1b406e1 *./tests/data/vsynth1/error-mpeg4-adv.avi - 756836 ./tests/data/vsynth1/error-mpeg4-adv.avi +756836 ./tests/data/vsynth1/error-mpeg4-adv.avi 79e94ba32b37759397362cbcb479d4d3 *./tests/data/error.vsynth1.out.yuv stddev: 18.36 PSNR: 22.85 MAXDIFF: 243 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/ffvhuff b/tests/ref/vsynth1/ffvhuff index 4a1ebdb1a3..e1aad33f71 100644 --- a/tests/ref/vsynth1/ffvhuff +++ b/tests/ref/vsynth1/ffvhuff @@ -1,4 +1,4 @@ da0c0bd12ac141c976ffa6a71832ab4b *./tests/data/vsynth1/ffvhuff.avi - 5987208 ./tests/data/vsynth1/ffvhuff.avi +5987208 ./tests/data/vsynth1/ffvhuff.avi c5ccac874dbf808e9088bc3107860042 *./tests/data/ffvhuff.vsynth1.out.yuv stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/cljr b/tests/ref/vsynth2/cljr index 562f35fa22..f920b7a67a 100644 --- a/tests/ref/vsynth2/cljr +++ b/tests/ref/vsynth2/cljr @@ -1,4 +1,4 @@ 416ddcf73d2d993456f3c49f3eed4f1a *./tests/data/vsynth2/cljr.avi - 5075660 ./tests/data/vsynth2/cljr.avi +5075660 ./tests/data/vsynth2/cljr.avi 3a70ba2a535ef9c7fc6478b27a2cb58a *./tests/data/cljr.vsynth2.out.yuv stddev: 10.48 PSNR: 27.72 MAXDIFF: 64 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/dnxhd_720p_10bit b/tests/ref/vsynth2/dnxhd_720p_10bit index 60c0d84a34..9409e246cf 100644 --- a/tests/ref/vsynth2/dnxhd_720p_10bit +++ b/tests/ref/vsynth2/dnxhd_720p_10bit @@ -1,4 +1,4 @@ 4b57da2c0c1280469ff3579f7151c227 *./tests/data/vsynth2/dnxhd-720p-10bit.dnxhd - 2293760 ./tests/data/vsynth2/dnxhd-720p-10bit.dnxhd +2293760 ./tests/data/vsynth2/dnxhd-720p-10bit.dnxhd 31a6aa8b8702e85fa3b48e73f035c4e4 *./tests/data/dnxhd_720p_10bit.vsynth2.out.yuv stddev: 1.35 PSNR: 45.46 MAXDIFF: 23 bytes: 760320/ 7603200 diff --git a/tests/ref/vsynth2/error b/tests/ref/vsynth2/error index 424c54962b..a6bfcd4fe2 100644 --- a/tests/ref/vsynth2/error +++ b/tests/ref/vsynth2/error @@ -1,4 +1,4 @@ 90e65096aa9ebafa3fe3f44a5a47cdc4 *./tests/data/vsynth2/error-mpeg4-adv.avi - 176588 ./tests/data/vsynth2/error-mpeg4-adv.avi +176588 ./tests/data/vsynth2/error-mpeg4-adv.avi 96baa9e4c24c837a3ba5abd8dd2cdd30 *./tests/data/error.vsynth2.out.yuv stddev: 8.98 PSNR: 29.06 MAXDIFF: 184 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/ffvhuff b/tests/ref/vsynth2/ffvhuff index 47fc6597d7..3a4a89021f 100644 --- a/tests/ref/vsynth2/ffvhuff +++ b/tests/ref/vsynth2/ffvhuff @@ -1,4 +1,4 @@ d31aab445b24f738df45fdd7479d6dd7 *./tests/data/vsynth2/ffvhuff.avi - 4988056 ./tests/data/vsynth2/ffvhuff.avi +4988056 ./tests/data/vsynth2/ffvhuff.avi dde5895817ad9d219f79a52d0bdfb001 *./tests/data/ffvhuff.vsynth2.out.yuv stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 -- cgit v1.2.3