[FFmpeg-cvslog] fate: do not collect -benchmark output

[Mans Rullgard]

ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Wed May 18 15:05:26 2011 +0100| [d4a7df423c7eda78185d79fb81ffe36b3d4253c4] | committer: Mans Rullgard

fate: do not collect -benchmark output

The old regtest scripts pass -benchmark and collect the utime values.
As these values are never used, this machinery can be removed.

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

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

 tests/codec-regression.sh |    1 -
 tests/lavf-regression.sh  |    1 -
 tests/lavfi-regression.sh |    1 -
 tests/regression-funcs.sh |   17 ++++-------------
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
index 9b2aa63..335e1f7 100755
--- a/tests/codec-regression.sh
+++ b/tests/codec-regression.sh
@@ -12,7 +12,6 @@ set -e
 eval do_$test=y
 
 rm -f "$logfile"
-rm -f "$benchfile"
 
 # generate reference for quality check
 if [ -n "$do_vref" ]; then
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index 28f53f7..32d92de 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -44,7 +44,6 @@ do_audio_only()
 }
 
 rm -f "$logfile"
-rm -f "$benchfile"
 
 if [ -n "$do_avi" ] ; then
 do_lavf avi
diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh
index 1798819..b2a195a 100755
--- a/tests/lavfi-regression.sh
+++ b/tests/lavfi-regression.sh
@@ -12,7 +12,6 @@ set -e
 eval do_$test=y
 
 rm -f "$logfile"
-rm -f "$benchfile"
 
 do_video_filter() {
     label=$1
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index 0e4ea44..035cbdb 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -23,9 +23,6 @@ errfile="$datadir/$this.err"
 # various files
 ffmpeg="$target_exec ${target_path}/ffmpeg"
 tiny_psnr="tests/tiny_psnr"
-benchfile="$datadir/$this.bench"
-bench="$datadir/$this.bench.tmp"
-bench2="$datadir/$this.bench2.tmp"
 raw_src="${target_path}/$raw_src_dir/%02d.pgm"
 raw_dst="$datadir/$this.out.yuv"
 raw_ref="$datadir/$test_ref.ref.yuv"
@@ -35,7 +32,7 @@ pcm_ref="$datadir/$test_ref.ref.wav"
 crcfile="$datadir/$this.crc"
 target_crcfile="$target_datadir/$this.crc"
 
-cleanfiles="$raw_dst $pcm_dst $crcfile $bench $bench2"
+cleanfiles="$raw_dst $pcm_dst $crcfile"
 trap 'rm -f -- $cleanfiles' EXIT
 
 mkdir -p "$datadir"
@@ -69,7 +66,7 @@ do_ffmpeg()
     f="$1"
     shift
     set -- $* ${target_path}/$f
-    run_ffmpeg -benchmark $* > $bench
+    run_ffmpeg $*
     do_md5sum $f >> $logfile
     if [ $f = $raw_dst ] ; then
         $tiny_psnr $f $raw_ref >> $logfile
@@ -78,8 +75,6 @@ do_ffmpeg()
     else
         wc -c $f >> $logfile
     fi
-    expr "$(cat $bench)" : '.*utime=\(.*s\)' > $bench2
-    echo $(cat $bench2) $f >> $benchfile
 }
 
 do_ffmpeg_nomd5()
@@ -87,7 +82,7 @@ do_ffmpeg_nomd5()
     f="$1"
     shift
     set -- $* ${target_path}/$f
-    run_ffmpeg -benchmark $* > $bench
+    run_ffmpeg $*
     if [ $f = $raw_dst ] ; then
         $tiny_psnr $f $raw_ref >> $logfile
     elif [ $f = $pcm_dst ] ; then
@@ -95,8 +90,6 @@ do_ffmpeg_nomd5()
     else
         wc -c $f >> $logfile
     fi
-    expr "$(cat $bench)" : '.*utime=\(.*s\)' > $bench2
-    echo $(cat $bench2) $f >> $benchfile
 }
 
 do_ffmpeg_crc()
@@ -111,9 +104,7 @@ do_ffmpeg_nocheck()
 {
     f="$1"
     shift
-    run_ffmpeg -benchmark $* > $bench
-    expr "$(cat $bench)" : '.*utime=\(.*s\)' > $bench2
-    echo $(cat $bench2) $f >> $benchfile
+    run_ffmpeg $*
 }
 
 do_video_decoding()