Merge commit 'd395895cdb2ac8c95bd488549e7f893bd4dcc248'

* commit 'd395895cdb2ac8c95bd488549e7f893bd4dcc248':
  fate: generate tests/pixfmts.mak for all targets requiring it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/80/head
Michael Niedermayer 11 years ago
commit 0160fe454c
  1. 2
      tests/fate/filter-video.mak

@ -289,7 +289,7 @@ tests/pixfmts.mak: ffmpeg$(EXESUF)
$(Q)$(TARGET_EXEC) $(TARGET_PATH)/$< -pix_fmts list 2> /dev/null | awk 'NR > 8 && /^IO/ { printf $$2 " " }' >> $@
$(Q)printf "\n" >> $@
RUNNING_PIXFMTS_TESTS := $(filter check fate-list fate-filter-pixdesc%,$(MAKECMDGOALS))
RUNNING_PIXFMTS_TESTS := $(filter check fate fate-list fate-filter fate-vfilter fate-filter-pixdesc%,$(MAKECMDGOALS))
ifneq (,$(RUNNING_PIXFMTS_TESTS))
-include tests/pixfmts.mak

Loading…
Cancel
Save