[FFmpeg-cvslog] FATE: allow forcing thread-type when doing threaded fate runs.

Ronald S. Bultje git at videolan.org
Fri Apr 22 03:58:45 CEST 2011


ffmpeg | branch: master | Ronald S. Bultje <rbultje at google.com> | Wed Apr 20 13:12:38 2011 -0400| [3283f274fdbef16d13df06661cec601e1bc01aab] | committer: Ronald S. Bultje

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

Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3283f274fdbef16d13df06661cec601e1bc01aab
---

 Makefile          |    2 +-
 tests/fate-run.sh |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index f8e68d6..0849443 100644
--- a/Makefile
+++ b/Makefile
@@ -285,7 +285,7 @@ fate: $(FATE)
 
 $(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
 	@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:
 	@printf '%s\n' $(sort $(FATE))
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 3a6b46b..366145d 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -16,6 +16,7 @@ cmp=${6:-diff}
 ref=${7:-"${base}/ref/fate/${test}"}
 fuzz=$8
 threads=${9:-1}
+thread_type=${10:-3}
 
 outdir="tests/data/fate"
 outfile="${outdir}/${test}"
@@ -49,7 +50,7 @@ run(){
 }
 
 ffmpeg(){
-    run ffmpeg -v 0 -threads $threads "$@"
+    run ffmpeg -v 0 -threads $threads -thread_type $thread_type "$@"
 }
 
 framecrc(){
@@ -78,7 +79,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" "$threads"
+    ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type"
 }
 
 codectest(){



More information about the ffmpeg-cvslog mailing list