fate: allow specifying the tool to use for fate (avconv / ffmpeg)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/2/head
Michael Niedermayer 14 years ago
parent d27dc69bc6
commit 6ae356c9a0
  1. 6
      tests/Makefile
  2. 3
      tests/fate-run.sh

@ -91,11 +91,13 @@ endif
FATE_UTILS = base64 tiny_psnr FATE_UTILS = base64 tiny_psnr
TOOL = avconv
fate: $(FATE) fate: $(FATE)
$(FATE): avconv$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) $(FATE): $(TOOL)$(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)' '$(THREAD_TYPE)' $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(TOOL)'
fate-list: fate-list:
@printf '%s\n' $(sort $(FATE)) @printf '%s\n' $(sort $(FATE))

@ -17,6 +17,7 @@ ref=${7:-"${base}/ref/fate/${test}"}
fuzz=$8 fuzz=$8
threads=${9:-1} threads=${9:-1}
thread_type=${10:-3} thread_type=${10:-3}
tool=$11
outdir="tests/data/fate" outdir="tests/data/fate"
outfile="${outdir}/${test}" outfile="${outdir}/${test}"
@ -50,7 +51,7 @@ run(){
} }
avconv(){ avconv(){
run avconv -v 0 -threads $threads -thread_type $thread_type "$@" run $tool -v 0 -threads $threads -thread_type $thread_type "$@"
} }
framecrc(){ framecrc(){

Loading…
Cancel
Save