svn commit: r1404889 - in /thrift/trunk/test: nodejs/Makefile.am test.sh

[ro...@apache.org]

Author: roger
Date: Fri Nov  2 07:50:24 2012
New Revision: 1404889

URL: http://svn.apache.org/viewvc?rev=1404889&view=rev
Log:
THRIFT-847 Test Framework harmonization across all languages
add NODE_PATH
remove Unix Domain Socket used by tests

Modified:
    thrift/trunk/test/nodejs/Makefile.am
    thrift/trunk/test/test.sh

Modified: thrift/trunk/test/nodejs/Makefile.am
URL: http://svn.apache.org/viewvc/thrift/trunk/test/nodejs/Makefile.am?rev=1404889&r1=1404888&r2=1404889&view=diff
==============================================================================
--- thrift/trunk/test/nodejs/Makefile.am (original)
+++ thrift/trunk/test/nodejs/Makefile.am Fri Nov  2 07:50:24 2012
@@ -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

Modified: thrift/trunk/test/test.sh
URL: http://svn.apache.org/viewvc/thrift/trunk/test/test.sh?rev=1404889&r1=1404888&r2=1404889&view=diff
==============================================================================
--- thrift/trunk/test/test.sh (original)
+++ thrift/trunk/test/test.sh Fri Nov  2 07:50:24 2012
@@ -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" \