Skip to content

Commit ce33d61

Browse files
committed
Merge branch 'jl/test-lint-scripts'
* jl/test-lint-scripts: t/Makefile: always test all lint targets when running tests t/Makefile: check helper scripts for non-portable shell commands too
2 parents 5e40e41 + 00f6991 commit ce33d61

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

t/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ TAR ?= $(TAR)
1313
RM ?= rm -f
1414
PROVE ?= prove
1515
DEFAULT_TEST_TARGET ?= test
16-
TEST_LINT ?= test-lint-duplicates test-lint-executable
16+
TEST_LINT ?= test-lint
1717

1818
ifdef TEST_OUTPUT_DIRECTORY
1919
TEST_RESULTS_DIRECTORY = $(TEST_OUTPUT_DIRECTORY)/test-results
@@ -29,6 +29,7 @@ TEST_RESULTS_DIRECTORY_SQ = $(subst ','\'',$(TEST_RESULTS_DIRECTORY))
2929
T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh))
3030
TSVN = $(sort $(wildcard t91[0-9][0-9]-*.sh))
3131
TGITWEB = $(sort $(wildcard t95[0-9][0-9]-*.sh))
32+
THELPERS = $(sort $(filter-out $(T),$(wildcard *.sh)))
3233

3334
all: $(DEFAULT_TEST_TARGET)
3435

@@ -65,7 +66,7 @@ test-lint-executable:
6566
echo >&2 "non-executable tests:" $$bad; exit 1; }
6667

6768
test-lint-shell-syntax:
68-
@'$(PERL_PATH_SQ)' check-non-portable-shell.pl $(T)
69+
@'$(PERL_PATH_SQ)' check-non-portable-shell.pl $(T) $(THELPERS)
6970

7071
aggregate-results-and-cleanup: $(T)
7172
$(MAKE) aggregate-results

0 commit comments

Comments
 (0)