aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--erlang.mk7
-rw-r--r--plugins/ct.mk7
2 files changed, 6 insertions, 8 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
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