[FFmpeg-cvslog] fate: use diff -b in oneline comparison

Mans Rullgard git at videolan.org
Wed May 16 02:30:47 CEST 2012


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Tue May 15 11:52:28 2012 +0100| [0ff0af731ce4544f84b2f748dcc699717a2df8d6] | committer: Mans Rullgard

fate: use diff -b in oneline comparison

This is simpler and should take care of any problems with mixed
line ending styles.

Signed-off-by: Mans Rullgard <mans at mansr.com>

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

 tests/fate-run.sh |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index a45e9a9..636fc2d 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -61,9 +61,7 @@ stddev(){
 }
 
 oneline(){
-    val=$(cat "$2")
-    test x"$val" = x"$1" || { r=$?; printf -- '-%s\n+%s\n' "$ref" "$val"; }
-    return ${r:-0}
+    printf '%s\n' "$1" | diff -u -b - "$2"
 }
 
 run(){



More information about the ffmpeg-cvslog mailing list