highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fate: do not collect -benchmark output

Browse Source 
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>
This commit is contained in:
Mans Rullgard 2011-05-18 15:05:26 +01:00
parent a06bf6368b
commit d4a7df423c
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/codec-regression.sh
View File

@ -12,7 +12,6 @@ set -e
eval do_$test=y eval do_$test=y
rm -f "$logfile" rm -f "$logfile"
rm -f "$benchfile"
# generate reference for quality check # generate reference for quality check
if [ -n "$do_vref" ]; then if [ -n "$do_vref" ]; then

1
tests/lavf-regression.sh
View File

@ -44,7 +44,6 @@ do_audio_only()
} }
rm -f "$logfile" rm -f "$logfile"
rm -f "$benchfile"
if [ -n "$do_avi" ] ; then if [ -n "$do_avi" ] ; then
do_lavf avi do_lavf avi

1
tests/lavfi-regression.sh
View File

@ -12,7 +12,6 @@ set -e
eval do_$test=y eval do_$test=y
rm -f "$logfile" rm -f "$logfile"
rm -f "$benchfile"
do_video_filter() { do_video_filter() {
label=$1 label=$1

17
tests/regression-funcs.sh
View File

@ -23,9 +23,6 @@ errfile="$datadir/$this.err"
# various files # various files
ffmpeg="$target_exec ${target_path}/ffmpeg" ffmpeg="$target_exec ${target_path}/ffmpeg"
tiny_psnr="tests/tiny_psnr" 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_src="${target_path}/$raw_src_dir/%02d.pgm"
raw_dst="$datadir/$this.out.yuv" raw_dst="$datadir/$this.out.yuv"
raw_ref="$datadir/$test_ref.ref.yuv" raw_ref="$datadir/$test_ref.ref.yuv"
@ -35,7 +32,7 @@ pcm_ref="$datadir/$test_ref.ref.wav"
crcfile="$datadir/$this.crc" crcfile="$datadir/$this.crc"
target_crcfile="$target_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 trap 'rm -f -- $cleanfiles' EXIT
mkdir -p "$datadir" mkdir -p "$datadir"
@ -69,7 +66,7 @@ do_ffmpeg()
f="$1" f="$1"
shift shift
set -- $* ${target_path}/$f set -- $* ${target_path}/$f
run_ffmpeg -benchmark $* > $bench run_ffmpeg $*
do_md5sum $f >> $logfile do_md5sum $f >> $logfile
if [ $f = $raw_dst ] ; then if [ $f = $raw_dst ] ; then
$tiny_psnr $f $raw_ref >> $logfile $tiny_psnr $f $raw_ref >> $logfile
@ -78,8 +75,6 @@ do_ffmpeg()
else else
wc -c $f >> $logfile wc -c $f >> $logfile
fi fi
expr "$(cat $bench)" : '.*utime=\(.*s\)' > $bench2
echo $(cat $bench2) $f >> $benchfile
} }
do_ffmpeg_nomd5() do_ffmpeg_nomd5()
@ -87,7 +82,7 @@ do_ffmpeg_nomd5()
f="$1" f="$1"
shift shift
set -- $* ${target_path}/$f set -- $* ${target_path}/$f
run_ffmpeg -benchmark $* > $bench run_ffmpeg $*
if [ $f = $raw_dst ] ; then if [ $f = $raw_dst ] ; then
$tiny_psnr $f $raw_ref >> $logfile $tiny_psnr $f $raw_ref >> $logfile
elif [ $f = $pcm_dst ] ; then elif [ $f = $pcm_dst ] ; then
@ -95,8 +90,6 @@ do_ffmpeg_nomd5()
else else
wc -c $f >> $logfile wc -c $f >> $logfile
fi fi
expr "$(cat $bench)" : '.*utime=\(.*s\)' > $bench2
echo $(cat $bench2) $f >> $benchfile
} }
do_ffmpeg_crc() do_ffmpeg_crc()
@ -111,9 +104,7 @@ do_ffmpeg_nocheck()
{ {
f="$1" f="$1"
shift shift
run_ffmpeg -benchmark $* > $bench run_ffmpeg $*
expr "$(cat $bench)" : '.*utime=\(.*s\)' > $bench2
echo $(cat $bench2) $f >> $benchfile
} }
do_video_decoding() do_video_decoding()