Repository: thrift Updated Branches: refs/heads/master 0608c6356 -> 188024e4b
THRIFT-847 Test Framework harmonization across all languages Patch: Roger Meier make cross: cpp-java fix parameters Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/188024e4 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/188024e4 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/188024e4 Branch: refs/heads/master Commit: 188024e4b2a647d140d3861ca0b4f28c7d45ac1e Parents: 0608c63 Author: Roger Meier <[email protected]> Authored: Thu Apr 17 21:53:45 2014 +0200 Committer: Roger Meier <[email protected]> Committed: Thu Apr 17 21:53:45 2014 +0200 ---------------------------------------------------------------------- test/test.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/188024e4/test/test.sh ---------------------------------------------------------------------- diff --git a/test/test.sh b/test/test.sh index dc29571..b73635f 100755 --- a/test/test.sh +++ b/test/test.sh @@ -146,7 +146,7 @@ for proto in $(intersection "${java_protocols}" "${cpp_protocols}"); do "ip" ) extraparam="";; "ip-ssl" ) extraparam="--ssl";; esac - do_test "java-cpp" "${proto}" "${trans}-ip" \ + do_test "java-cpp" "${proto}" "${trans}-${sock}" \ "ant -f ../lib/java/build.xml -Dno-gen-thrift=\"\" -Dtestargs \"--protocol=${proto} --transport=${trans} ${extraparam}\" testclient" \ "cpp/TestServer --protocol=${proto} --transport=${trans} ${extraparam}"\ "10" "15" @@ -162,9 +162,9 @@ for proto in $(intersection "${cpp_protocols}" "${java_protocols}"); do "ip" ) extraparam="";; "ip-ssl" ) extraparam="--ssl";; esac - do_test "cpp-java" "${proto}" "${trans}-ip" \ - "cpp/TestClient --protocol=${proto} --transport=${trans}" \ - "ant -f ../lib/java/build.xml -Dno-gen-thrift=\"\" -Dtestargs \"--protocol=${proto} --transport=${trans}\" testserver" \ + do_test "cpp-java" "${proto}" "${trans}-${sock}" \ + "cpp/TestClient --protocol=${proto} --transport=${trans} ${extraparam}" \ + "ant -f ../lib/java/build.xml -Dno-gen-thrift=\"\" -Dtestargs \"--protocol=${proto} --transport=${trans} ${extraparam}\" testserver" \ "15" "10" done done
