diff options
| author | Loïc Hoguin <[email protected]> | 2014-07-30 15:29:12 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2014-07-30 15:29:12 +0200 |
| commit | 075bde12e01d20fbe986f45e135261712a4cd13e (patch) | |
| tree | f244ebb7384277ee85f76961bdd1085110056568 | |
| parent | 3d44f83ebb1f15922a2531085b520253aae35548 (diff) | |
| parent | e8d3f9c8e144921221e7ea5ddfa14bb2b765a128 (diff) | |
| download | erlang.mk-075bde12e01d20fbe986f45e135261712a4cd13e.tar.gz erlang.mk-075bde12e01d20fbe986f45e135261712a4cd13e.tar.bz2 erlang.mk-075bde12e01d20fbe986f45e135261712a4cd13e.zip | |
Merge branch 'missing-test-dir-bug' of git://github.com/sedrik/erlang.mk
| -rw-r--r-- | erlang.mk | 6 | ||||
| -rw-r--r-- | plugins/ct.mk | 6 |
2 files changed, 10 insertions, 2 deletions
@@ -232,7 +232,11 @@ CT_RUN = ct_run \ -dir test \ -logdir logs -CT_SUITES ?= $(sort $(subst _SUITE.erl,,$(shell find test -type f -name \*_SUITE.erl -exec basename {} \;))) +ifneq ($(wildcard test/),) + CT_SUITES ?= $(sort $(subst _SUITE.erl,,$(shell find test -type f -name \*_SUITE.erl -exec basename {} \;))) +else + CT_SUITES ?= +endif define test_target test_$(1): ERLC_OPTS = $(TEST_ERLC_OPTS) diff --git a/plugins/ct.mk b/plugins/ct.mk index 91edf4e..a2e64ef 100644 --- a/plugins/ct.mk +++ b/plugins/ct.mk @@ -6,7 +6,11 @@ # Configuration. CT_OPTS ?= -CT_SUITES ?= $(sort $(subst _SUITE.erl,,$(shell find test -type f -name \*_SUITE.erl -exec basename {} \;))) +ifneq ($(wildcard test/),) + CT_SUITES ?= $(sort $(subst _SUITE.erl,,$(shell find test -type f -name \*_SUITE.erl -exec basename {} \;))) +else + CT_SUITES ?= +endif TEST_ERLC_OPTS ?= +debug_info +warn_export_vars +warn_shadow_vars +warn_obsolete_guard TEST_ERLC_OPTS += -DTEST=1 -DEXTRA=1 +'{parse_transform, eunit_autoexport}' |