You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2014/05/27 23:58:21 UTC
[1/2] git commit: THRIFT-847 Test Framework harmonization across all
languages
Repository: thrift
Updated Branches:
refs/heads/master 0cf802a36 -> 44460e2e7
THRIFT-847 Test Framework harmonization across all languages
Patch: Chamila Dilshan Wijayarathna
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/5c6ad242
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/5c6ad242
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/5c6ad242
Branch: refs/heads/master
Commit: 5c6ad2427c67023a67e873d2e389838394053272
Parents: 8fcc82b
Author: Roger Meier <ro...@apache.org>
Authored: Tue May 27 21:18:00 2014 +0200
Committer: Roger Meier <ro...@apache.org>
Committed: Tue May 27 21:18:00 2014 +0200
----------------------------------------------------------------------
test/test.sh | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/5c6ad242/test/test.sh
----------------------------------------------------------------------
diff --git a/test/test.sh b/test/test.sh
index a2610d9..f193133 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -317,6 +317,39 @@ for proto in $(intersection "${nodejs_protocols}" "${cpp_protocols}"); do
done
done
+######### nodejs client - java server ##############
+##
+for proto in $(intersection "${nodejs_protocols}" "${java_protocols}"); do
+ for trans in $(intersection "${nodejs_transports}" "${java_server_transports}"); do
+ for sock in $(intersection "${nodejs_sockets}" "${java_sockets}"); do
+ case "$sock" in
+ "ip" ) extraparam="";;
+ "ip-ssl" ) extraparam="--ssl";;
+ esac
+ do_test "nodejs-java" "${proto}" "${trans}-${sock}" \
+ "node ${NODE_TEST_DIR}/client.js -p ${proto} -t ${trans} ${extraparam}" \
+ "ant -f ../lib/java/build.xml -Dno-gen-thrift=\"\" -Dtestargs \"--protocol=${proto} --transport=${trans} ${extraparam}\" run-testserver" \
+ "5" "1"
+ done
+ done
+done
+
+######### java client - nodejs server ##############
+for proto in $(intersection "${nodejs_protocols}" "${java_protocols}"); do
+ for trans in $(intersection "${nodejs_transports}" "${java_client_transports}"); do
+ for sock in $(intersection "${nodejs_sockets}" "${java_sockets}"); do
+ case "$sock" in
+ "ip" ) extraparam="";;
+ "ip-ssl" ) extraparam="--ssl";;
+ esac
+ do_test "java-nodejs" "${proto}" "${trans}-${sock}" \
+ "ant -f ../lib/java/build.xml -Dno-gen-thrift=\"\" -Dtestargs \"--protocol=${proto} --transport=${trans} ${extraparam}\" run-testclient" \
+ "node ${NODE_TEST_DIR}/server.js -p ${proto} -t ${trans} ${extraparam}" \
+ "5" "2"
+ done
+ done
+done
+
# delete Unix Domain Socket used by cpp tests
rm -f /tmp/ThriftTest.thrift
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/thrift
Posted by ro...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/44460e2e
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/44460e2e
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/44460e2e
Branch: refs/heads/master
Commit: 44460e2e7a79c0e06bb473379c161353bc733cf8
Parents: 5c6ad24 0cf802a
Author: Roger Meier <ro...@apache.org>
Authored: Tue May 27 23:57:38 2014 +0200
Committer: Roger Meier <ro...@apache.org>
Committed: Tue May 27 23:57:38 2014 +0200
----------------------------------------------------------------------
configure.ac | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------