Skip to content

Commit 66e45b8

Browse files
gibfahnBridgeAR
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 78339e2 commit 66e45b8

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
@@ -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

+2-2
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ goto exit
505505
if defined enable_static goto exit
506506
if defined jslint_ci goto jslint-ci
507507
if not defined jslint goto exit
508-
if not exist tools\eslint\bin\eslint.js goto no-lint
508+
if not exist tools\eslint goto no-lint
509509
echo running jslint
510510
%config%\node tools\eslint\bin\eslint.js --cache --rule "linebreak-style: 0" --rulesdir=tools\eslint-rules --ext=.js,.md benchmark doc lib test tools
511511
goto exit
@@ -518,7 +518,7 @@ goto exit
518518
:no-lint
519519
echo Linting is not available through the source tarball.
520520
echo Use the git repo instead: $ git clone https://github.com/nodejs/node.git
521-
exit /b 1
521+
goto exit
522522

523523
:create-msvs-files-failed
524524
echo Failed to create vc project files.

0 commit comments

Comments
 (0)