From 7d9c243af47af824671943e667a90b4955e44983 Mon Sep 17 00:00:00 2001
From: Ronald S. Bultje <rbultje@google.com>
Date: Wed, 20 Apr 2011 13:12:38 -0400
Subject: [PATCH 1/2] FATE: allow forcing thread-type when doing threaded fate
 runs.

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

diff --git a/Makefile b/Makefile
index 0bf04d1..8e25359 100644
--- a/Makefile
+++ b/Makefile
@@ -284,7 +284,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..6d83e77 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:-0}
 
 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(){
-- 
1.7.4.4