diff options
| author | Roger Meier <roger@apache.org> | 2014-04-17 21:53:45 +0200 |
|---|---|---|
| committer | Roger Meier <roger@apache.org> | 2014-04-17 21:53:45 +0200 |
| commit | 188024e4b2a647d140d3861ca0b4f28c7d45ac1e (patch) | |
| tree | 1ec830668a89a65e4d905a4941ba03ed2d7cdf9d /test | |
| parent | 0608c6356d945d2e8acc9cf17081878373748599 (diff) | |
| download | thrift-188024e4b2a647d140d3861ca0b4f28c7d45ac1e.tar.gz | |
THRIFT-847 Test Framework harmonization across all languages
Patch: Roger Meier
make cross: cpp-java fix parameters
Diffstat (limited to 'test')
| -rwxr-xr-x | test/test.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/test.sh b/test/test.sh index dc2957164..b73635fe0 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 |