From 6f9018fc5ecd974061e17ba84a14625a925e353a Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Tue, 23 Oct 2012 03:23:43 +0100 Subject: fate: fix ENCMUX macro This matches how it is actually being called. Signed-off-by: Mans Rullgard --- tests/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 5fd1a3c608..8bc2b410e5 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -34,7 +34,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 -- cgit v1.2.3 From a1f6ad69c77917a348650a745752535503a44f88 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Tue, 23 Oct 2012 03:28:08 +0100 Subject: fate: check that dependencies actually exist This causes make to exit with an error message if a nonexistent dependency is specified rather than silently dropping the test. Signed-off-by: Mans Rullgard --- tests/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 8bc2b410e5..64ad6ad8ae 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -20,9 +20,11 @@ tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm: 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) -- cgit v1.2.3