Skip to content

Commit 6c9a9ff

Browse files
gibfahnMylesBorins
authored andcommitted
build: don't fail make test on source tarballs
Tries to achieve the same effect as #13658 without breaking source tarballs. Presumably if `tools/eslint` wasn't there at all, people would notice in the PR review! PR-URL: #15441 Fixes: #14513 Reviewed-By: Vse Mozhet Byt <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 96a64af commit 6c9a9ff

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ cpplint:
786786
@$(PYTHON) tools/cpplint.py $(CPPLINT_FILES)
787787
@$(PYTHON) tools/check-imports.py
788788

789-
ifneq ("","$(wildcard tools/eslint/bin/eslint.js)")
789+
ifneq ("","$(wildcard tools/eslint/)")
790790
lint:
791791
@EXIT_STATUS=0 ; \
792792
$(MAKE) jslint || EXIT_STATUS=$$? ; \
@@ -807,7 +807,6 @@ lint:
807807
@echo "Linting is not available through the source tarball."
808808
@echo "Use the git repo instead:" \
809809
"$ git clone https://github.com/nodejs/node.git"
810-
exit 1
811810

812811
lint-ci: lint
813812
endif

vcbuild.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ goto exit
396396
:jslint
397397
if defined jslint_ci goto jslint-ci
398398
if not defined jslint goto exit
399-
if not exist tools\eslint\bin\eslint.js goto no-lint
399+
if not exist tools\eslint goto no-lint
400400
echo running jslint
401401
%config%\node tools\eslint\bin\eslint.js --cache --rule "linebreak-style: 0" --rulesdir=tools\eslint-rules --ext=.js,.md benchmark doc lib test tools
402402
goto exit
@@ -409,7 +409,7 @@ goto exit
409409
:no-lint
410410
echo Linting is not available through the source tarball.
411411
echo Use the git repo instead: $ git clone https://github.com/nodejs/node.git
412-
exit /b 1
412+
goto exit
413413

414414
:create-msvs-files-failed
415415
echo Failed to create vc project files.

0 commit comments

Comments
 (0)