Merge branch 'http-memleak' into v0.6

nodejs · May 4, 2012 · d1effbb · d1effbb
2 parents ebd0f98 + 2fc528c
commit d1effbb
Show file tree

Hide file tree

Showing 10 changed files with 647 additions and 110 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,3 +40,4 @@ ipch/
 email.md
 blog.html
 deps/v8-*
+node_modules
diff --git a/Makefile b/Makefile
@@ -32,7 +32,7 @@ install:
 uninstall:
 	@$(WAF) uninstall
 
-test: all
+test: all node_modules/weak
 	$(PYTHON) tools/test.py --mode=release simple message
 
 test-http1: all
@@ -41,7 +41,15 @@ test-http1: all
 test-valgrind: all
 	$(PYTHON) tools/test.py --mode=release --valgrind simple message
 
-test-all: all
+node_modules/weak:
+	@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 --prefix="$(shell pwd)"
+
+test-gc: all node_modules/weak
+	$(PYTHON) tools/test.py --mode=release gc
+
+test-all: all node_modules/weak
 	$(PYTHON) tools/test.py --mode=debug,release
 	make test-npm
 
@@ -153,6 +161,7 @@ clean:
 	$(WAF) clean
 	-find tools -name "*.pyc" | xargs rm -f
 	-rm -rf blog.html email.md
+	-rm -rf node_modules
 
 distclean: docclean
 	-find tools -name "*.pyc" | xargs rm -f