[FFmpeg-cvslog] fate: more cases of avconv that should be conditional

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 16 03:38:00 2011 +0200| [091a24b75f44a66aec34ec94161d55681b06efcd] | committer: Michael Niedermayer

fate: more cases of avconv that should be conditional

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=091a24b75f44a66aec34ec94161d55681b06efcd
---

 tests/fate-run.sh         |    2 +-
 tests/regression-funcs.sh |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index c35d0ab..3de097e 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -77,7 +77,7 @@ pcm(){
 regtest(){
     t="${test#$2-}"
     ref=${base}/ref/$2/$t
-    ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type"
+    ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$tool"
 }
 
 codectest(){
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index bba1890..14d4e29 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -10,6 +10,7 @@ raw_src_dir=$3
 target_exec=$4
 target_path=$5
 threads=${6:-1}
+tool=$8
 
 datadir="./tests/data"
 target_datadir="${target_path}/${datadir}"
@@ -18,7 +19,7 @@ this="$test.$test_ref"
 outfile="$datadir/$test_ref/"
 
 # various files
-avconv="$target_exec ${target_path}/avconv"
+avconv="$target_exec ${target_path}/${tool}"
 tiny_psnr="tests/tiny_psnr"
 raw_src="${target_path}/$raw_src_dir/%02d.pgm"
 raw_dst="$datadir/$this.out.yuv"