From: Roger Meier <roger@apache.org>
Date: Thu, 17 Apr 2014 19:53:45 +0000 (+0200)
Subject: THRIFT-847 Test Framework harmonization across all languages
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=188024e4b2a647d140d3861ca0b4f28c7d45ac1e;p=common%2Fthrift.git

THRIFT-847 Test Framework harmonization across all languages
Patch: Roger Meier
make cross: cpp-java fix parameters
---

diff --git a/test/test.sh b/test/test.sh
index dc295716..b73635fe 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