diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 01:20:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 01:20:20 +0200 |
| commit | 76bf39ab4b87fc3b11dc32093536028281e8b505 (patch) | |
| tree | cbbec80cfcd4f11646f40f45dace655d0c95e337 /tests | |
| parent | debb88776c3da9587bfc4ee07542490e51592a37 (diff) | |
| parent | eee813eec7d3c0b0689f80665d3f796401742935 (diff) | |
| download | ffmpeg-76bf39ab4b87fc3b11dc32093536028281e8b505.tar.gz | |
Merge commit 'eee813eec7d3c0b0689f80665d3f796401742935'
* commit 'eee813eec7d3c0b0689f80665d3f796401742935':
fate: Only generate tests/pixfmts.mak if some pixfmts fate test is run
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/filter-video.mak | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index d87129b023..17ec1595e5 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -289,7 +289,9 @@ 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" >> $@ -ifneq (,$(RUNNING_FATE)) +RUNNING_PIXFMTS_TESTS := $(filter check fate-list fate-filter-pixdesc%,$(MAKECMDGOALS)) + +ifneq (,$(RUNNING_PIXFMTS_TESTS)) -include tests/pixfmts.mak endif |