From ae91cfe710341b74403c55962eaa063d60ef2a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Fri, 8 May 2015 22:36:45 +0300
Subject: Fully specify the ct paths

Avoids some annoying warnings when Common Test runs.

I believe this is a regression.
---
 core/test.mk  |  2 +-
 plugins/ct.mk | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/test.mk b/core/test.mk
index d3f49c2..475afa2 100644
--- a/core/test.mk
+++ b/core/test.mk
@@ -5,7 +5,7 @@
 
 # Configuration.
 
-TEST_DIR ?= test
+TEST_DIR ?= $(CURDIR)/test
 
 ALL_TEST_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(TEST_DEPS))
 
diff --git a/plugins/ct.mk b/plugins/ct.mk
index 27921dc..eba0e52 100644
--- a/plugins/ct.mk
+++ b/plugins/ct.mk
@@ -31,25 +31,25 @@ help::
 CT_RUN = ct_run \
 	-no_auto_compile \
 	-noinput \
-	-pa ebin $(DEPS_DIR)/*/ebin \
+	-pa $(CURDIR)/ebin $(DEPS_DIR)/*/ebin $(TEST_DIR) \
 	-dir $(TEST_DIR) \
-	-logdir logs
+	-logdir $(CURDIR)/logs
 
 ifeq ($(CT_SUITES),)
 ct:
 else
 ct: test-build
-	@mkdir -p logs/
+	@mkdir -p $(CURDIR)/logs/
 	$(gen_verbose) $(CT_RUN) -suite $(addsuffix _SUITE,$(CT_SUITES)) $(CT_OPTS)
 endif
 
 define ct_suite_target
 ct-$(1): test-build
-	@mkdir -p logs/
+	@mkdir -p $(CURDIR)/logs/
 	$(gen_verbose) $(CT_RUN) -suite $(addsuffix _SUITE,$(1)) $(CT_OPTS)
 endef
 
 $(foreach test,$(CT_SUITES),$(eval $(call ct_suite_target,$(test))))
 
 distclean-ct:
-	$(gen_verbose) rm -rf logs/
+	$(gen_verbose) rm -rf $(CURDIR)/logs/
-- 
cgit v1.2.3