summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorNathan Rajlich <nathan@tootallnate.net>2012-06-14 00:55:29 +0200
committerBert Belder <bertbelder@gmail.com>2012-06-14 00:56:35 +0200
commit6a8b5b36b4570b4e9468f4c4599f8f6513c35017 (patch)
treee6b739d5b4760ded91777395033336aa1177b2c5 /Makefile
parent35a1421e9670e7b5bc042758170d20673aed666f (diff)
downloadnodejs-6a8b5b36b4570b4e9468f4c4599f8f6513c35017.tar.gz
nodejs-6a8b5b36b4570b4e9468f4c4599f8f6513c35017.tar.bz2
nodejs-6a8b5b36b4570b4e9468f4c4599f8f6513c35017.zip
test: bundle node-weak in test/gc so that it doesn't need to be downloaded
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile13
1 files changed, 6 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index f2b9c32b6..52d90f0f9 100644
--- a/Makefile
+++ b/Makefile
@@ -61,17 +61,16 @@ test-http1: all
test-valgrind: all
$(PYTHON) tools/test.py --mode=release --valgrind simple message
-node_modules/weak:
+test/gc/node_modules/weak/build:
@if [ ! -f node ]; then make all; fi
- @if [ ! -d node_modules ]; then mkdir -p node_modules; fi
- ./node deps/npm/bin/npm-cli.js install weak \
- --nodedir="$(shell pwd)" \
- --prefix="$(shell pwd)" --unsafe-perm # go ahead and run as root.
+ ./node deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
+ --directory="$(shell pwd)/test/gc/node_modules/weak" \
+ --nodedir="$(shell pwd)"
-test-gc: all node_modules/weak
+test-gc: all test/gc/node_modules/weak/build
$(PYTHON) tools/test.py --mode=release gc
-test-all: all node_modules/weak
+test-all: all test/gc/node_modules/weak/build
$(PYTHON) tools/test.py --mode=debug,release
make test-npm