aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/triq.mk
diff options
context:
space:
mode:
authorKrzysztof Jurewicz <[email protected]>2017-08-12 15:24:57 +0200
committerLoïc Hoguin <[email protected]>2017-08-23 15:55:43 +0200
commitdaa3cc16bedb5f9db691ef4b670099f1bf26a1e4 (patch)
treed51b20aa169e95e65500c45558005cd992820558 /plugins/triq.mk
parent290cae07c7eae6aa330df587af044df3306fa842 (diff)
downloaderlang.mk-daa3cc16bedb5f9db691ef4b670099f1bf26a1e4.tar.gz
erlang.mk-daa3cc16bedb5f9db691ef4b670099f1bf26a1e4.tar.bz2
erlang.mk-daa3cc16bedb5f9db691ef4b670099f1bf26a1e4.zip
Make Triq plugin pick tests from $(TEST_DIR)
This commit also changes Triq repository in package index to point to the leading fork. The original repository doesn’t work in Erlang 20.
Diffstat (limited to 'plugins/triq.mk')
-rw-r--r--plugins/triq.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/triq.mk b/plugins/triq.mk
index 09443b5..4e6482b 100644
--- a/plugins/triq.mk
+++ b/plugins/triq.mk
@@ -9,7 +9,7 @@ ifeq ($(filter triq,$(DEPS) $(TEST_DEPS)),triq)
tests:: triq
define triq_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))"]),
try
case $(1) of
all -> [true] =:= lists:usort([triq:check(M) || M <- [$(call comma_list,$(3))]]);
@@ -36,7 +36,7 @@ triq: test-build
endif
else
triq: test-build
- $(eval MODULES := $(patsubst %,'%',$(sort $(notdir $(basename $(wildcard ebin/*.beam))))))
+ $(eval MODULES := $(patsubst %,'%',$(sort $(notdir $(basename $(wildcard ebin/*.beam))) $(notdir $(basename $(call core_find,$(TEST_DIR)/,*.beam))))))
$(gen_verbose) $(call erlang,$(call triq_check.erl,all,undefined,$(MODULES)))
endif
endif