diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-07-24 17:13:32 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-07-24 17:13:32 +0000 |
| commit | 8fae6e7c11c0453e96b9fa2b39e4b3c9e08842ae (patch) | |
| tree | b8bdc20993729b52189f976a3f3f8b3c4833ea77 /tests | |
| parent | 63e1278d8842ce85cfe8998f5f3d9971e6bce4d5 (diff) | |
| download | ffmpeg-8fae6e7c11c0453e96b9fa2b39e4b3c9e08842ae.tar.gz | |
Unbreak parallel lavfi testing
Originally committed as revision 24485 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/fate-run.sh | 2 | ||||
| -rwxr-xr-x | tests/lavfi-regression.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index adcbabc3a7..623709f03e 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -78,7 +78,7 @@ lavftest(){ } lavfitest(){ - cleanfiles="tests/data/lavfi/*" + cleanfiles="tests/data/lavfi/${test#lavfi-}.nut" regtest lavfi lavfi tests/vsynth1 } diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index dbc986c406..c20f427f6f 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -89,8 +89,10 @@ fi if [ -n "$do_pixdesc_be" ] || [ -n "$do_pixdesc_le" ]; then pix_fmts="$($ffmpeg -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^IO' | cut -d' ' -f2)" for pix_fmt in $pix_fmts; do - do_video_encoding "lavfi_pixdesc-${pix_fmt}.nut" "" \ + output=lavfi_pixdesc-${pix_fmt}.nut + do_video_encoding $output "" \ "-vf slicify=random,format=$pix_fmt,pixdesctest -vcodec rawvideo -pix_fmt $pix_fmt" + rm ${outfile}${output} done fi |