Browse Source

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer 13 years ago
parent
commit
6ae356c9a0
2 changed files with 6 additions and 3 deletions
  1. 4 2
      tests/Makefile
  2. 2 1
      tests/fate-run.sh

+ 4 - 2
tests/Makefile

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

+ 2 - 1
tests/fate-run.sh

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