aboutsummaryrefslogtreecommitdiffstats
path: root/erlang.mk
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-05-01 18:20:56 +0200
committerLoïc Hoguin <[email protected]>2013-05-01 18:30:00 +0200
commit6e33274c852f60eccbdc610b0525c3541d36aa89 (patch)
treee871a8d9e1cf71dae4405055dda37e4c1019c895 /erlang.mk
parented2efbc4a10ef27d6ab42e7bb9db37ac3f47b3c3 (diff)
downloadcowboy-6e33274c852f60eccbdc610b0525c3541d36aa89.tar.gz
cowboy-6e33274c852f60eccbdc610b0525c3541d36aa89.tar.bz2
cowboy-6e33274c852f60eccbdc610b0525c3541d36aa89.zip
Update Ranch to 0.8.2 and use ct_helper for testing SSL
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)