You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by he...@apache.org on 2013/05/11 20:44:46 UTC
[2/5] git commit: ignoring test if node is not present
ignoring test if node is not present
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/4e1ef5be
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/4e1ef5be
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/4e1ef5be
Branch: refs/heads/master
Commit: 4e1ef5becef44951333bd63871673fc52afd81a2
Parents: 2a592b2
Author: Henrique <henrique@henrique-vb.(none)>
Authored: Sat May 11 01:24:59 2013 +0200
Committer: Henrique <henrique@henrique-vb.(none)>
Committed: Sat May 11 01:24:59 2013 +0200
----------------------------------------------------------------------
test/nodejs/Makefile.am | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/4e1ef5be/test/nodejs/Makefile.am
----------------------------------------------------------------------
diff --git a/test/nodejs/Makefile.am b/test/nodejs/Makefile.am
index 8f74ba8..06e2eec 100755
--- a/test/nodejs/Makefile.am
+++ b/test/nodejs/Makefile.am
@@ -22,14 +22,15 @@ stubs: ../ThriftTest.thrift
$(THRIFT) --gen js:node ../ThriftTest.thrift
check: stubs
- @if which expresso &> /dev/null ; then \
+ @if which nodeunit &> /dev/null ; then \
echo " Testing thrift/binary"; \
NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift:$(NODE_PATH) nodeunit ../../lib/nodejs/test/binary.test.js; \
fi
- timeout 2 $(MAKE) server &
- @sleep 1
- $(MAKE) client
- @sleep 1
+ @if which node &> /dev/null ; then \
+ echo " Testing Client/Server"; \
+ timeout 2 $(MAKE) server & \
+ sleep 1; $(MAKE) client; sleep 1; \
+ fi
clean-local:
$(RM) -r gen-nodejs