diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:12:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:12:20 +0200 |
| commit | 4d54ecf4b8e897e993911ff51d53f52de88f29d5 (patch) | |
| tree | d1650172fb50f9e7c488a1e5d4d8ee3a19acd4e2 /tests | |
| parent | 79ec524ff52aa641896f755b63e933ab2877763c (diff) | |
| parent | a1f6ad69c77917a348650a745752535503a44f88 (diff) | |
| download | ffmpeg-4d54ecf4b8e897e993911ff51d53f52de88f29d5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: check that dependencies actually exist
fate: fix ENCMUX macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile index 54987afee4..06a5aa7dc1 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -41,9 +41,11 @@ 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 +CHKCFG = $(if $($(1))$(!$(1)),$($(1)), $(error No such config: $(1))) + ALLYES = $(strip $(call XYES, $(1))) XYES = $(if $(strip $(1)), \ - $(if $(CONFIG_$(firstword $(1))), \ + $(if $(call CHKCFG,CONFIG_$(firstword $(1))), \ $(call XYES, $(wordlist 2, $(words $(1)), $(1)))), \ yes) @@ -55,7 +57,7 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ $(firstword $(3))_MUXER $(lastword $(3))_DEMUXER) DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER)) -ENCMUX = $(call ALLYES, $(2:%=%_ENCODER) $(1)_MUXER) +ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER) include $(SRC_PATH)/tests/fate/acodec.mak include $(SRC_PATH)/tests/fate/vcodec.mak |