diff options
| author | Loïc Hoguin <[email protected]> | 2014-06-07 10:36:32 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2014-06-07 10:36:32 +0200 |
| commit | 7dce3d91882188d8bcb27d863eb69841b43fef96 (patch) | |
| tree | a0a82fc90089291543bb4c6ca3b917d4538493a3 | |
| parent | 7959d8914af2a2c7416911c02e1d30874a6fbb29 (diff) | |
| parent | 25dd11ee3960de05377865f588b99074551b3993 (diff) | |
| download | erlang.mk-7dce3d91882188d8bcb27d863eb69841b43fef96.tar.gz erlang.mk-7dce3d91882188d8bcb27d863eb69841b43fef96.tar.bz2 erlang.mk-7dce3d91882188d8bcb27d863eb69841b43fef96.zip | |
Merge branch 'allow_ct_erl_args' of git://github.com/cwbriones/erlang.mk
| -rw-r--r-- | erlang.mk | 7 | ||||
| -rw-r--r-- | plugins/ct.mk | 7 |
2 files changed, 6 insertions, 8 deletions
@@ -230,8 +230,7 @@ CT_RUN = ct_run \ -noshell \ -pa $(realpath ebin) $(DEPS_DIR)/*/ebin \ -dir test \ - -logdir logs \ - $(CT_OPTS) + -logdir logs CT_SUITES ?= @@ -241,7 +240,7 @@ test_$(1): clean deps app build-tests @if [ -d "test" ] ; \ then \ mkdir -p logs/ ; \ - $(CT_RUN) -suite $(addsuffix _SUITE,$(1)) ; \ + $(CT_RUN) -suite $(addsuffix _SUITE,$(1)) $(CT_OPTS) ; \ fi $(gen_verbose) rm -f test/*.beam endef @@ -253,7 +252,7 @@ tests: clean deps app build-tests @if [ -d "test" ] ; \ then \ mkdir -p logs/ ; \ - $(CT_RUN) -suite $(addsuffix _SUITE,$(CT_SUITES)) ; \ + $(CT_RUN) -suite $(addsuffix _SUITE,$(CT_SUITES)) $(CT_OPTS) ; \ fi $(gen_verbose) rm -f test/*.beam diff --git a/plugins/ct.mk b/plugins/ct.mk index e3e33f5..a6d8f52 100644 --- a/plugins/ct.mk +++ b/plugins/ct.mk @@ -33,8 +33,7 @@ CT_RUN = ct_run \ -noshell \ -pa $(realpath ebin) $(DEPS_DIR)/*/ebin \ -dir test \ - -logdir logs \ - $(CT_OPTS) + -logdir logs $(foreach dep,$(TEST_DEPS),$(eval $(call dep_target,$(dep)))) @@ -50,7 +49,7 @@ tests-ct: clean deps app build-ct-suites @if [ -d "test" ] ; \ then \ mkdir -p logs/ ; \ - $(CT_RUN) -suite $(addsuffix _SUITE,$(CT_SUITES)) ; \ + $(CT_RUN) -suite $(addsuffix _SUITE,$(CT_SUITES)) $(CT_OPTS) ; \ fi $(gen_verbose) rm -f test/*.beam @@ -60,7 +59,7 @@ ct-$(1): clean deps app build-tests @if [ -d "test" ] ; \ then \ mkdir -p logs/ ; \ - $(CT_RUN) -suite $(addsuffix _SUITE,$(1)) ; \ + $(CT_RUN) -suite $(addsuffix _SUITE,$(1)) $(CT_OPTS) ; \ fi $(gen_verbose) rm -f test/*.beam endef |