Thrift test improvements, tests for both inline and normal PHP code gen
Summary: So you can A/B test and see 6ms vs. 4ms response time :)
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664773 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/test/cpp/Makefile.thrift b/test/cpp/Makefile.thrift
index f95401c..ddd6b2e 100644
--- a/test/cpp/Makefile.thrift
+++ b/test/cpp/Makefile.thrift
@@ -6,14 +6,15 @@
# Default target is everything
ifndef thrift_home
-thrift_home=../../build
+thrift_home=/usr/local
endif #thrift_home
target: all
ifndef boost_home
boost_home=../../../../../thirdparty/boost_1_33_1
-endif #thrift_home
+boost_home=/usr/local/include/boost-1_33_1
+endif #boost_home
target: all
include_paths = $(thrift_home)/include/thrift \
@@ -30,8 +31,8 @@
LD = g++
# Compiler flags
-DCFL = -Wall -O3 -g -I../cpp-gen $(include_flags) -L$(thrift_home)/lib -lthrift
-CFL = -Wall -O3 -I../cpp-gen $(include_flags) -L$(thrift_home)/lib -lthrift
+DCFL = -Wall -O3 -g -I./gen-cpp $(include_flags) -L$(thrift_home)/lib -lthrift
+CFL = -Wall -O3 -I./gen-cpp $(include_flags) -L$(thrift_home)/lib -lthrift
all: server client
@@ -41,16 +42,16 @@
$(THRIFT) --cpp ../ThriftTest.thrift
server-debug: stubs
- g++ -o TestServer $(DCFL) src/TestServer.cc ../cpp-gen/ThriftTest.cc
+ g++ -o TestServer $(DCFL) src/TestServer.cc ./gen-cpp/ThriftTest.cc
client-debug: stubs
- g++ -o TestClient $(DCFL) src/TestClient.cc ../cpp-gen/ThriftTest.cc
+ g++ -o TestClient $(DCFL) src/TestClient.cc ./gen-cpp/ThriftTest.cc
server: stubs
- g++ -o TestServer $(CFL) src/TestServer.cc ../cpp-gen/ThriftTest.cc
+ g++ -o TestServer $(CFL) src/TestServer.cc ./gen-cpp/ThriftTest.cc
client: stubs
- g++ -o TestClient $(CFL) src/TestClient.cc ../cpp-gen/ThriftTest.cc
+ g++ -o TestClient $(CFL) src/TestClient.cc ./gen-cpp/ThriftTest.cc
clean:
rm -fr TestServer TestClient ../cpp-gen