Index: branches/5.2.x/tools/build/targets/common.xml
===================================================================
diff -u -r16821 -r16822
--- branches/5.2.x/tools/build/targets/common.xml	(.../common.xml)	(revision 16821)
+++ branches/5.2.x/tools/build/targets/common.xml	(.../common.xml)	(revision 16822)
@@ -31,7 +31,7 @@
 
 	<target name="build" description="Builds a project" depends="init,verify,analyze"/>
 
-	<target name="build-parallel" description="Builds a project (long targets executed in parallel)" depends="init,tools-parallel,phpunit"/>
+	<target name="build-parallel" description="Builds a project (long targets executed in parallel)" depends="init,tools-parallel,phpunit-ci"/>
 
 	<target name="tools-parallel" description="Run tools in parallel">
 		<parallel threadCount="2">
@@ -51,7 +51,7 @@
 
 	Make sure that our code is clean and functional. -->
 	<target name="verify" description="Verify code consistency" depends="init"/>
-	<!--<target name="verify" description="Verify code consistency" depends="init,phpunit"/>-->
+	<!--<target name="verify" description="Verify code consistency" depends="init,phpunit-ci"/>-->
 
 	<!-- ### Analyze code
 
@@ -188,15 +188,64 @@
 		</phpdoc2>
 	</target>
 
-	<target name="phpunit" description="Run tests with PHPUnit" depends="init">
-		<exec executable="phpunit" logoutput="true" checkreturn="true">
-			<arg value="--configuration"/>
-			<arg path="${build.config.dir}/phpunit.xml"/>
-			<arg value="--testsuite"/>
-			<arg value="custom"/>
-		</exec>
+	<target name="phpunit" description="Run tests with PHPUnit (print human-readable output)" depends="init">
+		<if>
+			<istrue value="${phpunit.testsuite}"/>
+			<then>
+				<exec executable="${php.binary}" checkreturn="true" passthru="true" dir="${base.dir}">
+					<arg value="${vendor.dir}/bin/phpunit"/>
+					<arg value="--configuration"/>
+					<arg path="${phpunit.config.file}"/>
+
+					<arg value="--testsuite"/>
+					<arg value="${phpunit.testsuite}"/>
+				</exec>
+			</then>
+			<else>
+				<exec executable="${php.binary}" checkreturn="true" passthru="true" dir="${base.dir}">
+					<arg value="${vendor.dir}/bin/phpunit"/>
+					<arg value="--configuration"/>
+					<arg path="${phpunit.config.file}"/>
+				</exec>
+			</else>
+		</if>
 	</target>
 
+	<target name="phpunit-ci" description="Run tests with PHPUnit (creates a log file for the CI server)" depends="init">
+		<if>
+			<istrue value="${phpunit.testsuite}"/>
+			<then>
+				<exec executable="${php.binary}" checkreturn="true" passthru="true" dir="${base.dir}">
+					<arg value="${vendor.dir}/bin/phpunit"/>
+					<arg value="--configuration"/>
+					<arg path="${phpunit.config.file}"/>
+
+					<arg value="--testsuite"/>
+					<arg value="${phpunit.testsuite}"/>
+
+					<arg path="--log-junit"/>
+					<arg path="${build.logs.dir}/junit.xml"/>
+
+					<arg path="--coverage-clover"/>
+					<arg path="${build.logs.dir}/clover.xml"/>
+				</exec>
+			</then>
+			<else>
+				<exec executable="${php.binary}" checkreturn="true" passthru="true" dir="${base.dir}">
+					<arg value="${vendor.dir}/bin/phpunit"/>
+					<arg value="--configuration"/>
+					<arg path="${phpunit.config.file}"/>
+
+					<arg path="--log-junit"/>
+					<arg path="${build.logs.dir}/junit.xml"/>
+
+					<arg path="--coverage-clover"/>
+					<arg path="${build.logs.dir}/clover.xml"/>
+				</exec>
+			</else>
+		</if>
+	</target>
+
 	<target name="init" depends="create-aliases,folders-create,deploy-ci" description="Prepare for build">
 	</target>