Skip to content

Commit 43e1c9e

Browse files
committed
make: move UNIT variables to testing_flags.mk
And use the new COMPILE_TAGS variable for the unit commands instead of LND_RELEASE_TAGS.
1 parent 8c64e27 commit 43e1c9e

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Makefile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ XARGS := xargs -L 1
5757

5858
LINT = $(LINT_BIN) run -v
5959

60-
UNIT := $(GOLIST) | $(XARGS) env $(GOTEST)
61-
UNIT_RACE := $(UNIT) -race
62-
6360
include make/release_flags.mk
6461
include make/testing_flags.mk
6562

@@ -199,7 +196,7 @@ check: unit
199196
unit:
200197
@$(call print, "Running unit tests.")
201198
mkdir -p app/build && touch app/build/index.html
202-
$(UNIT) -tags="$(LND_RELEASE_TAGS)"
199+
$(UNIT)
203200

204201
unit-cover: $(GOACC_BIN)
205202
@$(call print, "Running unit coverage tests.")
@@ -208,7 +205,7 @@ unit-cover: $(GOACC_BIN)
208205
unit-race:
209206
@$(call print, "Running unit race tests.")
210207
mkdir -p app/build && touch app/build/index.html
211-
env CGO_ENABLED=1 GORACE="history_size=7 halt_on_errors=1" $(UNIT_RACE) -tags="$(LND_RELEASE_TAGS)"
208+
env CGO_ENABLED=1 GORACE="history_size=7 halt_on_errors=1" $(UNIT_RACE)
212209

213210
clean-itest:
214211
@$(call print, "Cleaning itest binaries.")

make/testing_flags.mk

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
include make/compile_flags.mk
2+
13
ITEST_FLAGS =
24

35
# Define the integration test.run filter if the icase argument was provided.
46
ifneq ($(icase),)
57
ITEST_FLAGS += -test.run="TestLightningTerminal/$(icase)"
68
endif
9+
10+
UNIT := $(GOLIST) | $(XARGS) env $(GOTEST) -tags="$(COMPILE_TAGS)"
11+
UNIT_RACE := $(UNIT) -race

0 commit comments

Comments
 (0)