diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 04:02:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 04:02:23 +0200 |
| commit | e755c8ac462e85e6c3de4f0207dc6bb5c86409cf (patch) | |
| tree | 79b263a53249817baa638e164c3d61d03d84f5fe /tests/Makefile | |
| parent | ca90ca8ce365261355f3b66936b9cc011fdd1cdc (diff) | |
| parent | 4a27a52a1f74016095b7aee1b4a422cf62217ade (diff) | |
Merge commit '4a27a52a1f74016095b7aee1b4a422cf62217ade'
* commit '4a27a52a1f74016095b7aee1b4a422cf62217ade':
fate: Don't use files from SRC_PATH in the actual tests
indeo4: reuse context block VLC for band instead of defaulting
Conflicts:
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile index cd8c1e2821..09a5e055ac 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -13,7 +13,7 @@ ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw @echo $(SRC_PATH)/tests/ffserver-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf -OBJDIRS += tests/data tests/vsynth1 +OBJDIRS += tests/data tests/vsynth1 tests/data/filtergraphs $(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1 $(M)./$< 'tests/vsynth1/' @@ -41,6 +41,10 @@ tests/data/ffprobe-test.nut: ffmpeg$(EXESUF) | tests/data tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm tests/data/%.nut: TAG = GEN +tests/data/filtergraphs/%: TAG = COPY +tests/data/filtergraphs/%: $(SRC_PATH)/tests/filtergraphs/% | tests/data/filtergraphs + $(M)cp $< $@ + CHKCFG = $(if $($(1))$(!$(1)),$($(1)), $(error No such config: $(1))) ALLYES = $(strip $(call XYES, $(1))) |