Skip to content

Commit 341bcfe

Browse files
committed
build: don't fail make test on source tarballs
Tries to achieve the same effect as nodejs#13658 without breaking source tarballs. Presumably if `tools/eslint` wasn't there at all, people would notice in the PR review! Fixes: nodejs#14513
1 parent b0d3bec commit 341bcfe

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ cpplint:
922922
@$(PYTHON) tools/cpplint.py $(CPPLINT_FILES)
923923
@$(PYTHON) tools/check-imports.py
924924

925-
ifneq ("","$(wildcard tools/eslint/bin/eslint.js)")
925+
ifneq ("","$(wildcard tools/eslint/)")
926926
lint:
927927
@EXIT_STATUS=0 ; \
928928
$(MAKE) jslint || EXIT_STATUS=$$? ; \
@@ -943,7 +943,6 @@ lint:
943943
@echo "Linting is not available through the source tarball."
944944
@echo "Use the git repo instead:" \
945945
"$ git clone https://github.com/nodejs/node.git"
946-
exit 1
947946

948947
lint-ci: lint
949948
endif

vcbuild.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ goto exit
502502
if defined enable_static goto exit
503503
if defined jslint_ci goto jslint-ci
504504
if not defined jslint goto exit
505-
if not exist tools\eslint\bin\eslint.js goto no-lint
505+
if not exist tools\eslint goto no-lint
506506
echo running jslint
507507
%config%\node tools\eslint\bin\eslint.js --cache --rule "linebreak-style: 0" --rulesdir=tools\eslint-rules --ext=.js,.md benchmark doc lib test tools
508508
goto exit
@@ -515,7 +515,7 @@ goto exit
515515
:no-lint
516516
echo Linting is not available through the source tarball.
517517
echo Use the git repo instead: $ git clone https://github.com/nodejs/node.git
518-
exit /b 1
518+
goto exit
519519

520520
:create-msvs-files-failed
521521
echo Failed to create vc project files.

0 commit comments

Comments
 (0)