Skip to content

Commit 93767a1

Browse files
authored
Merge pull request #950 from basho/rdb/ignore-tests
Not all builders want to run all deps' tests
2 parents 387f72b + 464db8d commit 93767a1

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ 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 ?=
1011

1112
RIAK_CORE_STAT_PREFIX = riak
1213
export RIAK_CORE_STAT_PREFIX
@@ -60,11 +61,12 @@ testclean:
6061
# Test each dependency individually in its own VM
6162
test : deps compile testclean
6263
@$(foreach dep, \
63-
$(filter-out $(SPECIAL_DEPS), $(patsubst deps/%, %, $(wildcard deps/*))), \
64+
$(filter-out $(TEST_IGNORE), \
65+
$(filter-out $(SPECIAL_DEPS), $(patsubst deps/%, %, $(wildcard deps/*)))), \
6466
(cd deps/$(dep) && REBAR_DEPS_DIR=$(BASE_DIR)/deps/ ../../rebar eunit deps_dir=.. skip_deps=true) \
6567
|| echo "Eunit: $(dep) FAILED" >> $(TEST_LOG_FILE);)
6668
@$(foreach special, \
67-
$(SPECIAL_DEPS), \
69+
$(filter-out $(TEST_IGNORE), $(SPECIAL_DEPS)), \
6870
(cd deps/$(special) && make test) \
6971
|| echo "Eunit: $(special) FAILED" >> $(TEST_LOG_FILE);)
7072
./rebar eunit skip_deps=true

0 commit comments

Comments
 (0)