Skip to content

Commit b277c51

Browse files
committed
Move exclude flags to separate env var
1 parent 3f44835 commit b277c51

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

tools/make/lib/ls/Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,13 @@ FIND_SOURCES_EXCLUDE_FLAGS ?= \
260260
-not -path "$(ROOT_DIR)/**/$(DOCUMENTATION_FOLDER)/*" \
261261
-not -path "$(ROOT_DIR)/**/$(SCRIPTS_FOLDER)/*"
262262

263+
# Tests exclude flags:
264+
FIND_TESTS_EXCLUDE_FLAGS ?= \
265+
$(FIND_COMMON_EXCLUDE_FLAGS) \
266+
-not -path "$(TOOLS_DIR)/*" \
267+
-not -path "$(TOOLS_PKGS_DIR)/*" \
268+
-not -path "$(ROOT_DIR)/**/$(TESTS_FIXTURES_FOLDER)/*"
269+
263270
# Text fixtures exclude flags:
264271
FIND_TESTS_FIXTURES_EXCLUDE_FLAGS ?= \
265272
$(FIND_COMMON_EXCLUDE_FLAGS) \

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,7 @@ FIND_TESTS_FLAGS ?= \
3434
-type f \
3535
-name "$(TESTS_PATTERN)" \
3636
-regex "$(TESTS_FILTER)" \
37-
-not -path "$(ROOT_DIR)/.*" \
38-
-not -path "$(NODE_MODULES)/*" \
39-
-not -path "$(DOCS_DIR)/**/$(NODE_MODULES_FOLDER)/*" \
40-
-not -path "$(TOOLS_DIR)/*" \
41-
-not -path "$(TOOLS_PKGS_DIR)/*" \
42-
-not -path "$(DEPS_DIR)/*" \
43-
-not -path "$(BUILD_DIR)/*" \
44-
-not -path "$(DIST_DIR)/*" \
45-
-not -path "$(REPORTS_DIR)/*" \
46-
-not -path "$(ROOT_DIR)/**/$(BUILD_FOLDER)/*"
37+
$(FIND_TESTS_EXCLUDE_FLAGS)
4738

4839
ifneq ($(OS), Darwin)
4940
FIND_TESTS_FLAGS := -regextype posix-extended $(FIND_TESTS_FLAGS)

0 commit comments

Comments
 (0)