From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Mon, 12 Jan 2015 22:40:51 +0000 (+0100)
Subject: test: create test-ci, modify test-all, fix cpplint
X-Git-Tag: v1.0.0~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7861ff47285084604963a9f269b6062a23acd8a2;p=platform%2Fupstream%2Fnodejs.git

test: create test-ci, modify test-all, fix cpplint

test: add test/addons to default test list

`make test-all` and `python tools/test.py` will now also run the addon
tests in test/addons.

test: remove test-npm from test-all make target

The test-npm target builds documentation, changes versioned files,
clutters the current working directory with artifacts, etc.  In short,
it doesn't seem quite ready for inclusion in `make test-all`.

test: add test-ci target, reduced test-all

Add a test-ci target that is like test-all minus the (slow) pummel and
gc test suites.

This is primarily intended for the continuous integration, where we want
decent coverage but don't want to wait for ages for tests to complete.

cpplint: add -license/copyright to default filters

Commit 3e1b1dd ("Remove excessive copyright/license boilerplate") trips
up the copyright boilerplate style check.  Disable it.

PR-URL: https://github.com/iojs/io.js/pull/314
Reviewed-By: Rod Vagg <rod@vagg.org>
---

diff --git a/Makefile b/Makefile
index fb8769a..5dd5d77 100644
--- a/Makefile
+++ b/Makefile
@@ -123,11 +123,13 @@ test-build: all build-addons
 
 test-all: test-build test/gc/node_modules/weak/build/Release/weakref.node
 	$(PYTHON) tools/test.py --mode=debug,release
-	make test-npm
 
 test-all-valgrind: test-build
 	$(PYTHON) tools/test.py --mode=debug,release --valgrind
 
+test-ci: test-build
+	$(PYTHON) tools/test.py -J parallel sequential message addons
+
 test-release: test-build
 	$(PYTHON) tools/test.py --mode=release
 
diff --git a/tools/cpplint.py b/tools/cpplint.py
index 603c4ab..5ab1561 100644
--- a/tools/cpplint.py
+++ b/tools/cpplint.py
@@ -210,7 +210,7 @@ _ERROR_CATEGORIES = [
 # flag. By default all errors are on, so only add here categories that should be
 # off by default (i.e., categories that must be enabled by the --filter= flags).
 # All entries here should start with a '-' or '+', as in the --filter= flag.
-_DEFAULT_FILTERS = [ '-build/include_alpha' ]
+_DEFAULT_FILTERS = [ '-build/include_alpha', '-legal/copyright' ]
 
 # We used to check for high-bit characters, but after much discussion we
 # decided those were OK, as long as they were in UTF-8 and didn't represent
diff --git a/tools/test.py b/tools/test.py
index c78599b..074a918 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -1357,6 +1357,7 @@ BUILT_IN_TESTS = [
   'pummel',
   'message',
   'internet',
+  'addons',
   'gc',
   'debugger',
 ]