regtest: simplify cleanup after each test

Originally committed as revision 24396 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2010-07-21 20:49:41 +00:00
parent 157c924176
commit a4e6fa86ce
4 changed files with 3 additions and 8 deletions

View File

@ -358,5 +358,3 @@ do_audio_enc_dec wav dbl pcm_f64le
do_audio_enc_dec wav s16 pcm_zork
do_audio_enc_dec 302 s16 pcm_s24daud "-ac 6 -ar 96000"
fi
rm -f "$bench" "$bench2"

View File

@ -226,5 +226,3 @@ for pix_fmt in $conversions ; do
-f rawvideo -s 352x288 -pix_fmt yuv444p
done
fi
rm -f "$bench" "$bench2"

View File

@ -97,5 +97,3 @@ fi
# TODO: add tests for
# direct rendering,
# chains with feedback loops
rm -f "$bench" "$bench2"

View File

@ -34,6 +34,9 @@ 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"
trap 'rm -f -- $cleanfiles' EXIT
mkdir -p "$datadir"
mkdir -p "$outfile"
mkdir -p "$logdir"
@ -89,7 +92,6 @@ do_ffmpeg_crc()
$echov $ffmpeg $FFMPEG_OPTS $* -f crc "$target_crcfile"
$ffmpeg $FFMPEG_OPTS $* -f crc "$target_crcfile"
echo "$f $(cat $crcfile)" >> $logfile
rm -f "$crcfile"
}
do_ffmpeg_nocheck()
@ -105,7 +107,6 @@ do_ffmpeg_nocheck()
do_video_decoding()
{
do_ffmpeg $raw_dst $1 -i $target_path/$file -f rawvideo $2
rm -f $raw_dst
}
do_video_encoding()