THRIFT-847 Test Framework harmonization across all languages

add php TestClient to the testsuite

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1234292 13f79535-47bb-0310-9956-ffa450edef68

.gitignore

@@ -217,6 +217,8 @@
 /test/perl/Makefile
 /test/perl/Makefile.in
 /test/php/gen-*
+/test/php/Makefile
+/test/php/Makefile.in
 /test/py/Makefile
 /test/py/Makefile.in
 /test/py/gen-py
@@ -236,4 +238,4 @@
 *.cache
 *.user
 *.ipch
-*.sdf
+*.sdf

configure.ac

@@ -493,6 +493,7 @@ AC_CONFIG_FILES([
   test/cpp/Makefile
   test/hs/Makefile
   test/nodejs/Makefile
+  test/php/Makefile
   test/perl/Makefile
   test/py/Makefile
   test/py.twisted/Makefile

test/Makefile.am

@@ -27,6 +27,10 @@ if WITH_PERL
 SUBDIRS += perl
 endif
 
+if WITH_PHP
+SUBDIRS += php
+endif
+
 if WITH_PYTHON
 SUBDIRS += py
 SUBDIRS += py.twisted

test/php/Makefile → test/php/Makefile.am

@@ -17,23 +17,16 @@
 # under the License.
 #
 
-# Default target is everything
-target: all
-
-# Tools
-THRIFT = ../../compiler/cpp/thrift
-
-all: normal inline
-
-normal: stubs
-
-inline: stubs-inline
+THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
 stubs: ../ThriftTest.thrift
 	$(THRIFT) --gen php ../ThriftTest.thrift
-
-stubs-inline: ../ThriftTest.thrift
 	$(THRIFT) --gen php:inlined ../ThriftTest.thrift
 
-clean:
+check: stubs
+
+clean-local:
 	$(RM) -r gen-php gen-phpi
+
+client: stubs
+	php TestClient.php

test/test.sh

@@ -118,6 +118,10 @@ do_test "perl-cpp"  "binary" "buffered-ip" \
         "perl -I perl/gen-perl/ -I../lib/perl/lib/ perl/TestClient.pl" \
         "cpp/TestServer" \
         "10"
+do_test "php-cpp"  "binary" "buffered-ip" \
+        "make -C php/ client" \
+        "cpp/TestServer" \
+        "10"
 do_test "nodejs-nodejs" "binary" "framed-ip" \
         "make -C nodejs/ client" \
         "make -C nodejs/ server" \