From 3671c2c17c063c42adac48bbf4ed8c6aa8988298 Mon Sep 17 00:00:00 2001
From: Trent Mick <trentm@gmail.com>
Date: Fri, 29 Jan 2016 06:47:30 +0000
Subject: [PATCH] fix 'make test4' and 'make test5'. Add testing of node 5 to
 'make testall' (working)

---
 Makefile            | 7 +++----
 test/dtrace.test.js | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index c952eaa..d2f6358 100644
--- a/Makefile
+++ b/Makefile
@@ -87,19 +87,18 @@ test: $(NODEUNIT)
 # Note: 'test10' is last so (if all is well) I end up with a binary
 # dtrace-provider build for node 0.10 (my current version).
 .PHONY: testall
-testall: test4 test012 test010
+testall: test5 test4 test012 test010
 
-#XXX Still need NPM_INSTALL_FLAGS thing?
 .PHONY: test5
 test5:
 	@echo "# Test node 5.x (with node `$(NODEOPT)/node-5/bin/node --version`)"
 	@$(NODEOPT)/node-5/bin/node --version | grep '^v5\.'
-	PATH="$(NODEOPT)/node-5/bin:$(PATH)" NPM_INSTALL_FLAGS="--nodedir=$(HOME)/src/node" make distclean all test
+	PATH="$(NODEOPT)/node-5/bin:$(PATH)" make distclean all test
 .PHONY: test4
 test4:
 	@echo "# Test node 4.x (with node `$(NODEOPT)/node-4/bin/node --version`)"
 	@$(NODEOPT)/node-4/bin/node --version | grep '^v4\.'
-	PATH="$(NODEOPT)/node-4/bin:$(PATH)" NPM_INSTALL_FLAGS="--nodedir=$(HOME)/src/node" make distclean all test
+	PATH="$(NODEOPT)/node-4/bin:$(PATH)" make distclean all test
 .PHONY: test012
 test012:
 	@echo "# Test node 0.12.x (with node `$(NODEOPT)/node-0.12/bin/node --version`)"
diff --git a/test/dtrace.test.js b/test/dtrace.test.js
index 82c1485..07094a5 100644
--- a/test/dtrace.test.js
+++ b/test/dtrace.test.js
@@ -48,6 +48,7 @@ test('basic dtrace', function (t) {
         '-c', format('node %s/log-some.js', __dirname)];
     var dtrace = spawn(argv[0], argv.slice(1));
     //console.error('ARGV: %j', argv);
+    //console.error('CMD: %s', argv.join(' '));
 
     var traces = [];
     dtrace.stdout.on('data', function (data) {