Browse Source

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>
tags/n0.11
Mans Rullgard 13 years ago
parent
commit
d57b43df2e
2 changed files with 3 additions and 2 deletions
  1. +1
    -1
      tests/Makefile
  2. +2
    -1
      tests/fate/probe.mak

+ 1
- 1
tests/Makefile View File

@@ -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)'



+ 2
- 1
tests/fate/probe.mak View File

@@ -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-%=%)

Loading…
Cancel
Save