svn commit: r1343590 - in /logging/log4php/trunk: build.xml phpunit.xml src/test/php/phpunit.xml

[ih...@apache.org]

Author: ihabunek
Date: Tue May 29 07:58:32 2012
New Revision: 1343590

URL: http://svn.apache.org/viewvc?rev=1343590&view=rev
Log:
Moved phpunit.xml to project root. Adjusted build.xml accordingly.

Added:
    logging/log4php/trunk/phpunit.xml
      - copied, changed from r1334366, logging/log4php/trunk/src/test/php/phpunit.xml
Removed:
    logging/log4php/trunk/src/test/php/phpunit.xml
Modified:
    logging/log4php/trunk/build.xml

Modified: logging/log4php/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/build.xml?rev=1343590&r1=1343589&r2=1343590&view=diff
==============================================================================
--- logging/log4php/trunk/build.xml (original)
+++ logging/log4php/trunk/build.xml Tue May 29 07:58:32 2012
@@ -186,9 +186,9 @@
 	<target name="unit-testing">
 		<mkdir dir="${surefire.report}" />
 		<mkdir dir="${coverage.report}" />
-		<exec executable="${phpunit.exec}" dir="src/test/php">
-			<arg line=" --log-junit ../../../${surefire.report}/phpunit-testresults.xml" />
-			<arg line=" --coverage-html ../../../${coverage.report}" />
+		<exec executable="${phpunit.exec}" dir=".">
+			<arg line=" --log-junit ${surefire.report}/phpunit-testresults.xml" />
+			<arg line=" --coverage-html ${coverage.report}" />
 		</exec>
 		<xslt in="${surefire.report}/phpunit-testresults.xml" out="${surefire.report}/xslt.info"
 			style="src/test/config/phpunit_to_surefire.xslt" processor="trax">

Copied: logging/log4php/trunk/phpunit.xml (from r1334366, logging/log4php/trunk/src/test/php/phpunit.xml)
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/phpunit.xml?p2=logging/log4php/trunk/phpunit.xml&p1=logging/log4php/trunk/src/test/php/phpunit.xml&r1=1334366&r2=1343590&rev=1343590&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/phpunit.xml (original)
+++ logging/log4php/trunk/phpunit.xml Tue May 29 07:58:32 2012
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
@@ -13,9 +14,8 @@
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-
- -->
- <phpunit bootstrap="bootstrap.php"
+-->
+ <phpunit bootstrap="src/test/php/bootstrap.php"
 	colors="true"
 	convertErrorsToExceptions="true"
 	convertNoticesToExceptions="true"
@@ -23,17 +23,17 @@
 	stopOnFailure="false">
 
 	<testsuite name="log4php">
-		<directory>.</directory>
+		<directory>src/test/php</directory>
 	</testsuite>
 	
 	<filter>
 		<whitelist>
-			<directory suffix=".php">../../main/php</directory>
+			<directory suffix=".php">src/main/php</directory>
 		</whitelist>
 	</filter>
 	
 	<logging>
-		<log type="coverage-html" target="../../../target/test/report" charset="UTF-8" 
+		<log type="coverage-html" target="target/test/report" charset="UTF-8" 
 			yui="true" highlight="false" lowUpperBound="35" highLowerBound="70"/>
 	</logging>