History

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

Ronald S. Bultje committed 15 years ago

Commit 3283f271 parent 70fb0312 files · +4 −3Browse files

Unified · Split

2 files
  1. Makefile +1 −1
  2. tests/fate-run.sh +3 −2
Makefile+1−1
@@ -285,7 +285,7 @@ fate: $(FATE) · 284 unmodified lines
285 285
286$(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF))286$(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
287 @echo "TEST $(@:fate-%=%)"287 @echo "TEST $(@:fate-%=%)"
288 $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)'288 $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)'
289 289
290fate-list:290fate-list:
291 @printf '%s\n' $(sort $(FATE))291 @printf '%s\n' $(sort $(FATE))
tests/fate-run.sh+3−2
@@ -16,6 +16,7 @@ cmp=${6:-diff} · 15 unmodified lines
16ref=${7:-"${base}/ref/fate/${test}"}16ref=${7:-"${base}/ref/fate/${test}"}
17fuzz=$817fuzz=$8
18threads=${9:-1}18threads=${9:-1}
19thread_type=${10:-3}
19 20
20outdir="tests/data/fate"21outdir="tests/data/fate"
21outfile="${outdir}/${test}"22outfile="${outdir}/${test}"
@@ -49,7 +50,7 @@ run(){ · 27 unmodified lines
49}50}
50 51
51ffmpeg(){52ffmpeg(){
52 run ffmpeg -v 0 -threads $threads "$@"53 run ffmpeg -v 0 -threads $threads -thread_type $thread_type "$@"
53}54}
54 55
55framecrc(){56framecrc(){
@@ -78,7 +79,7 @@ regtest(){ · 22 unmodified lines
78 cleanfiles="$cleanfiles $outfile $errfile"79 cleanfiles="$cleanfiles $outfile $errfile"
79 outfile=tests/data/regression/$2/$t80 outfile=tests/data/regression/$2/$t
80 errfile=tests/data/$t.$2.err81 errfile=tests/data/$t.$2.err
81 ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads"82 ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type"
82}83}
83 84
84codectest(){85codectest(){

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t