diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-20 00:25:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-20 10:21:52 +0200 |
| commit | 31f3c94760b42e16e998dcc0b34e677d1aa431bc (patch) | |
| tree | 8a6033e5163bd038ea8ba5629233e7567e57d4ae /tests/Makefile | |
| parent | d1384c00d4882712816612d82289be240c508779 (diff) | |
| parent | 63dcd16d567862d94fe4b178e47f440e8ad6a2c9 (diff) | |
| download | ffmpeg-31f3c94760b42e16e998dcc0b34e677d1aa431bc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: fix dependencies on SAMPLES being set
fate: remove unnecessary libavfilter dependency
Conflicts:
ffmpeg.c
tests/Makefile
tests/fate/aac.mak
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/mpc.mak
tests/fate/probe.mak
tests/fate/qt.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/vqf.mak
tests/ref/fate/idroq-video-encode
tests/ref/fate/vc1-ism
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/Makefile b/tests/Makefile index a724e06db5..f872a0aa41 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -92,14 +92,18 @@ FATE = $(FATE_ACODEC) \ $(FATE_SEEK) \ FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes) +FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG) FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC) FATE-$(CONFIG_AVFILTER) += $(FATE_LAVFI) +FATE_SAMPLES-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) +FATE_SAMPLES += $(FATE_SAMPLES-yes) + FATE += $(FATE-yes) FATE += $(FATE_LIBAVUTIL) -$(FATE_FFMPEG) $(FATE_LAVF_FATE): ffmpeg$(EXESUF) +$(FATE_FFMPEG) $(FATE_LAVF_FATE) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(EXESUF) $(filter-out %-aref,$(FATE_ACODEC)): $(AREF) $(filter-out %-vref,$(FATE_VSYNTH1)): fate-vsynth1-vref @@ -126,8 +130,8 @@ fate-seek: $(FATE_SEEK) ifdef SAMPLES FATE += $(FATE_LAVF_FATE) -FATE += $(FATE_FFMPEG) FATE += $(FATE_FULL) $(FATE_FULL-yes) +FATE += $(FATE_SAMPLES) fate-rsync: rsync -vaLW --timeout=60 --contimeout=60 rsync://fate.ffmpeg.org/fate-suite/ $(SAMPLES) else @@ -135,8 +139,8 @@ 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_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 |