Merge commit 'bd392785a75d7d51414a9788d50396a8d9f29d77'

* commit 'bd392785a75d7d51414a9788d50396a8d9f29d77':
  fate-run: Drop unnecessary regtest() indirection

Conflicts:
	tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-08 14:21:39 +02:00
commit 63208c034b

View File

@ -146,18 +146,16 @@ enc_dec(){
tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift
}
regtest(){
t="${test#$2-}"
ref=${base}/ref/$2/$t
${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags" "$samples"
}
lavffatetest(){
regtest lavf lavf-fate tests/vsynth1
t="${test#lavf-fate-}"
ref=${base}/ref/lavf-fate/$t
${base}/lavf-regression.sh $t lavf-fate tests/vsynth1 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags" "$samples"
}
lavftest(){
regtest lavf lavf tests/vsynth1
t="${test#lavf-}"
ref=${base}/ref/lavf/$t
${base}/lavf-regression.sh $t lavf tests/vsynth1 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags" "$samples"
}
video_filter(){