You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4php-dev@logging.apache.org by ch...@apache.org on 2009/10/27 21:53:04 UTC

svn commit: r830332 - /incubator/log4php/trunk/pom.xml

Author: chammers
Date: Tue Oct 27 20:53:04 2009
New Revision: 830332

URL: http://svn.apache.org/viewvc?rev=830332&view=rev
Log:
* merged the two phpunit executions for the code coverage and surefire report
  into one to speed up the build process.
* reordered elements to <id><phase><goals> like the others are 

Modified:
    incubator/log4php/trunk/pom.xml

Modified: incubator/log4php/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/pom.xml?rev=830332&r1=830331&r2=830332&view=diff
==============================================================================
--- incubator/log4php/trunk/pom.xml (original)
+++ incubator/log4php/trunk/pom.xml Tue Oct 27 20:53:04 2009
@@ -231,18 +231,22 @@
 						</configuration>
 					</execution>
 					<!--+
-                        | PHPUnit must be installed for this execution 
+                        | PHPUnit (and XDebug for the coverage report) must be installed for this execution 
                         +-->      
 					<execution>
-                        <phase>test</phase>
                         <id>test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
                         <configuration>
                             
                             <tasks>
                                 <mkdir dir="${surefire.reports}" />
+                                <mkdir dir="${coverage.report}" />
                                 <exec executable="phpunit" dir="src/test/php">
-                                    <arg
-                                        line=" --log-junit ../../../${surefire.reports}/phpunit-testresults.xml ." />
+                                    <arg line=" --log-junit ../../../${surefire.reports}/phpunit-testresults.xml" />
+                                    <arg line=" --coverage-html ../../../${coverage.report}" />
                                 </exec>
 
                                 <xslt in="${surefire.reports}/phpunit-testresults.xml" out="${surefire.reports}/xslt.info"
@@ -251,26 +255,6 @@
                                 </xslt>
                             </tasks>
                         </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    
-                    <!-- This execution depends on XDebug -->
-                    <execution>
-                        <phase>pre-site</phase>
-                        <id>codecoverage</id>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="${coverage.report}" />
-                                <exec executable="phpunit" dir="src/test/php">
-                                    <arg line=" --report ../../../${coverage.report} ." />
-                                </exec>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
                     </execution>
 				</executions>
 			</plugin>