diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-03-26 16:37:26 -0700 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-03-26 16:37:26 -0700 |
| commit | a8c7c201a46b14b3101b72025b1968a40b619a62 (patch) | |
| tree | fdabc6610cc8bc886a95234cde049c9227613803 | |
| parent | 10dd2a160ab9fc5d0fe9805edf1c06ffc8f7ad58 (diff) | |
| parent | 6130809a8bc792c952cb15f4931634cc47b35219 (diff) | |
Merge pull request #1139 from vjpai/fix_tests_4_4
Fix most c++ tests for gcc 4.4
| -rw-r--r-- | test/cpp/end2end/async_end2end_test.cc | 10 | ||||
| -rw-r--r-- | test/cpp/interop/server.cc | 7 | ||||
| -rw-r--r-- | test/cpp/qps/timer.cc | 1 |
3 files changed, 13 insertions, 5 deletions
diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index 233c5b13a7..9938fcf12e 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -532,15 +532,19 @@ TEST_F(AsyncEnd2endTest, MetadataRpc) { send_request.set_message("Hello"); std::pair<grpc::string, grpc::string> meta1("key1", "val1"); std::pair<grpc::string, grpc::string> meta2( - "key2-bin", {"\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc", 13}); + "key2-bin", + grpc::string("\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc", + 13)); std::pair<grpc::string, grpc::string> meta3("key3", "val3"); std::pair<grpc::string, grpc::string> meta6( "key4-bin", - {"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d", 14}); + grpc::string("\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d", + 14)); std::pair<grpc::string, grpc::string> meta5("key5", "val5"); std::pair<grpc::string, grpc::string> meta4( "key6-bin", - {"\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee", 15}); + grpc::string("\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee", + 15)); cli_ctx.AddMetadata(meta1.first, meta1.second); cli_ctx.AddMetadata(meta2.first, meta2.second); diff --git a/test/cpp/interop/server.cc b/test/cpp/interop/server.cc index eceb600d4c..780a7370ac 100644 --- a/test/cpp/interop/server.cc +++ b/test/cpp/interop/server.cc @@ -213,8 +213,11 @@ void RunServer() { builder.RegisterService(&service); std::shared_ptr<ServerCredentials> creds = grpc::InsecureServerCredentials(); if (FLAGS_enable_ssl) { - SslServerCredentialsOptions ssl_opts = { - "", {{test_server1_key, test_server1_cert}}}; + SslServerCredentialsOptions::PemKeyCertPair pkcp = {test_server1_key, + test_server1_cert}; + SslServerCredentialsOptions ssl_opts; + ssl_opts.pem_root_certs = ""; + ssl_opts.pem_key_cert_pairs.push_back(pkcp); creds = grpc::SslServerCredentials(ssl_opts); } builder.AddListeningPort(server_address.str(), creds); diff --git a/test/cpp/qps/timer.cc b/test/cpp/qps/timer.cc index 3c1342041c..d1b6bc1e55 100644 --- a/test/cpp/qps/timer.cc +++ b/test/cpp/qps/timer.cc @@ -36,6 +36,7 @@ #include <sys/time.h> #include <sys/resource.h> #include <grpc/support/time.h> +#include <grpc++/config.h> Timer::Timer() : start_(Sample()) {} |