diff options
| author | Alexander Strasser <eclipse7@gmx.net> | 2012-07-27 00:41:36 +0200 |
|---|---|---|
| committer | Alexander Strasser <eclipse7@gmx.net> | 2012-08-04 09:49:30 +0200 |
| commit | 56977eefd8c5d5fa1ee824f08c2ff42d022941b9 (patch) | |
| tree | c3f3ebf84ff93b502248dc9b35baf6eb9c08aec4 /tests | |
| parent | 878b3f2a2416c87fd14ecc4a4c4fac6a4b70bb5d (diff) | |
| download | ffmpeg-56977eefd8c5d5fa1ee824f08c2ff42d022941b9.tar.gz | |
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
63dcd16 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: Alexander Strasser <eclipse7@gmx.net>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 8 | ||||
| -rw-r--r-- | tests/fate/probe.mak | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/Makefile b/tests/Makefile index ee16d25097..5eef779d61 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -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 diff --git a/tests/fate/probe.mak b/tests/fate/probe.mak index f054d3a482..033b484ae0 100644 --- a/tests/fate/probe.mak +++ b/tests/fate/probe.mak @@ -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) |