diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 14:33:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 15:03:22 +0200 |
| commit | 713dbe0655e4c3a906b0d812a6f90ac161223876 (patch) | |
| tree | fbd605821f014cfd5405a90c7335af208d08d2e2 /tests/Makefile | |
| parent | 9e052df86d522cddbddaafe584c2c8cf4d5f5032 (diff) | |
| parent | 706208ef47bffd525c982975d2756f7b2b220b8d (diff) | |
| download | ffmpeg-streaming-713dbe0655e4c3a906b0d812a6f90ac161223876.zip ffmpeg-streaming-713dbe0655e4c3a906b0d812a6f90ac161223876.tar.gz | |
Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d'
* commit '706208ef47bffd525c982975d2756f7b2b220b8d':
fate: Split fate-pixdesc tests and dispatch them through Make
Conflicts:
tests/fate-run.sh
tests/ref/fate/filter-pixdesc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile index d58505a..a18148c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -50,8 +50,10 @@ tests/data/filtergraphs/%: TAG = COPY tests/data/filtergraphs/%: $(SRC_PATH)/tests/filtergraphs/% | tests/data/filtergraphs $(M)cp $< $@ +RUNNING_FATE := $(filter check fate%,$(filter-out fate-rsync,$(MAKECMDGOALS))) + # Check sanity of dependencies when running FATE tests. -ifneq (,$(filter check fate%,$(filter-out fate-rsync,$(MAKECMDGOALS)))) +ifneq (,$(RUNNING_FATE)) CHKCFG = $(if $($(1))$(!$(1)),$($(1)), $(error No such config: $(1))) endif @@ -209,6 +211,7 @@ testclean: $(RM) -r tests/vsynth1 tests/data tools/lavfi-showfiltfmts$(EXESUF) $(RM) $(CLEANSUFFIXES:%=tests/%) $(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF)) + $(RM) tests/pixfmts.mak -include $(wildcard tests/*.d) |
