THRIFT-847 Test Framework harmonization across all languages

add NODE_PATH
remove Unix Domain Socket used by tests

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1404889 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/nodejs/Makefile.am b/test/nodejs/Makefile.am
index fc8e7d0..32397f1 100755 (executable)
--- a/test/nodejs/Makefile.am
+++ b/test/nodejs/Makefile.am
@@ -27,7 +27,7 @@ clean-local:
        $(RM) -r gen-nodejs
 
 server: stubs
-       NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift node server.js
+       NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift:$(NODE_PATH) node server.js
 
 client: stubs
-       NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift node client.js
+       NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift:$(NODE_PATH) node client.js

diff --git a/test/test.sh b/test/test.sh
index 36e57c3..2e53fb0 100755 (executable)
--- a/test/test.sh
+++ b/test/test.sh
@@ -94,6 +94,9 @@ for proto in $protocols; do
   done;
 done;
 
+# delete Unix Domain Socket used by cpp tests
+rm -f /tmp/ThriftTest.thrift
+
 do_test "py-py" "binary" "buffered-ip" \
         "py/TestClient.py --proto=binary --port=9090 --host=localhost --genpydir=py/gen-py" \
         "py/TestServer.py --proto=binary --port=9090 --genpydir=py/gen-py TSimpleServer" \