diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-18 11:42:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-18 11:42:42 +0200 |
| commit | 9317b73f11c34e550a2ffcf01540824dbaa36036 (patch) | |
| tree | 0c8cdd8af793ddfb724987d29d50ab079a903c6f /tests/Makefile | |
| parent | 5806cd93651f2066a5c402aadf261211736f1c0c (diff) | |
| parent | 36ac9a16a19a365ce58cc871484c20cffe9b6401 (diff) | |
Merge commit '36ac9a16a19a365ce58cc871484c20cffe9b6401'
* commit '36ac9a16a19a365ce58cc871484c20cffe9b6401':
fate: dependencies for seek tests
fate: handle lavf test dependencies entirely in make
Conflicts:
configure
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/tests/Makefile b/tests/Makefile index 21a54e2b1e..6d5df6623b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -56,6 +56,8 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ include $(SRC_PATH)/tests/fate/acodec.mak include $(SRC_PATH)/tests/fate/vcodec.mak +include $(SRC_PATH)/tests/fate/avformat.mak +include $(SRC_PATH)/tests/fate/seek.mak include $(SRC_PATH)/tests/fate/aac.mak include $(SRC_PATH)/tests/fate/ac3.mak @@ -109,13 +111,9 @@ include $(SRC_PATH)/tests/fate/wavpack.mak include $(SRC_PATH)/tests/fate/wma.mak FATE_LAVF_FATE = $(LAVF_FATE_TESTS:%=fate-lavf-fate-%) -FATE_LAVF = $(LAVF_TESTS:%=fate-lavf-%) FATE_LAVFI = $(LAVFI_TESTS:%=fate-lavfi-%) -FATE_SEEK = $(SEEK_TESTS:seek_%=fate-seek-%) -FATE_AVCONV += $(FATE_LAVF) \ - $(FATE_LAVFI) \ - $(FATE_SEEK) \ +FATE_AVCONV += $(FATE_LAVFI) \ FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes) FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG) @@ -134,19 +132,13 @@ $(FATE_FFMPEG) $(FATE_LAVF_FATE) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): $(FATE_FFPROBE): ffprobe$(EXESUF) -$(FATE_LAVF): $(AREF) $(VREF) $(FATE_LAVFI): $(VREF) libavfilter/filtfmts-test$(EXESUF) -$(FATE_SEEK): fate-acodec fate-vsynth2 fate-lavf libavformat/seek-test$(EXESUF) $(FATE_LAVF_FATE): CMD = lavffatetest -$(FATE_LAVF): CMD = lavftest $(FATE_LAVFI): CMD = lavfitest -$(FATE_SEEK): CMD = seektest fate-lavf-fate: $(FATE_LAVF_FATE) -fate-lavf: $(FATE_LAVF) fate-lavfi: $(FATE_LAVFI) -fate-seek: $(FATE_SEEK) ifdef SAMPLES FATE += $(FATE_LAVF_FATE) |