Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-05-19 16:19:19 +0400
committerMans Rullgard <mans@mansr.com>2012-05-19 17:30:41 +0400
commit63dcd16d567862d94fe4b178e47f440e8ad6a2c9 (patch)
treeb4f7786c2ccf5289dacdb66a1e4071916cad8f94 /tests/Makefile
parent8ccc1c597534ece9f3710a979b8a3fd6e43220a6 (diff)
fate: fix dependencies on SAMPLES being set
This allows fate to run without errors with or without SAMPLES being set. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'tests/Makefile')
-rw-r--r--tests/Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/Makefile b/tests/Makefile
index 1c8d4b6e05..55e8867d4e 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -80,14 +80,18 @@ FATE = $(FATE_ACODEC) \
$(FATE_SEEK) \
FATE_AVCONV += $(FATE_AVCONV-yes)
+FATE-$(CONFIG_AVCONV) += $(FATE_AVCONV)
FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC)
FATE-$(CONFIG_AVFILTER) += $(FATE_LAVFI)
+FATE_SAMPLES-$(CONFIG_AVCONV) += $(FATE_SAMPLES_AVCONV)
+FATE_SAMPLES += $(FATE_SAMPLES-yes)
+
FATE += $(FATE-yes)
FATE += $(FATE_LIBAVUTIL)
-$(FATE_AVCONV): avconv$(EXESUF)
+$(FATE_AVCONV) $(FATE_SAMPLES_AVCONV): avconv$(EXESUF)
$(filter-out %-aref,$(FATE_ACODEC)): $(AREF)
$(filter-out %-vref,$(FATE_VSYNTH1)): fate-vsynth1-vref
@@ -111,14 +115,14 @@ fate-lavfi: $(FATE_LAVFI)
fate-seek: $(FATE_SEEK)
ifdef SAMPLES
-FATE += $(FATE_AVCONV)
+FATE += $(FATE_SAMPLES)
fate-rsync:
rsync -vaLW rsync://fate-suite.libav.org/fate-suite/ $(SAMPLES)
else
fate-rsync:
@echo "use 'make fate-rsync SAMPLES=/path/to/samples' to sync the fate suite"
-$(FATE_TESTS):
- @echo "SAMPLES not specified, cannot run FATE"
+$(FATE_SAMPLES):
+ @echo "$@ requires external samples and SAMPLES not specified"; false
endif
FATE_UTILS = base64 tiny_psnr