Browse Source

Fully specify the ct paths

Avoids some annoying warnings when Common Test runs.

I believe this is a regression.
Loïc Hoguin 10 years ago
parent
commit
ae91cfe710
2 changed files with 6 additions and 6 deletions
  1. 1 1
      core/test.mk
  2. 5 5
      plugins/ct.mk

+ 1 - 1
core/test.mk

@@ -5,7 +5,7 @@
 
 
 # Configuration.
 # Configuration.
 
 
-TEST_DIR ?= test
+TEST_DIR ?= $(CURDIR)/test
 
 
 ALL_TEST_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(TEST_DEPS))
 ALL_TEST_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(TEST_DEPS))
 
 

+ 5 - 5
plugins/ct.mk

@@ -31,25 +31,25 @@ help::
 CT_RUN = ct_run \
 CT_RUN = ct_run \
 	-no_auto_compile \
 	-no_auto_compile \
 	-noinput \
 	-noinput \
-	-pa ebin $(DEPS_DIR)/*/ebin \
+	-pa $(CURDIR)/ebin $(DEPS_DIR)/*/ebin $(TEST_DIR) \
 	-dir $(TEST_DIR) \
 	-dir $(TEST_DIR) \
-	-logdir logs
+	-logdir $(CURDIR)/logs
 
 
 ifeq ($(CT_SUITES),)
 ifeq ($(CT_SUITES),)
 ct:
 ct:
 else
 else
 ct: test-build
 ct: test-build
-	@mkdir -p logs/
+	@mkdir -p $(CURDIR)/logs/
 	$(gen_verbose) $(CT_RUN) -suite $(addsuffix _SUITE,$(CT_SUITES)) $(CT_OPTS)
 	$(gen_verbose) $(CT_RUN) -suite $(addsuffix _SUITE,$(CT_SUITES)) $(CT_OPTS)
 endif
 endif
 
 
 define ct_suite_target
 define ct_suite_target
 ct-$(1): test-build
 ct-$(1): test-build
-	@mkdir -p logs/
+	@mkdir -p $(CURDIR)/logs/
 	$(gen_verbose) $(CT_RUN) -suite $(addsuffix _SUITE,$(1)) $(CT_OPTS)
 	$(gen_verbose) $(CT_RUN) -suite $(addsuffix _SUITE,$(1)) $(CT_OPTS)
 endef
 endef
 
 
 $(foreach test,$(CT_SUITES),$(eval $(call ct_suite_target,$(test))))
 $(foreach test,$(CT_SUITES),$(eval $(call ct_suite_target,$(test))))
 
 
 distclean-ct:
 distclean-ct:
-	$(gen_verbose) rm -rf logs/
+	$(gen_verbose) rm -rf $(CURDIR)/logs/