From 1b6aa025514d131082ca10fca8c791af1bddaf8d Mon Sep 17 00:00:00 2001
From: Steve Strong <steve@srstrong.com>
Date: Sun, 18 Aug 2013 18:05:27 +0200
Subject: Allow higher level makefile to specify ERL_LIBS

---
 erlang.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'erlang.mk')

diff --git a/erlang.mk b/erlang.mk
index 8cc8b03..dc0c3ed 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -60,6 +60,9 @@ ALL_TEST_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(TEST_DEPS))
 
 # Application.
 
+ERL_LIBS ?= $(DEPS)
+export ERL_LIBS
+
 ERLC_OPTS ?= -Werror +debug_info +warn_export_all +warn_export_vars \
 	+warn_shadow_vars +warn_obsolete_guard # +bin_opt_info +warn_missing_spec
 COMPILE_FIRST ?=
@@ -78,7 +81,7 @@ app: ebin/$(PROJECT).app
 		> ebin/$(PROJECT).app
 
 define compile_erl
-	$(erlc_verbose) ERL_LIBS=$(DEPS_DIR) erlc -v $(ERLC_OPTS) -o ebin/ \
+	$(erlc_verbose) erlc -v $(ERLC_OPTS) -o ebin/ \
 		-pa ebin/ -I include/ $(COMPILE_FIRST_PATHS) $(1)
 endef
 
@@ -164,7 +167,7 @@ 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) ERL_LIBS=$(DEPS_DIR) erlc -v $(ERLC_OPTS) -o test/ \
+	$(gen_verbose) erlc -v $(ERLC_OPTS) -o test/ \
 		$(wildcard test/*.erl test/*/*.erl) -pa ebin/
 
 CT_RUN = ct_run \
-- 
cgit v1.2.3


From 0c8266dbefef3b15d8012caa64e94eba9209a7e8 Mon Sep 17 00:00:00 2001
From: Steve Strong <steve@srstrong.com>
Date: Sun, 18 Aug 2013 18:13:25 +0200
Subject: Added realpath to ebin in test run to prevent ct_run messages

---
 erlang.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erlang.mk')

diff --git a/erlang.mk b/erlang.mk
index dc0c3ed..7cbe768 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -173,7 +173,7 @@ build-tests: build-test-deps
 CT_RUN = ct_run \
 	-no_auto_compile \
 	-noshell \
-	-pa ebin $(DEPS_DIR)/*/ebin \
+	-pa $(realpath ebin) $(DEPS_DIR)/*/ebin \
 	-dir test \
 	-logdir logs
 #	-cover test/cover.spec
-- 
cgit v1.2.3


From 264f9077f6daaad1cadd8b7b31441a5eb0b5bbde Mon Sep 17 00:00:00 2001
From: Steve Strong <steve@srstrong.com>
Date: Sun, 18 Aug 2013 18:26:41 +0200
Subject: Do not run tests if test directory does not exist

---
 erlang.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'erlang.mk')

diff --git a/erlang.mk b/erlang.mk
index 7cbe768..13e8a70 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -183,8 +183,11 @@ CT_SUITES_FULL = $(addsuffix _SUITE,$(CT_SUITES))
 
 tests: ERLC_OPTS += -DTEST=1 +'{parse_transform, eunit_autoexport}'
 tests: clean deps app build-tests
-	@mkdir -p logs/
-	@$(CT_RUN) -suite $(CT_SUITES_FULL)
+	@if [ -d "test" ] ; \
+	then \
+		mkdir -p logs/ ; \
+		$(CT_RUN) -suite $(CT_SUITES_FULL) ; \
+	fi
 	$(gen_verbose) rm -f test/*.beam
 
 # Dialyzer.
-- 
cgit v1.2.3