summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2015-01-12 23:40:51 +0100
committerRod Vagg <rod@vagg.org>2015-01-13 13:46:52 +1100
commit7861ff47285084604963a9f269b6062a23acd8a2 (patch)
tree3f3a1684cbad9f8552de28dc6ed5ddf9dc508f82 /Makefile
parentf76722686b91cf1c8db05a116ea0a960a5a49e8a (diff)
downloadnodejs-7861ff47285084604963a9f269b6062a23acd8a2.tar.gz
nodejs-7861ff47285084604963a9f269b6062a23acd8a2.tar.bz2
nodejs-7861ff47285084604963a9f269b6062a23acd8a2.zip
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index fb8769a74..5dd5d7712 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