diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2011-04-20 13:12:38 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-04-21 19:36:45 -0400 |
| commit | 3283f274fdbef16d13df06661cec601e1bc01aab (patch) | |
| tree | 17ab8731db6e198f54fd997bbea4ce2544523145 | |
| parent | 70fb031ce27ce200026de2ea77ec038e2c2e141f (diff) | |
| download | ffmpeg-3283f274fdbef16d13df06661cec601e1bc01aab.tar.gz | |
FATE: allow forcing thread-type when doing threaded fate runs.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | tests/fate-run.sh | 5 |
2 files changed, 4 insertions, 3 deletions
@@ -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 3a6b46b786..366145d22f 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(){ |