diff options
| author | jamal <jamrial@gmail.com> | 2012-10-19 09:22:12 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 16:20:11 +0400 |
| commit | 9434ead2f34b971176b43ff0c3a54b9e76ac2249 (patch) | |
| tree | 598fdf1bf3337646f54922626f14ff4a570c967c /tests | |
| parent | c5fd9d3c35cb743226770e1077e6b082f44bd889 (diff) | |
fate: Handle lavf-fate tests in a makefile
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 9 | ||||
| -rw-r--r-- | tests/fate/avformat.mak | 11 |
2 files changed, 11 insertions, 9 deletions
diff --git a/tests/Makefile b/tests/Makefile index b5e0443855..eba7d4faf1 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -113,8 +113,6 @@ include $(SRC_PATH)/tests/fate/vqf.mak include $(SRC_PATH)/tests/fate/wavpack.mak include $(SRC_PATH)/tests/fate/wma.mak -FATE_LAVF_FATE = $(LAVF_FATE_TESTS:%=fate-lavf-fate-%) - FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes) FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG) FATE-$(CONFIG_FFPROBE) += $(FATE_FFPROBE) @@ -129,16 +127,11 @@ FATE_EXTERN += $(FATE_EXTERN-yes) FATE += $(FATE-yes) FATE += $(FATE_LIBAVUTIL) -$(FATE_FFMPEG) $(FATE_LAVF_FATE) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(EXESUF) +$(FATE_FFMPEG) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(EXESUF) $(FATE_FFPROBE): ffprobe$(EXESUF) -$(FATE_LAVF_FATE): CMD = lavffatetest - -fate-lavf-fate: $(FATE_LAVF_FATE) - ifdef SAMPLES -FATE += $(FATE_LAVF_FATE) FATE += $(FATE_FULL) $(FATE_FULL-yes) FATE += $(FATE_EXTERN) fate-rsync: diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak index 60529dde79..296bb42627 100644 --- a/tests/fate/avformat.mak +++ b/tests/fate/avformat.mak @@ -21,7 +21,6 @@ FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10 FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT) += nut FATE_LAVF-$(call ENCDEC, FLAC, OGG) += ogg -FATE_LAVF-$(call ENCDEC, VP3, OGG) += ogg_vp3 FATE_LAVF-$(call ENCDEC, PAM, IMAGE2) += pam FATE_LAVF-$(call ENCDEC, PBM, IMAGE2PIPE) += pbmpipe FATE_LAVF-$(call ENCDEC, PCX, IMAGE2) += pcx @@ -55,3 +54,13 @@ $(FATE_LAVF): CMD = lavftest FATE_AVCONV += $(FATE_LAVF) fate-lavf: $(FATE_LAVF) + +FATE_LAVF_FATE-$(call ALLYES, MATROSKA_DEMUXER OGG_MUXER) += ogg_vp3 +FATE_LAVF_FATE-$(call ALLYES, MOV_DEMUXER LATM_MUXER) += latm +FATE_LAVF_FATE-$(call ALLYES, MP3_DEMUXER MP3_MUXER) += mp3 + +FATE_LAVF_FATE += $(FATE_LAVF_FATE-yes:%=fate-lavf-fate-%) +$(FATE_LAVF_FATE): CMD = lavffatetest + +FATE_SAMPLES_FFMPEG += $(FATE_LAVF_FATE) +fate-lavf-fate: $(FATE_LAVF_FATE) |