TheThing/node-bunyan-lite
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Wiki Activity

fix 'make test4' and 'make test5'. Add testing of node 5 to 'make testall' (working)

Browse source
This commit is contained in:
Trent Mick 2016-01-29 06:47:30 +00:00
parent 2c9c83d4c3
commit 3671c2c17c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -87,19 +87,18 @@ test: $(NODEUNIT)
# Note: 'test10' is last so (if all is well) I end up with a binary # 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). # dtrace-provider build for node 0.10 (my current version).
.PHONY: testall .PHONY: testall
testall: test4 test012 test010 testall: test5 test4 test012 test010
#XXX Still need NPM_INSTALL_FLAGS thing?
.PHONY: test5 .PHONY: test5
test5: test5:
@echo "# Test node 5.x (with node `$(NODEOPT)/node-5/bin/node --version`)" @echo "# Test node 5.x (with node `$(NODEOPT)/node-5/bin/node --version`)"
@$(NODEOPT)/node-5/bin/node --version | grep '^v5\.' @$(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 .PHONY: test4
test4: test4:
@echo "# Test node 4.x (with node `$(NODEOPT)/node-4/bin/node --version`)" @echo "# Test node 4.x (with node `$(NODEOPT)/node-4/bin/node --version`)"
@$(NODEOPT)/node-4/bin/node --version | grep '^v4\.' @$(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 .PHONY: test012
test012: test012:
@echo "# Test node 0.12.x (with node `$(NODEOPT)/node-0.12/bin/node --version`)" @echo "# Test node 0.12.x (with node `$(NODEOPT)/node-0.12/bin/node --version`)"

1
test/dtrace.test.js
View file

@ -48,6 +48,7 @@ test('basic dtrace', function (t) {
'-c', format('node %s/log-some.js', __dirname)]; '-c', format('node %s/log-some.js', __dirname)];
var dtrace = spawn(argv[0], argv.slice(1)); var dtrace = spawn(argv[0], argv.slice(1));
//console.error('ARGV: %j', argv); //console.error('ARGV: %j', argv);
//console.error('CMD: %s', argv.join(' '));
var traces = []; var traces = [];
dtrace.stdout.on('data', function (data) { dtrace.stdout.on('data', function (data) {