Commit 56977eef authored by Alexander Strasser's avatar Alexander Strasser

fate: Rename FATE_SAMPLES make file variable to FATE_EXTERN

  Restore functionality to set the samples directory via the
FATE_SAMPLES environment variable . This is broken since commit
63dcd16d was merged.

  Additionally the name FATE_EXTERN is more suited as the current
FATE_SAMPLES make file variable does not carry the name of the
FATE samples or the name of the directory they are stored in, but
does contain the names of the FATE targets that need external
samples. That is samples that are not in the repository and are
not generated on the fly.
Signed-off-by: 's avatarAlexander Strasser <eclipse7@gmx.net>
parent 878b3f2a
......@@ -97,8 +97,8 @@ FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG)
FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC)
FATE_SAMPLES-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG)
FATE_SAMPLES += $(FATE_SAMPLES-yes)
FATE_EXTERN-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG)
FATE_EXTERN += $(FATE_EXTERN-yes)
FATE += $(FATE-yes)
FATE += $(FATE_LIBAVUTIL)
......@@ -122,7 +122,7 @@ fate-seek: $(FATE_SEEK)
ifdef SAMPLES
FATE += $(FATE_LAVF_FATE)
FATE += $(FATE_FULL) $(FATE_FULL-yes)
FATE += $(FATE_SAMPLES)
FATE += $(FATE_EXTERN)
fate-rsync:
rsync -vaLW --timeout=60 --contimeout=60 rsync://fate-suite.ffmpeg.org/fate-suite/ $(SAMPLES)
else
......@@ -130,7 +130,7 @@ fate::
@echo "warning: only a subset of the fate tests will be run because SAMPLES is not specified"
fate-rsync:
@echo "use 'make fate-rsync SAMPLES=/path/to/samples' to sync the fate suite"
$(FATE_SAMPLES):
$(FATE_EXTERN):
@echo "$@ requires external samples and SAMPLES not specified"; false
endif
......
......@@ -10,7 +10,7 @@ fate-probe-format-roundup1414: REF = mpeg
FATE_PROBE_FORMAT += fate-probe-format-roundup2015
fate-probe-format-roundup2015: REF = dv
FATE_SAMPLES-$(CONFIG_FFPROBE) += $(FATE_PROBE_FORMAT)
FATE_EXTERN-$(CONFIG_FFPROBE) += $(FATE_PROBE_FORMAT)
fate-probe-format: $(FATE_PROBE_FORMAT)
$(FATE_PROBE_FORMAT): ffprobe$(EXESUF)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment