test: bundle node-weak in test/gc so that it doesn't need to be downl…

…oaded
nodejs · Jun 13, 2012 · 6a8b5b3 · 6a8b5b3
1 parent 35a1421
commit 6a8b5b3
Show file tree

Hide file tree

Showing 8 changed files with 537 additions and 10 deletions.
diff --git 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
 

diff --git a/test/gc/node_modules/weak/LICENSE b/test/gc/node_modules/weak/LICENSE
diff --git a/test/gc/node_modules/weak/README.md b/test/gc/node_modules/weak/README.md
diff --git a/test/gc/node_modules/weak/binding.gyp b/test/gc/node_modules/weak/binding.gyp
diff --git a/test/gc/node_modules/weak/lib/weak.js b/test/gc/node_modules/weak/lib/weak.js
diff --git a/test/gc/node_modules/weak/package.json b/test/gc/node_modules/weak/package.json