Browse code

regtest: simplify cleanup after each test

Originally committed as revision 24396 to svn://svn.ffmpeg.org/ffmpeg/trunk

Måns Rullgård authored on 2010/07/22 05:49:41
Showing 4 changed files
... ...
@@ -358,5 +358,3 @@ do_audio_enc_dec wav dbl pcm_f64le
358 358
 do_audio_enc_dec wav s16 pcm_zork
359 359
 do_audio_enc_dec 302 s16 pcm_s24daud "-ac 6 -ar 96000"
360 360
 fi
361
-
362
-rm -f "$bench" "$bench2"
... ...
@@ -226,5 +226,3 @@ for pix_fmt in $conversions ; do
226 226
                     -f rawvideo -s 352x288 -pix_fmt yuv444p
227 227
 done
228 228
 fi
229
-
230
-rm -f "$bench" "$bench2"
... ...
@@ -97,5 +97,3 @@ fi
97 97
 # TODO: add tests for
98 98
 # direct rendering,
99 99
 # chains with feedback loops
100
-
101
-rm -f "$bench" "$bench2"
... ...
@@ -34,6 +34,9 @@ pcm_ref="$datadir/$test_ref.ref.wav"
34 34
 crcfile="$datadir/$this.crc"
35 35
 target_crcfile="$target_datadir/$this.crc"
36 36
 
37
+cleanfiles="$raw_dst $pcm_dst $crcfile $bench $bench2"
38
+trap 'rm -f -- $cleanfiles' EXIT
39
+
37 40
 mkdir -p "$datadir"
38 41
 mkdir -p "$outfile"
39 42
 mkdir -p "$logdir"
... ...
@@ -89,7 +92,6 @@ do_ffmpeg_crc()
89 89
     $echov $ffmpeg $FFMPEG_OPTS $* -f crc "$target_crcfile"
90 90
     $ffmpeg $FFMPEG_OPTS $* -f crc "$target_crcfile"
91 91
     echo "$f $(cat $crcfile)" >> $logfile
92
-    rm -f "$crcfile"
93 92
 }
94 93
 
95 94
 do_ffmpeg_nocheck()
... ...
@@ -105,7 +107,6 @@ do_ffmpeg_nocheck()
105 105
 do_video_decoding()
106 106
 {
107 107
     do_ffmpeg $raw_dst $1 -i $target_path/$file -f rawvideo $2
108
-    rm -f $raw_dst
109 108
 }
110 109
 
111 110
 do_video_encoding()