diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-16 03:38:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-16 03:38:00 +0200 |
| commit | 091a24b75f44a66aec34ec94161d55681b06efcd (patch) | |
| tree | c9debd2c3573ad0f80500f9cb0bc837030663fc2 /tests | |
| parent | 6322bc0b906350a49fdb73defbf179e06b10335e (diff) | |
| download | ffmpeg-091a24b75f44a66aec34ec94161d55681b06efcd.tar.gz | |
fate: more cases of avconv that should be conditional
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/fate-run.sh | 2 | ||||
| -rwxr-xr-x | 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 c35d0abadd..3de097e515 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 bba189092b..14d4e29bf9 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" |