Skip to content

Commit ec6d326

Browse files
committed
Move exclude flags to env var
1 parent 2db1103 commit ec6d326

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

tools/make/lib/ls/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,11 @@ FIND_TESTS_FIXTURES_EXCLUDE_FLAGS ?= \
315315
-not -path "$(TOOLS_DIR)/*" \
316316
-not -path "$(TOOLS_PKGS_DIR)/*"
317317

318+
# Tools tests exclude flags:
319+
FIND_TOOLS_TESTS_EXCLUDE_FLAGS ?= \
320+
-not -path "*/fixtures/*" \
321+
-not -path "*/snippets/*"
322+
318323
# On Mac OSX, in order to use `|` and other regular expression operators, we need to use enhanced regular expression syntax (-E); see https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man7/re_format.7.html#//apple_ref/doc/man/7/re_format.
319324
ifeq ($(OS), Darwin)
320325
find_kernel_prefix := -E

tools/make/lib/ls/javascript/tools_tests.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ FIND_TOOLS_TESTS_FLAGS ?= \
2323
-type f \
2424
-name "$(TESTS_PATTERN)" \
2525
-regex "$(TESTS_FILTER)" \
26-
-not -path "*/fixtures/*" \
27-
-not -path "*/snippets/*"
26+
$(FIND_TOOLS_TESTS_EXCLUDE_FLAGS)
2827

2928
ifneq ($(OS), Darwin)
3029
FIND_TOOLS_TESTS_FLAGS := -regextype posix-extended $(FIND_TOOLS_TESTS_FLAGS)

0 commit comments

Comments
 (0)