From 43bbf433eb305c33ee61fae30dc7b3726dcf22ee Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Mon, 12 Jan 2015 23:40:51 +0100
Subject: [PATCH 1/4] 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.
---
 tools/test.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/test.py b/tools/test.py
index c78599bf0699..074a918f2ad0 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -1357,6 +1357,7 @@ def ExpandCommand(args):
   'pummel',
   'message',
   'internet',
+  'addons',
   'gc',
   'debugger',
 ]

From 5648cf0cf2f8e0882fa28792ac822b8b5afa1567 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Mon, 12 Jan 2015 23:42:52 +0100
Subject: [PATCH 2/4] 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`.
---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index fb8769a744e1..17bed76ff623 100644
--- a/Makefile
+++ b/Makefile
@@ -123,7 +123,6 @@ 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

From 67c669946640169d736d05a322e55a3931caf306 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Tue, 13 Jan 2015 02:21:52 +0100
Subject: [PATCH 3/4] 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.
---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index 17bed76ff623..5dd5d7712155 100644
--- a/Makefile
+++ b/Makefile
@@ -127,6 +127,9 @@ test-all: test-build test/gc/node_modules/weak/build/Release/weakref.node
 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
 

From c7fdfe71853f7ae7b5c88193cf17c905246ab814 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Tue, 13 Jan 2015 02:26:12 +0100
Subject: [PATCH 4/4] cpplint: add -license/copyright to default filters

Commit 3e1b1dd ("Remove excessive copyright/license boilerplate") trips
up the copyright boilerplate style check.  Disable it.
---
 tools/cpplint.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cpplint.py b/tools/cpplint.py
index 603c4aba9741..5ab156124a2d 100644
--- a/tools/cpplint.py
+++ b/tools/cpplint.py
@@ -210,7 +210,7 @@
 # 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