make/testing_flags: make DEV_TAGS+PROD_TAGS, switch debug to dev

This commit is contained in:
Conner Fromknecht 2018-09-20 03:27:57 -07:00
parent ece3051237
commit bab52421fa
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7

@ -1,4 +1,6 @@
TEST_TAGS = debug
DEV_TAGS = dev
PROD_TAGS = prod
LOG_TAGS =
TEST_FLAGS =
# If specific package is being unit tested, construct the full name of the
@ -34,16 +36,16 @@ UNIT_TARGETED ?= no
# If a specific package/test case was requested, run the unit test for the
# targeted case. Otherwise, default to running all tests.
ifeq ($(UNIT_TARGETED), yes)
UNIT := $(GOTEST) -tags="$(TEST_TAGS)" $(TEST_FLAGS) $(UNITPKG)
UNIT_RACE := $(GOTEST) -tags="$(TEST_TAGS)" $(TEST_FLAGS) -race $(UNITPKG)
UNIT := $(GOTEST) -tags="$(DEV_TAGS)" $(TEST_FLAGS) $(UNITPKG)
UNIT_RACE := $(GOTEST) -tags="$(DEV_TAGS)" $(TEST_FLAGS) -race $(UNITPKG)
endif
ifeq ($(UNIT_TARGETED), no)
UNIT := $(GOLIST) | $(XARGS) $(GOTEST) -tags="$(TEST_TAGS)" $(TEST_FLAGS)
UNIT := $(GOLIST) | $(XARGS) $(GOTEST) -tags="$(DEV_TAGS)" $(TEST_FLAGS)
UNIT_RACE := $(UNIT) -race
endif
# Construct the integration test command with the added build flags.
ITEST_TAGS := $(TEST_TAGS) rpctest
ITEST_TAGS := $(DEV_TAGS) rpctest
ITEST := rm output*.log; date; $(GOTEST) -tags="$(ITEST_TAGS)" $(TEST_FLAGS) -logoutput