From 9d2d6b1205c06d4c99af2f9dadf82d15afcf4e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bergstr=C3=B6m?= Date: Sat, 13 Jun 2015 12:25:35 +1000 Subject: [PATCH] build: don't run lint from test-ci Since we will run linting before compiling or testing there's no need to run it as part of the ci testing. Cherry-picked from https://github.com/nodejs/io.js/commit/8d8a26e8f7b4e65191af80d94bccada2217cbbb2 Original commit metadata follows: PR-URL: https://github.com/nodejs/io.js/pull/1965 Reviewed-By: Colin Ihrig Revewied-By: Evan Lucas Reviewed-By: Dummy Reviewer PR-URL: https://github.com/orangemocha/node/pull/11 --- Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 61ccdd7fa9e..43ab49d5765 100644 --- a/Makefile +++ b/Makefile @@ -127,6 +127,9 @@ test-all-http1: test-build test-all-valgrind: test-build $(PYTHON) tools/test.py --mode=debug,release --valgrind +test-ci: + $(PYTHON) tools/test.py -ptap --logfile test.tap --mode=release --arch=$(DESTCPU) simple message internet + test-release: test-build $(PYTHON) tools/test.py --mode=release @@ -419,11 +422,6 @@ bench-idle: sleep 1 ./node benchmark/idle_clients.js & -test-ci: - $(PYTHON) tools/test.py -ptap --logfile test.tap --mode=release --arch=$(DESTCPU) simple message internet - $(MAKE) jslint - $(MAKE) cpplint - jslintfix: PYTHONPATH=tools/closure_linter/ $(PYTHON) tools/closure_linter/closure_linter/fixjsstyle.py --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js