[FFmpeg-cvslog] fate: Force diff into text mode

Michael Niedermayer git at videolan.org
Wed Sep 4 01:14:35 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep  3 23:54:01 2013 +0200| [b78e75ebc9b03bea8f0c48da266ee6cc0fb8e22d] | committer: Michael Niedermayer

fate: Force diff into text mode

On openbsd the exif-image-jpg test fails but diff treats the files as
binary due to some non ascii symbols in them. This should force it to
treat them as text, which should result in more informative output

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b78e75ebc9b03bea8f0c48da266ee6cc0fb8e22d
---

 tests/fate-run.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 52ddc22..71eff80 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -225,7 +225,7 @@ fi
 
 if test -e "$ref" || test $cmp = "oneline" ; then
     case $cmp in
-        diff)   diff -u -b "$ref" "$outfile"            >$cmpfile ;;
+        diff)   diff -u -a -b "$ref" "$outfile"         >$cmpfile ;;
         oneoff) oneoff     "$ref" "$outfile"            >$cmpfile ;;
         stddev) stddev     "$ref" "$outfile"            >$cmpfile ;;
         oneline)oneline    "$ref" "$outfile"            >$cmpfile ;;



More information about the ffmpeg-cvslog mailing list