aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar donnadionne <donnadionne2011@gmail.com>2015-01-23 16:52:41 -0800
committerGravatar donnadionne <donnadionne2011@gmail.com>2015-01-23 16:52:41 -0800
commitcacae338b6cf32b8deedc26141990da78bd03034 (patch)
tree49f1a661d1c2f24313f5e430a67dfc2b11e6cf89
parent326c0abc1689676ff650305086c58d643e6d81d8 (diff)
parentdab7095fc5510c78eef150346cda15cc090fd689 (diff)
Merge pull request #190 from yang-g/creds
Creds
-rw-r--r--Makefile8
-rw-r--r--build.json2
-rw-r--r--test/cpp/interop/server.cc2
3 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 1d1aff2a6a..dff032fa65 100644
--- a/Makefile
+++ b/Makefile
@@ -2133,9 +2133,9 @@ objs/$(CONFIG)/src/cpp/util/time.o:
LIBGRPC++_TEST_UTIL_SRC = \
+ gens/test/cpp/util/messages.pb.cc \
gens/test/cpp/util/echo.pb.cc \
gens/test/cpp/util/echo_duplicate.pb.cc \
- gens/test/cpp/util/messages.pb.cc \
test/cpp/end2end/async_test_server.cc \
test/cpp/util/create_test_channel.cc \
@@ -2152,9 +2152,9 @@ libs/$(CONFIG)/libgrpc++_test_util.a: openssl_dep_error
else
ifneq ($(OPENSSL_DEP),)
+test/cpp/util/messages.proto: $(OPENSSL_DEP)
test/cpp/util/echo.proto: $(OPENSSL_DEP)
test/cpp/util/echo_duplicate.proto: $(OPENSSL_DEP)
-test/cpp/util/messages.proto: $(OPENSSL_DEP)
test/cpp/end2end/async_test_server.cc: $(OPENSSL_DEP)
test/cpp/util/create_test_channel.cc: $(OPENSSL_DEP)
endif
@@ -2183,8 +2183,8 @@ endif
-objs/$(CONFIG)/test/cpp/end2end/async_test_server.o: gens/test/cpp/util/echo.pb.cc gens/test/cpp/util/echo_duplicate.pb.cc gens/test/cpp/util/messages.pb.cc
-objs/$(CONFIG)/test/cpp/util/create_test_channel.o: gens/test/cpp/util/echo.pb.cc gens/test/cpp/util/echo_duplicate.pb.cc gens/test/cpp/util/messages.pb.cc
+objs/$(CONFIG)/test/cpp/end2end/async_test_server.o: gens/test/cpp/util/messages.pb.cc gens/test/cpp/util/echo.pb.cc gens/test/cpp/util/echo_duplicate.pb.cc
+objs/$(CONFIG)/test/cpp/util/create_test_channel.o: gens/test/cpp/util/messages.pb.cc gens/test/cpp/util/echo.pb.cc gens/test/cpp/util/echo_duplicate.pb.cc
LIBTIPS_CLIENT_LIB_SRC = \
diff --git a/build.json b/build.json
index cacbfe2ae5..1884ed22cb 100644
--- a/build.json
+++ b/build.json
@@ -405,9 +405,9 @@
"build": "private",
"language": "c++",
"src": [
+ "test/cpp/util/messages.proto",
"test/cpp/util/echo.proto",
"test/cpp/util/echo_duplicate.proto",
- "test/cpp/util/messages.proto",
"test/cpp/end2end/async_test_server.cc",
"test/cpp/util/create_test_channel.cc"
]
diff --git a/test/cpp/interop/server.cc b/test/cpp/interop/server.cc
index 5b5c35416c..8a6be57929 100644
--- a/test/cpp/interop/server.cc
+++ b/test/cpp/interop/server.cc
@@ -192,7 +192,7 @@ class TestServiceImpl : public TestService::Service {
void RunServer() {
std::ostringstream server_address;
- server_address << "localhost:" << FLAGS_port;
+ server_address << "0.0.0.0:" << FLAGS_port;
TestServiceImpl service;
SimpleRequest request;