Commit 3283f274 authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by Ronald S. Bultje

FATE: allow forcing thread-type when doing threaded fate runs.

Signed-off-by: 's avatarRonald S. Bultje <rsbultje@gmail.com>
parent 70fb031c
...@@ -285,7 +285,7 @@ fate: $(FATE) ...@@ -285,7 +285,7 @@ fate: $(FATE)
$(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) $(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
@echo "TEST $(@:fate-%=%)" @echo "TEST $(@:fate-%=%)"
$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)'
fate-list: fate-list:
@printf '%s\n' $(sort $(FATE)) @printf '%s\n' $(sort $(FATE))
......
...@@ -16,6 +16,7 @@ cmp=${6:-diff} ...@@ -16,6 +16,7 @@ cmp=${6:-diff}
ref=${7:-"${base}/ref/fate/${test}"} ref=${7:-"${base}/ref/fate/${test}"}
fuzz=$8 fuzz=$8
threads=${9:-1} threads=${9:-1}
thread_type=${10:-3}
outdir="tests/data/fate" outdir="tests/data/fate"
outfile="${outdir}/${test}" outfile="${outdir}/${test}"
...@@ -49,7 +50,7 @@ run(){ ...@@ -49,7 +50,7 @@ run(){
} }
ffmpeg(){ ffmpeg(){
run ffmpeg -v 0 -threads $threads "$@" run ffmpeg -v 0 -threads $threads -thread_type $thread_type "$@"
} }
framecrc(){ framecrc(){
...@@ -78,7 +79,7 @@ regtest(){ ...@@ -78,7 +79,7 @@ regtest(){
cleanfiles="$cleanfiles $outfile $errfile" cleanfiles="$cleanfiles $outfile $errfile"
outfile=tests/data/regression/$2/$t outfile=tests/data/regression/$2/$t
errfile=tests/data/$t.$2.err errfile=tests/data/$t.$2.err
${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type"
} }
codectest(){ codectest(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment