summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-03-09 10:56:54 +0100
committerAnton Khirnov <anton@khirnov.net>2015-03-10 07:40:11 +0100
commit96a06dbaf278e8152487e08772946f63bd2a3843 (patch)
treedbb48ec08f094393891980ca9b5ad4900a8da411 /tests
parentdc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56 (diff)
FATE: add support for testing hwaccels
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile2
-rwxr-xr-xtests/fate-run.sh3
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile
index 13a91b14c3..ed341010a2 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -143,7 +143,7 @@ fate: $(FATE)
$(FATE): $(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)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)'
+ $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)' '$(HWACCEL)'
fate-list:
@printf '%s\n' $(sort $(FATE))
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index f8de18290e..790a4d1283 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -23,6 +23,7 @@ cmp_target=${13:-0}
size_tolerance=${14:-0}
cmp_unit=${15:-2}
gen=${16:-no}
+hwaccel=${17:-none}
outdir="tests/data/fate"
outfile="${outdir}/${test}"
@@ -76,7 +77,7 @@ probefmt(){
}
avconv(){
- dec_opts="-threads $threads -thread_type $thread_type"
+ dec_opts="-hwaccel $hwaccel -threads $threads -thread_type $thread_type"
avconv_args="-nostats -cpuflags $cpuflags"
for arg in $@; do
[ x${arg} = x-i ] && avconv_args="${avconv_args} ${dec_opts}"