aboutsummaryrefslogtreecommitdiffstats
path: root/erlang.mk
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-05-01 17:20:05 +0200
committerLoïc Hoguin <[email protected]>2013-05-01 17:20:05 +0200
commite6e5c73194a1e85308a6f872f32c977076d94cf9 (patch)
tree0d8855e11baa5d12739b50581645b3bd16db2a71 /erlang.mk
parent35185c2f5e2c8637ec1aa8ff22dbd7f683312a16 (diff)
downloadranch-e6e5c73194a1e85308a6f872f32c977076d94cf9.tar.gz
ranch-e6e5c73194a1e85308a6f872f32c977076d94cf9.tar.bz2
ranch-e6e5c73194a1e85308a6f872f32c977076d94cf9.zip
Use ct_helper to generate SSL certificates for testing
Diffstat (limited to 'erlang.mk')
-rw-r--r--erlang.mk12
1 files changed, 9 insertions, 3 deletions
diff --git a/erlang.mk b/erlang.mk
index 50e2530..9e4c698 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -34,6 +34,7 @@ DEPS_DIR ?= $(CURDIR)/deps
export DEPS_DIR
ALL_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(DEPS))
+ALL_TEST_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(TEST_DEPS))
# Application.
@@ -56,7 +57,7 @@ app: ebin/$(PROJECT).app
ebin/$(PROJECT).app: src/*.erl
@mkdir -p ebin/
- $(erlc_verbose) erlc -v $(ERLC_OPTS) -o ebin/ -pa ebin/ \
+ $(erlc_verbose) ERL_LIBS=deps erlc -v $(ERLC_OPTS) -o ebin/ -pa ebin/ \
$(COMPILE_FIRST_PATHS) $?
clean:
@@ -94,7 +95,12 @@ clean-docs:
# Tests.
-build-tests:
+$(foreach dep,$(TEST_DEPS),$(eval $(call dep_target,$(dep))))
+
+build-test-deps: $(ALL_TEST_DEPS_DIRS)
+ @for dep in $(ALL_TEST_DEPS_DIRS) ; do $(MAKE) -C $$dep; done
+
+build-tests: build-test-deps
$(gen_verbose) erlc -v $(ERLC_OPTS) -o test/ \
$(wildcard test/*.erl test/*/*.erl) -pa ebin/
@@ -123,7 +129,7 @@ DIALYZER_OPTS ?= -Werror_handling -Wrace_conditions \
build-plt: deps app
@dialyzer --build_plt --output_plt .$(PROJECT).plt \
- --apps erts kernel stdlib $(PLT_APPS) $(ALL_DEPS_DIR)
+ --apps erts kernel stdlib $(PLT_APPS) $(ALL_DEPS_DIRS)
dialyze:
@dialyzer --src src --plt .$(PROJECT).plt --no_native $(DIALYZER_OPTS)