aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2018-05-14 14:01:36 +0200
committerLoïc Hoguin <[email protected]>2018-05-14 14:12:47 +0200
commite0f8b46b0d5a78a10783d0b3a02ce15f3dafbd99 (patch)
tree7bad1f6a563f6ccf91f5e1ff0222fc0fe675d87e /plugins
parente344a3027b7cd5d6510cda8c9d80527de11e24f4 (diff)
downloaderlang.mk-e0f8b46b0d5a78a10783d0b3a02ce15f3dafbd99.tar.gz
erlang.mk-e0f8b46b0d5a78a10783d0b3a02ce15f3dafbd99.tar.bz2
erlang.mk-e0f8b46b0d5a78a10783d0b3a02ce15f3dafbd99.zip
Add the test directory in the list of paths for proper
Diffstat (limited to 'plugins')
-rw-r--r--plugins/proper.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/proper.mk b/plugins/proper.mk
index fe9a980..b749d9e 100644
--- a/plugins/proper.mk
+++ b/plugins/proper.mk
@@ -9,7 +9,10 @@ ifeq ($(filter proper,$(DEPS) $(TEST_DEPS)),proper)
tests:: proper
define proper_check.erl
- code:add_pathsa(["$(call core_native_path,$(CURDIR)/ebin)", "$(call core_native_path,$(DEPS_DIR)/*/ebin)"]),
+ code:add_pathsa([
+ "$(call core_native_path,$(CURDIR)/ebin)",
+ "$(call core_native_path,$(DEPS_DIR)/*/ebin)",
+ "$(call core_native_path,$(TEST_DIR))"]),
Module = fun(M) ->
[true] =:= lists:usort([
case atom_to_list(F) of
@@ -47,7 +50,8 @@ proper: test-build
endif
else
proper: test-build
- $(eval MODULES := $(patsubst %,'%',$(sort $(notdir $(basename $(wildcard ebin/*.beam))))))
+ $(eval MODULES := $(patsubst %,'%',$(sort $(notdir $(basename \
+ $(wildcard ebin/*.beam) $(call core_find,$(TEST_DIR)/,*.beam))))))
$(gen_verbose) $(call erlang,$(call proper_check.erl,all,undefined,$(MODULES)))
endif
endif