aboutsummaryrefslogtreecommitdiffstats
path: root/erlang.mk
diff options
context:
space:
mode:
authorChristian Briones <[email protected]>2014-06-05 17:25:22 -0700
committerChristian Briones <[email protected]>2014-06-06 16:30:29 -0700
commit25dd11ee3960de05377865f588b99074551b3993 (patch)
treea0a82fc90089291543bb4c6ca3b917d4538493a3 /erlang.mk
parent7959d8914af2a2c7416911c02e1d30874a6fbb29 (diff)
downloaderlang.mk-25dd11ee3960de05377865f588b99074551b3993.tar.gz
erlang.mk-25dd11ee3960de05377865f588b99074551b3993.tar.bz2
erlang.mk-25dd11ee3960de05377865f588b99074551b3993.zip
move CT_OPTS so that -erl_args works as expected when running tests
Diffstat (limited to 'erlang.mk')
-rw-r--r--erlang.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/erlang.mk b/erlang.mk
index 8edcba4..d29632c 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -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