diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-15 23:11:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-15 23:11:46 +0200 |
| commit | 6ae356c9a0987d56f60137f9784afcb3a9303037 (patch) | |
| tree | ad61e3917b8afc36b3e2f34ade01e77a5770086a /tests | |
| parent | d27dc69bc67a1e49df08e3a414b18cef04889618 (diff) | |
| download | ffmpeg-6ae356c9a0987d56f60137f9784afcb3a9303037.tar.gz | |
fate: allow specifying the tool to use for fate (avconv / ffmpeg)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 6 | ||||
| -rwxr-xr-x | tests/fate-run.sh | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/Makefile b/tests/Makefile index 9debd5c9b2..2b717d60f7 100644 --- a/tests/Makefile +++ b/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)) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index f623eecae6..ef0550df6a 100755 --- a/tests/fate-run.sh +++ b/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(){ |