1. ffmpeg
  2. Commit d4a7df423c7eda78185d79fb81ffe36b3d4253c4
Browse code

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@mansr.com>

Mans Rullgard authored on 2011/05/18 23:05:26
Showing 4 changed files
tests/codec-regression.sh
History View file @ d4a7df4
... ... 
@@ -12,7 +12,6 @@ set -e
12 12 
 eval do_$test=y
13 13
14 14 
 rm -f "$logfile"
15 
-rm -f "$benchfile"
16 15
17 16 
 # generate reference for quality check
18 17 
 if [ -n "$do_vref" ]; then
tests/lavf-regression.sh
History View file @ d4a7df4
... ... 
@@ -44,7 +44,6 @@ do_audio_only()
44 44 
 }
45 45
46 46 
 rm -f "$logfile"
47 
-rm -f "$benchfile"
48 47
49 48 
 if [ -n "$do_avi" ] ; then
50 49 
 do_lavf avi
tests/lavfi-regression.sh
History View file @ d4a7df4
... ... 
@@ -12,7 +12,6 @@ set -e
12 12 
 eval do_$test=y
13 13
14 14 
 rm -f "$logfile"
15 
-rm -f "$benchfile"
16 15
17 16 
 do_video_filter() {
18 17 
     label=$1
tests/regression-funcs.sh
History View file @ d4a7df4
... ... 
@@ -23,9 +23,6 @@ errfile="$datadir/$this.err"
23 23 
 # various files
24 24 
 ffmpeg="$target_exec ${target_path}/ffmpeg"
25 25 
 tiny_psnr="tests/tiny_psnr"
26 
-benchfile="$datadir/$this.bench"
27 
-bench="$datadir/$this.bench.tmp"
28 
-bench2="$datadir/$this.bench2.tmp"
29 26 
 raw_src="${target_path}/$raw_src_dir/%02d.pgm"
30 27 
 raw_dst="$datadir/$this.out.yuv"
31 28 
 raw_ref="$datadir/$test_ref.ref.yuv"
... ... 
@@ -35,7 +32,7 @@ pcm_ref="$datadir/$test_ref.ref.wav"
35 35 
 crcfile="$datadir/$this.crc"
36 36 
 target_crcfile="$target_datadir/$this.crc"
37 37
38 
-cleanfiles="$raw_dst $pcm_dst $crcfile $bench $bench2"
38 
+cleanfiles="$raw_dst $pcm_dst $crcfile"
39 39 
 trap 'rm -f -- $cleanfiles' EXIT
40 40
41 41 
 mkdir -p "$datadir"
... ... 
@@ -69,7 +66,7 @@ do_ffmpeg()
69 69 
     f="$1"
70 70 
     shift
71 71 
     set -- $* ${target_path}/$f
72 
-    run_ffmpeg -benchmark $* > $bench
72 
+    run_ffmpeg $*
73 73 
     do_md5sum $f >> $logfile
74 74 
     if [ $f = $raw_dst ] ; then
75 75 
         $tiny_psnr $f $raw_ref >> $logfile
... ... 
@@ -78,8 +75,6 @@ do_ffmpeg()
78 78 
     else
79 79 
         wc -c $f >> $logfile
80 80 
     fi
81 
-    expr "$(cat $bench)" : '.*utime=\(.*s\)' > $bench2
82 
-    echo $(cat $bench2) $f >> $benchfile
83 81 
 }
84 82
85 83 
 do_ffmpeg_nomd5()
... ... 
@@ -87,7 +82,7 @@ do_ffmpeg_nomd5()
87 87 
     f="$1"
88 88 
     shift
89 89 
     set -- $* ${target_path}/$f
90 
-    run_ffmpeg -benchmark $* > $bench
90 
+    run_ffmpeg $*
91 91 
     if [ $f = $raw_dst ] ; then
92 92 
         $tiny_psnr $f $raw_ref >> $logfile
93 93 
     elif [ $f = $pcm_dst ] ; then
... ... 
@@ -95,8 +90,6 @@ do_ffmpeg_nomd5()
95 95 
     else
96 96 
         wc -c $f >> $logfile
97 97 
     fi
98 
-    expr "$(cat $bench)" : '.*utime=\(.*s\)' > $bench2
99 
-    echo $(cat $bench2) $f >> $benchfile
100 98 
 }
101 99
102 100 
 do_ffmpeg_crc()
... ... 
@@ -111,9 +104,7 @@ do_ffmpeg_nocheck()
111 111 
 {
112 112 
     f="$1"
113 113 
     shift
114 
-    run_ffmpeg -benchmark $* > $bench
115 
-    expr "$(cat $bench)" : '.*utime=\(.*s\)' > $bench2
116 
-    echo $(cat $bench2) $f >> $benchfile
114 
+    run_ffmpeg $*
117 115 
 }
118 116
119 117 
 do_video_decoding()