Skip to content

Commit

Permalink
fate: do not collect -benchmark output
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
mansr committed May 18, 2011
1 parent a06bf63 commit d4a7df4
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 16 deletions.
1 change: 0 additions & 1 deletion tests/codec-regression.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/lavf-regression.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ do_audio_only()
}

rm -f "$logfile"
rm -f "$benchfile"

if [ -n "$do_avi" ] ; then
do_lavf avi
Expand Down
1 change: 0 additions & 1 deletion tests/lavfi-regression.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ set -e
eval do_$test=y

rm -f "$logfile"
rm -f "$benchfile"

do_video_filter() {
label=$1
Expand Down
17 changes: 4 additions & 13 deletions tests/regression-funcs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -78,25 +75,21 @@ do_ffmpeg()
else
wc -c $f >> $logfile
fi
expr "$(cat $bench)" : '.*utime=\(.*s\)' > $bench2
echo $(cat $bench2) $f >> $benchfile
}

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
$tiny_psnr $f $pcm_ref 2 >> $logfile
else
wc -c $f >> $logfile
fi
expr "$(cat $bench)" : '.*utime=\(.*s\)' > $bench2
echo $(cat $bench2) $f >> $benchfile
}

do_ffmpeg_crc()
Expand All @@ -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()
Expand Down

0 comments on commit d4a7df4

Please sign in to comment.