diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/ct.mk | 8 | ||||
| -rw-r--r-- | plugins/eunit.mk | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/ct.mk b/plugins/ct.mk index 63f61fa..b9199e9 100644 --- a/plugins/ct.mk +++ b/plugins/ct.mk @@ -41,11 +41,11 @@ CT_RUN = ct_run \ -logdir $(CT_LOGS_DIR) ifeq ($(CT_SUITES),) -ct: $(if $(IS_APP),,apps-ct) +ct: $(if $(IS_APP)$(ROOT_DIR),,apps-ct) else # We do not run tests if we are in an apps/* with no test directory. ifneq ($(IS_APP)$(wildcard $(TEST_DIR)),1) -ct: test-build $(if $(IS_APP),,apps-ct) +ct: test-build $(if $(IS_APP)$(ROOT_DIR),,apps-ct) $(verbose) mkdir -p $(CT_LOGS_DIR) $(gen_verbose) $(CT_RUN) -sname ct_$(PROJECT) -suite $(addsuffix _SUITE,$(CT_SUITES)) $(CT_OPTS) endif @@ -53,13 +53,13 @@ endif ifneq ($(ALL_APPS_DIRS),) define ct_app_target -apps-ct-$1: +apps-ct-$1: test-build $(MAKE) -C $1 ct IS_APP=1 endef $(foreach app,$(ALL_APPS_DIRS),$(eval $(call ct_app_target,$(app)))) -apps-ct: test-build $(addprefix apps-ct-,$(ALL_APPS_DIRS)) +apps-ct: $(addprefix apps-ct-,$(ALL_APPS_DIRS)) endif ifndef t diff --git a/plugins/eunit.mk b/plugins/eunit.mk index c94c63d..8c08334 100644 --- a/plugins/eunit.mk +++ b/plugins/eunit.mk @@ -69,7 +69,7 @@ ifneq ($(wildcard src/ $(TEST_DIR)),) endif ifneq ($(ALL_APPS_DIRS),) -apps-eunit: +apps-eunit: test-build $(verbose) eunit_retcode=0 ; for app in $(ALL_APPS_DIRS); do $(MAKE) -C $$app eunit IS_APP=1; \ [ $$? -ne 0 ] && eunit_retcode=1 ; done ; \ exit $$eunit_retcode |