[FFmpeg-cvslog] r24396 - in trunk/tests: codec-regression.sh lavf-regression.sh lavfi-regression.sh regression-funcs.sh
mru
subversion
Wed Jul 21 22:49:41 CEST 2010
Author: mru
Date: Wed Jul 21 22:49:41 2010
New Revision: 24396
Log:
regtest: simplify cleanup after each test
Modified:
trunk/tests/codec-regression.sh
trunk/tests/lavf-regression.sh
trunk/tests/lavfi-regression.sh
trunk/tests/regression-funcs.sh
Modified: trunk/tests/codec-regression.sh
==============================================================================
--- trunk/tests/codec-regression.sh Wed Jul 21 22:49:36 2010 (r24395)
+++ trunk/tests/codec-regression.sh Wed Jul 21 22:49:41 2010 (r24396)
@@ -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"
Modified: trunk/tests/lavf-regression.sh
==============================================================================
--- trunk/tests/lavf-regression.sh Wed Jul 21 22:49:36 2010 (r24395)
+++ trunk/tests/lavf-regression.sh Wed Jul 21 22:49:41 2010 (r24396)
@@ -226,5 +226,3 @@ for pix_fmt in $conversions ; do
-f rawvideo -s 352x288 -pix_fmt yuv444p
done
fi
-
-rm -f "$bench" "$bench2"
Modified: trunk/tests/lavfi-regression.sh
==============================================================================
--- trunk/tests/lavfi-regression.sh Wed Jul 21 22:49:36 2010 (r24395)
+++ trunk/tests/lavfi-regression.sh Wed Jul 21 22:49:41 2010 (r24396)
@@ -97,5 +97,3 @@ fi
# TODO: add tests for
# direct rendering,
# chains with feedback loops
-
-rm -f "$bench" "$bench2"
Modified: trunk/tests/regression-funcs.sh
==============================================================================
--- trunk/tests/regression-funcs.sh Wed Jul 21 22:49:36 2010 (r24395)
+++ trunk/tests/regression-funcs.sh Wed Jul 21 22:49:41 2010 (r24396)
@@ -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()
More information about the ffmpeg-cvslog
mailing list