diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-05-08 11:29:09 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-05-09 13:48:58 +0100 |
| commit | d57b43df2e691bc5f32bedf15a7e5bb0e6b84b61 (patch) | |
| tree | 3e66eaf22666860a40b440c2846e8c8f21b94a9c /tests | |
| parent | 6766169c4198031c58a7972604d74947a16b75a7 (diff) | |
| download | ffmpeg-d57b43df2e691bc5f32bedf15a7e5bb0e6b84b61.tar.gz | |
fate: fix dependencies for probe tests
Only the probe tests should depend on avprobe and these should
be enabled only if avprobe is configured.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 2 | ||||
| -rw-r--r-- | tests/fate/probe.mak | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile index c440f04b33..56a8bb7df3 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -119,7 +119,7 @@ FATE_UTILS = base64 tiny_psnr fate: $(FATE) -$(FATE): avconv$(EXESUF) avprobe$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) +$(FATE): avconv$(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)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' diff --git a/tests/fate/probe.mak b/tests/fate/probe.mak index 39068f2d74..77e9943552 100644 --- a/tests/fate/probe.mak +++ b/tests/fate/probe.mak @@ -10,8 +10,9 @@ fate-probe-format-roundup1414: REF = format_name=mpeg FATE_PROBE_FORMAT += fate-probe-format-roundup2015 fate-probe-format-roundup2015: REF = format_name=dv -FATE_TESTS += $(FATE_PROBE_FORMAT) +FATE-$(CONFIG_AVPROBE) += $(FATE_PROBE_FORMAT) fate-probe-format: $(FATE_PROBE_FORMAT) +$(FATE_PROBE_FORMAT): avprobe$(EXESUF) $(FATE_PROBE_FORMAT): CMP = oneline fate-probe-format-%: CMD = probefmt $(SAMPLES)/probe-format/$(@:fate-probe-format-%=%) |