commit c8744083264b8a33c633d3fb6141cf064972a606
author Nobuaki Sukegawa <nsuke@apache.org> Wed Mar 09 19:55:56 2016 +0900
committer Nobuaki Sukegawa <nsuke@apache.org> Wed Mar 09 19:55:56 2016 +0900
tree bfb47852604fd1525dac2c26fe4ed0ffe47da0e8
parent 3fe8b0fe855ec9b7adfa3ac90e6c5dae53d79738

THRIFT-3722 Fix cert path in C++ cross tests for non-Linux platform

This closes #933

test/cpp/src/TestServer.cpp

diff --git a/test/cpp/src/TestServer.cpp b/test/cpp/src/TestServer.cpp
index b3c292a..4808d89 100644
--- a/test/cpp/src/TestServer.cpp
+++ b/test/cpp/src/TestServer.cpp
@@ -65,9 +65,6 @@
 
 using namespace thrift::test;
 
-// Length of argv[0] - Length of script dir
-#define EXECUTABLE_FILE_NAME_LENGTH 19
-
 class TestHandler : public ThriftTestIf {
 public:
   TestHandler() {}
@@ -537,8 +534,9 @@
 
 int main(int argc, char** argv) {
 
-  string file_path = boost::filesystem::system_complete(argv[0]).string();
-  string dir_path = file_path.substr(0, file_path.size() - EXECUTABLE_FILE_NAME_LENGTH);
+  string testDir = boost::filesystem::system_complete(argv[0]).parent_path().parent_path().parent_path().string();
+  string certPath = testDir + "/keys/server.crt";
+  string keyPath = testDir + "/keys/server.key";
 
 #if _WIN32
   transport::TWinsockSingleton::create();
@@ -657,8 +655,8 @@
 
   if (ssl) {
     sslSocketFactory = boost::shared_ptr<TSSLSocketFactory>(new TSSLSocketFactory());
-    sslSocketFactory->loadCertificate((dir_path + "../keys/server.crt").c_str());
-    sslSocketFactory->loadPrivateKey((dir_path + "../keys/server.key").c_str());
+    sslSocketFactory->loadCertificate(certPath.c_str());
+    sslSocketFactory->loadPrivateKey(keyPath.c_str());
     sslSocketFactory->ciphers("ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH");
     serverSocket = boost::shared_ptr<TServerSocket>(new TSSLServerSocket(port, sslSocketFactory));
   } else {