Author: carnold
Date: Mon Jul 16 20:09:02 2007
New Revision: 556796
URL: http://svn.apache.org/viewvc?view=rev&rev=556796
Log:
unit tests should now work with Maven
Modified:
incubator/log4php/trunk/build.xml
incubator/log4php/trunk/src/test/php/phpunit.php
Modified: incubator/log4php/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/build.xml?view=diff&rev=556796&r1=556795&r2=556796
==============================================================================
--- incubator/log4php/trunk/build.xml (original)
+++ incubator/log4php/trunk/build.xml Mon Jul 16 20:09:02 2007
@@ -46,7 +46,7 @@
<target name="test">
<!-- PHPUnit3 must be installed for this to work.
See http://www.phpunit.de -->
- <exec executable="phpunit" failonerror="false" dir="src/test/php">
+ <exec executable="phpunit" failonerror="true" dir="src/test/php">
<arg value="AllTests"/>
<arg value="AllTests.php"/>
</exec>
@@ -55,7 +55,7 @@
<target name="apidocs">
<!-- PHPDoc must be installed for this to work. -->
<mkdir dir="target/site/apidocs"/>
- <exec executable="phpdoc" failonerror="false">
+ <exec executable="phpdoc" failonerror="true">
<arg value="-d"/>
<arg value="src/main/php"/>
<arg value="-t"/>
Modified: incubator/log4php/trunk/src/test/php/phpunit.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/phpunit.php?view=diff&rev=556796&r1=556795&r2=556796
==============================================================================
--- incubator/log4php/trunk/src/test/php/phpunit.php (original)
+++ incubator/log4php/trunk/src/test/php/phpunit.php Mon Jul 16 20:09:02 2007
@@ -1 +1,20 @@
-<?php
if (!defined('LOG4PHP_DIR')) {
define('LOG4PHP_DIR', dirname(__FILE__).'/../log4php');
}
if (!defined('LOG4PHP_DEFAULT_INIT_OVERRIDE')) {
define('LOG4PHP_DEFAULT_INIT_OVERRIDE', true);
}
set_include_path(LOG4PHP_DIR.':'.get_include_path());
require_once 'PHPUnit/Framework/TestCase.php';
require_once 'PHPUnit/Framework/IncompleteTestError.php';
require_once 'PHPUnit/Framework/TestSuite.php';
require_once 'PHPUnit/TextUI/TestRunner.php';
require_once 'PHPUnit/Util/Filter.php';
?>
\ No newline at end of file
+<?php
+
+if (!defined('LOG4PHP_DIR')) {
+ define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
+}
+
+if (!defined('LOG4PHP_DEFAULT_INIT_OVERRIDE')) {
+ define('LOG4PHP_DEFAULT_INIT_OVERRIDE', true);
+}
+
+set_include_path(LOG4PHP_DIR.':'.get_include_path());
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/IncompleteTestError.php';
+require_once 'PHPUnit/Framework/TestSuite.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+require_once 'PHPUnit/Util/Filter.php';
+
+
+?>
