Prepare QPS tests for running in GCE
Edit build.json to include qps tests and credentials
Perform required MOE edits for running qps tests in VM
Minor changes to underlying source files to support
issues like more restrictive warning flags in cloud.
Change on 2014/12/17 by vpai <vpai@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=82349829
diff --git a/Makefile b/Makefile
index 1c3f77a..c2b2a0a 100644
--- a/Makefile
+++ b/Makefile
@@ -1057,6 +1057,7 @@
src/cpp/client/channel.cc \
src/cpp/client/client_context.cc \
src/cpp/client/create_channel.cc \
+ src/cpp/client/credentials.cc \
src/cpp/client/internal_stub.cc \
src/cpp/proto/proto_utils.cc \
src/cpp/rpc_method.cc \
@@ -1066,6 +1067,7 @@
src/cpp/server/server_builder.cc \
src/cpp/server/server.cc \
src/cpp/server/server_rpc_handler.cc \
+ src/cpp/server/server_credentials.cc \
src/cpp/server/thread_pool.cc \
src/cpp/stream/stream_context.cc \
src/cpp/util/status.cc \
@@ -1079,12 +1081,13 @@
include/grpc++/completion_queue.h \
include/grpc++/config.h \
include/grpc++/create_channel.h \
+ include/grpc++/credentials.h \
include/grpc++/server_builder.h \
+ include/grpc++/server_credentials.h \
include/grpc++/server.h \
include/grpc++/status.h \
include/grpc++/stream_context_interface.h \
include/grpc++/stream.h \
- include/grpc++/thread_pool_interface.h \
LIBGRPC++_OBJS = $(addprefix objs/, $(addsuffix .o, $(basename $(LIBGRPC++_SRC))))
LIBGRPC++_DEPS = $(addprefix deps/, $(addsuffix .dep, $(basename $(LIBGRPC++_SRC))))
@@ -4434,7 +4437,10 @@
QPS_CLIENT_SRC = \
- test/cpp/qps/qps_client.cc \
+ gens/test/cpp/interop/empty.pb.cc \
+ gens/test/cpp/interop/messages.pb.cc \
+ gens/test/cpp/interop/test.pb.cc \
+ test/cpp/qps/client.cc \
QPS_CLIENT_OBJS = $(addprefix objs/, $(addsuffix .o, $(basename $(QPS_CLIENT_SRC))))
QPS_CLIENT_DEPS = $(addprefix deps/, $(addsuffix .dep, $(basename $(QPS_CLIENT_SRC))))
@@ -4445,10 +4451,10 @@
else
-bins/qps_client: $(QPS_CLIENT_OBJS) libs/libgrpc_test_util.a libs/libgrpc++.a libs/libgrpc.a libs/libgpr.a
+bins/qps_client: $(QPS_CLIENT_OBJS) libs/libgrpc++_test_util.a libs/libgrpc_test_util.a libs/libgrpc++.a libs/libgrpc.a libs/libgpr.a
$(E) "[LD] Linking $@"
$(Q) mkdir -p `dirname $@`
- $(Q) $(LDXX) $(LDFLAGS) $(QPS_CLIENT_OBJS) $(GTEST_LIB) -Llibs -lgrpc_test_util -lgrpc++ -lgrpc -lgpr $(LDLIBSXX) $(LDLIBS) $(LDLIBS_SECURE) -o bins/qps_client
+ $(Q) $(LDXX) $(LDFLAGS) $(QPS_CLIENT_OBJS) $(GTEST_LIB) -Llibs -lgrpc++_test_util -lgrpc_test_util -lgrpc++ -lgrpc -lgpr $(LDLIBSXX) $(LDLIBS) $(LDLIBS_SECURE) -o bins/qps_client
endif
@@ -4468,7 +4474,10 @@
QPS_SERVER_SRC = \
- test/cpp/end2end/qps_server.cc \
+ gens/test/cpp/interop/empty.pb.cc \
+ gens/test/cpp/interop/messages.pb.cc \
+ gens/test/cpp/interop/test.pb.cc \
+ test/cpp/qps/server.cc \
QPS_SERVER_OBJS = $(addprefix objs/, $(addsuffix .o, $(basename $(QPS_SERVER_SRC))))
QPS_SERVER_DEPS = $(addprefix deps/, $(addsuffix .dep, $(basename $(QPS_SERVER_SRC))))
@@ -4479,10 +4488,10 @@
else
-bins/qps_server: $(QPS_SERVER_OBJS) libs/libgrpc_test_util.a libs/libgrpc++.a libs/libgrpc.a libs/libgpr.a
+bins/qps_server: $(QPS_SERVER_OBJS) libs/libgrpc++_test_util.a libs/libgrpc_test_util.a libs/libgrpc++.a libs/libgrpc.a libs/libgpr.a
$(E) "[LD] Linking $@"
$(Q) mkdir -p `dirname $@`
- $(Q) $(LDXX) $(LDFLAGS) $(QPS_SERVER_OBJS) $(GTEST_LIB) -Llibs -lgrpc_test_util -lgrpc++ -lgrpc -lgpr $(LDLIBSXX) $(LDLIBS) $(LDLIBS_SECURE) -o bins/qps_server
+ $(Q) $(LDXX) $(LDFLAGS) $(QPS_SERVER_OBJS) $(GTEST_LIB) -Llibs -lgrpc++_test_util -lgrpc_test_util -lgrpc++ -lgrpc -lgpr $(LDLIBSXX) $(LDLIBS) $(LDLIBS_SECURE) -o bins/qps_server
endif