diff options
| author | Loïc Hoguin <[email protected]> | 2018-12-11 13:26:31 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2018-12-11 13:26:31 +0100 |
| commit | c6181aae942a3c6f762e0ffaccf19046a5926bc1 (patch) | |
| tree | c6c97a7d4656aef89e3389e22610b04bad9eed0a | |
| parent | e6a347a451d11b19869ea14e551a535d3d0bc213 (diff) | |
| download | erlang.mk-c6181aae942a3c6f762e0ffaccf19046a5926bc1.tar.gz erlang.mk-c6181aae942a3c6f762e0ffaccf19046a5926bc1.tar.bz2 erlang.mk-c6181aae942a3c6f762e0ffaccf19046a5926bc1.zip | |
Fix a bug where ct-* targets produced an empty GEN line
$ must be escaped as $$ in templates.
| -rw-r--r-- | core/core.mk | 4 | ||||
| -rw-r--r-- | plugins/ct.mk | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/core.mk b/core/core.mk index 7c7c356..3da74d2 100644 --- a/core/core.mk +++ b/core/core.mk @@ -55,6 +55,10 @@ gen_verbose_0 = @echo " GEN " $@; gen_verbose_2 = set -x; gen_verbose = $(gen_verbose_$(V)) +gen_verbose_esc_0 = @echo " GEN " $$@; +gen_verbose_esc_2 = set -x; +gen_verbose_esc = $(gen_verbose_esc_$(V)) + # Temporary files directory. ERLANG_MK_TMP ?= $(CURDIR)/.erlang.mk diff --git a/plugins/ct.mk b/plugins/ct.mk index a6a400e..ba65b2c 100644 --- a/plugins/ct.mk +++ b/plugins/ct.mk @@ -80,7 +80,7 @@ endif define ct_suite_target ct-$(1): test-build $(verbose) mkdir -p $(CT_LOGS_DIR) - $(gen_verbose) $(CT_RUN) -sname ct_$(PROJECT) -suite $(addsuffix _SUITE,$(1)) $(CT_EXTRA) $(CT_OPTS) + $(gen_verbose_esc) $(CT_RUN) -sname ct_$(PROJECT) -suite $(addsuffix _SUITE,$(1)) $(CT_EXTRA) $(CT_OPTS) endef $(foreach test,$(CT_SUITES),$(eval $(call ct_suite_target,$(test)))) |