summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2011-03-22 00:07:54 +0100
committerLuca Barbato <lu_zero@gentoo.org>2011-03-23 01:17:20 +0100
commit7851eb68c60e61497ec715f28f071c1527de1d38 (patch)
treeba61b42a9ca5e5558f5132e1bed3a0d9bb4cab22 /tests
parentee26abf2a4884bb56959bac8215758195776c553 (diff)
fate: add support for multithread testing
Add a THREADS variable to fate calls.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/fate-run.sh5
-rwxr-xr-xtests/regression-funcs.sh3
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index c4a9a13e11..3a6b46b786 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -15,6 +15,7 @@ command=$5
cmp=${6:-diff}
ref=${7:-"${base}/ref/fate/${test}"}
fuzz=$8
+threads=${9:-1}
outdir="tests/data/fate"
outfile="${outdir}/${test}"
@@ -48,7 +49,7 @@ run(){
}
ffmpeg(){
- run ffmpeg -v 0 "$@"
+ run ffmpeg -v 0 -threads $threads "$@"
}
framecrc(){
@@ -77,7 +78,7 @@ regtest(){
cleanfiles="$cleanfiles $outfile $errfile"
outfile=tests/data/regression/$2/$t
errfile=tests/data/$t.$2.err
- ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path"
+ ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads"
}
codectest(){
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index 3ca3c9c77a..148a255556 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -9,6 +9,7 @@ test_ref=$2
raw_src_dir=$3
target_exec=$4
target_path=$5
+threads=${6:-1}
datadir="./tests/data"
target_datadir="${target_path}/${datadir}"
@@ -52,7 +53,7 @@ echov(){
. $(dirname $0)/md5.sh
-FFMPEG_OPTS="-v 0 -y -flags +bitexact -dct fastint -idct simple -sws_flags +accurate_rnd+bitexact"
+FFMPEG_OPTS="-v 0 -threads $threads -y -flags +bitexact -dct fastint -idct simple -sws_flags +accurate_rnd+bitexact"
run_ffmpeg()
{