Skip to content

Commit 387f72b

Browse files
committed
Revert "Not all builders want to run all deps' tests"
This reverts commit e7c0e1e. Pushed to develop-2.2. by mistake
1 parent e7c0e1e commit 387f72b

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ ERLANG_BIN = $(shell dirname $(shell which erl 2>/dev/null) 2>/dev/null)
77
REBAR ?= $(BASE_DIR)/rebar
88
OVERLAY_VARS ?=
99
SPECIAL_DEPS ?= meck hamcrest riak_ensemble webmachine
10-
TEST_IGNORE ?=
1110

1211
RIAK_CORE_STAT_PREFIX = riak
1312
export RIAK_CORE_STAT_PREFIX
@@ -61,12 +60,11 @@ testclean:
6160
# Test each dependency individually in its own VM
6261
test : deps compile testclean
6362
@$(foreach dep, \
64-
$(filter-out $(TEST_IGNORE), \
65-
$(filter-out $(SPECIAL_DEPS), $(patsubst deps/%, %, $(wildcard deps/*)))), \
63+
$(filter-out $(SPECIAL_DEPS), $(patsubst deps/%, %, $(wildcard deps/*))), \
6664
(cd deps/$(dep) && REBAR_DEPS_DIR=$(BASE_DIR)/deps/ ../../rebar eunit deps_dir=.. skip_deps=true) \
6765
|| echo "Eunit: $(dep) FAILED" >> $(TEST_LOG_FILE);)
6866
@$(foreach special, \
69-
$(filter-out $(TEST_IGNORE), $(SPECIAL_DEPS)), \
67+
$(SPECIAL_DEPS), \
7068
(cd deps/$(special) && make test) \
7169
|| echo "Eunit: $(special) FAILED" >> $(TEST_LOG_FILE);)
7270
./rebar eunit skip_deps=true

0 commit comments

Comments
 (0)