fate: allow specifying the tool to use for fate (avconv / ffmpeg)
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Aug 2011 21:11:46 +0000 (23:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Aug 2011 21:11:46 +0000 (23:11 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tests/Makefile
tests/fate-run.sh

index 9debd5c..2b717d6 100644 (file)
@@ -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))
index f623eec..ef0550d 100755 (executable)
@@ -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(){