From: Roger Meier <roger@apache.org>
Date: Tue, 24 Jan 2012 20:18:07 +0000 (+0000)
Subject: THRIFT-1478 TJSONProtocol in PHP
X-Git-Tag: 0.9.1~458
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=ac70b5f832ddcc9cd2733ed0361536a58a6ec861;p=common%2Fthrift.git

THRIFT-1478 TJSONProtocol in PHP
fix: remove dist and add lunit log format

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

diff --git a/.gitignore b/.gitignore
index acbade12..b97e312d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -182,6 +182,8 @@
 /lib/php/src/ext/thrift_protocol/php_thrift_protocol.lo
 /lib/php/src/ext/thrift_protocol/run-tests.php
 /lib/php/src/ext/thrift_protocol/thrift_protocol.la
+/lib/php/test/Makefile
+/lib/php/test/Makefile.in
 /lib/erl/logs/
 /lib/erl/Makefile
 /lib/erl/Makefile.in
diff --git a/lib/php/test/Makefile.am b/lib/php/test/Makefile.am
index 7739ac8a..a4b71dba 100755
--- a/lib/php/test/Makefile.am
+++ b/lib/php/test/Makefile.am
@@ -25,12 +25,9 @@ stubs: ../../../test/ThriftTest.thrift
 
 if HAVE_PHPUNIT
 check: stubs
-	$(PHPUNIT) protocol/TestTJSONProtocol.php
+	$(PHPUNIT) --log-junit=phpunit.xml protocol/TestTJSONProtocol.php
 endif
 
 clean-local:
 	$(RM) -r gen-php
 
-EXTRA_DIST = \
-	Fixtures.cpp \
-	protocol/TestTJSONProtocol.php