RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-19 21:36:54 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Ronald S. Bultje 2011-04-20 13:12:38 -04:00 committed by Ronald S. Bultje
parent 70fb031ce2
commit 3283f274fd
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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))

5
tests/fate-run.sh
View File

@ -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(){
} }
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(){
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(){