You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ca...@apache.org on 2007/06/21 02:48:56 UTC
svn commit: r549310 - in /logging/log4j/branches/v1_2-branch/tests:
build.xml run-tests.bat
Author: carnold
Date: Wed Jun 20 17:48:55 2007
New Revision: 549310
URL: http://svn.apache.org/viewvc?view=rev&rev=549310
Log:
Bug 37930: Update tests/build.xml for Maven and run-tests.bat for new tests
Modified:
logging/log4j/branches/v1_2-branch/tests/build.xml
logging/log4j/branches/v1_2-branch/tests/run-tests.bat
Modified: logging/log4j/branches/v1_2-branch/tests/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/build.xml?view=diff&rev=549310&r1=549309&r2=549310
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/build.xml (original)
+++ logging/log4j/branches/v1_2-branch/tests/build.xml Wed Jun 20 17:48:55 2007
@@ -46,7 +46,6 @@
<!-- The directory where source files are stored. -->
<property name="project.source.home" value="../src/main/java/"/>
<property name="project.classes.home" value="../dist/classes/"/>
- <property name="project.lib.home" value="../dist/lib/"/>
<property name="tests.source.home" value="./src/java/"/>
<property name="excludes" value=""/>
@@ -97,6 +96,10 @@
</target>
<target name="prepare">
+ <!-- if target directory available, use it
+ otherwise assume it is a distribution and jar is in root -->
+ <available property="project.lib.home" value="../target" file="../target"/>
+ <property name="project.lib.home" value=".."/>
<mkdir dir="./classes" />
<mkdir dir="./output" />
<condition property="is-windows" value="true">
Modified: logging/log4j/branches/v1_2-branch/tests/run-tests.bat
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/run-tests.bat?view=diff&rev=549310&r1=549309&r2=549310
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/run-tests.bat (original)
+++ logging/log4j/branches/v1_2-branch/tests/run-tests.bat Wed Jun 20 17:48:55 2007
@@ -1,50 +1,65 @@
-' Batch file for running tests on JDK 1.1
-'
-SET CLASSPATH=\java\junit3.8.1\junit.jar;\java\crimson-1.1.3\crimson.jar;\java\jakarta-oro-2.0.8\jakarta-oro-2.0.8.jar;..\dist\classes;classes;..\..\classes;resources;%log4j.jar%
-mkdir classes
+rem Batch file for running tests on JDK 1.1
+rem
+SET CLASSPATH=\java\junit3.8.1\junit.jar;\java\crimson-1.1.3\crimson.jar;\java\jakarta-oro-2.0.8\jakarta-oro-2.0.8.jar;target\classes;..\..\target\classes;resources;%log4j.jar%
+mkdir target
+mkdir target\classes
cd src\java
-javac -d ..\..\classes org\apache\log4j\util\SerializationTestHelper.java
-javac -d ..\..\classes org\apache\log4j\spi\LoggingEventTest.java
-javac -d ..\..\classes org\apache\log4j\LevelTest.java
-javac -d ..\..\classes org\apache\log4j\FileAppenderTest.java
-javac -d ..\..\classes org\apache\log4j\CoreTestSuite.java
-javac -d ..\..\classes org\apache\log4j\util\UnexpectedFormatException.java
-javac -d ..\..\classes org\apache\log4j\util\Filter.java
-javac -d ..\..\classes org\apache\log4j\util\Compare.java
-javac -d ..\..\classes org\apache\log4j\util\ControlFilter.java
-javac -d ..\..\classes org\apache\log4j\util\Transformer.java
-javac -d ..\..\classes org\apache\log4j\util\LineNumberFilter.java
-javac -d ..\..\classes org\apache\log4j\util\AbsoluteDateAndTimeFilter.java
-javac -d ..\..\classes org\apache\log4j\MinimumTestCase.java
-javac -d ..\..\classes org\apache\log4j\VectorAppender.java
-javac -d ..\..\classes org\apache\log4j\LoggerTestCase.java
-javac -d ..\..\classes org\apache\log4j\util\ISO8601Filter.java
-javac -d ..\..\classes org\apache\log4j\util\SunReflectFilter.java
-javac -d ..\..\classes org\apache\log4j\util\JunitTestRunnerFilter.java
-javac -d ..\..\classes org\apache\log4j\xml\DOMTestCase.java
-javac -d ..\..\classes org\apache\log4j\xml\XLevel.java
-javac -d ..\..\classes org\apache\log4j\xml\CustomLevelTestCase.java
-javac -d ..\..\classes org\apache\log4j\customLogger\XLogger.java
-javac -d ..\..\classes org\apache\log4j\customLogger\XLoggerTestCase.java
-javac -d ..\..\classes org\apache\log4j\defaultInit\TestCase1.java
-javac -d ..\..\classes org\apache\log4j\defaultInit\TestCase3.java
-javac -d ..\..\classes org\apache\log4j\defaultInit\TestCase4.java
-javac -d ..\..\classes org\apache\log4j\util\XMLTimestampFilter.java
-javac -d ..\..\classes org\apache\log4j\util\XMLLineAttributeFilter.java
-javac -d ..\..\classes org\apache\log4j\xml\XMLLayoutTestCase.java
-javac -d ..\..\classes org\apache\log4j\AsyncAppenderTestCase.java
-javac -d ..\..\classes org\apache\log4j\helpers\OptionConverterTestCase.java
-javac -d ..\..\classes org\apache\log4j\helpers\BoundedFIFOTestCase.java
-javac -d ..\..\classes org\apache\log4j\helpers\CyclicBufferTestCase.java
-javac -d ..\..\classes org\apache\log4j\or\ORTestCase.java
-javac -d ..\..\classes org\apache\log4j\varia\LevelMatchFilterTestCase.java
-javac -d ..\..\classes org\apache\log4j\helpers\PatternParserTestCase.java
-javac -d ..\..\classes org\apache\log4j\util\AbsoluteTimeFilter.java
-javac -d ..\..\classes org\apache\log4j\util\RelativeTimeFilter.java
-javac -d ..\..\classes org\apache\log4j\PatternLayoutTestCase.java
-javac -d ..\..\classes org\apache\log4j\MyPatternParser.java
-javac -d ..\..\classes org\apache\log4j\MyPatternLayout.java
-javac -d ..\..\classes org\apache\log4j\DRFATestCase.java
+javac -d ..\..\target\classes org\apache\log4j\util\SerializationTestHelper.java
+javac -d ..\..\target\classes org\apache\log4j\spi\LoggingEventTest.java
+javac -d ..\..\target\classes org\apache\log4j\LevelTest.java
+javac -d ..\..\target\classes org\apache\log4j\FileAppenderTest.java
+javac -d ..\..\target\classes org\apache\log4j\PriorityTest.java
+javac -d ..\..\target\classes org\apache\log4j\CategoryTest.java
+javac -d ..\..\target\classes org\apache\log4j\LogManagerTest.java
+javac -d ..\..\target\classes org\apache\log4j\helpers\LogLogTest.java
+javac -d ..\..\target\classes org\apache\log4j\LayoutTest.java
+javac -d ..\..\target\classes org\apache\log4j\helpers\DateLayoutTest.java
+javac -d ..\..\target\classes org\apache\log4j\TTCCLayoutTest.java
+javac -d ..\..\target\classes org\apache\log4j\xml\XMLLayoutTest.java
+javac -d ..\..\target\classes org\apache\log4j\HTMLLayoutTest.java
+javac -d ..\..\target\classes org\apache\log4j\PatternLayoutTest.java
+javac -d ..\..\target\classes org\apache\log4j\spi\ThrowableInformationTest.java
+javac -d ..\..\target\classes org\apache\log4j\spi\LocationInfoTest.java
+javac -d ..\..\target\classes org\apache\log4j\PropertyConfiguratorTest.java
+javac -d ..\..\target\classes org\apache\log4j\CoreTestSuite.java
+javac -d ..\..\target\classes org\apache\log4j\util\UnexpectedFormatException.java
+javac -d ..\..\target\classes org\apache\log4j\util\Filter.java
+javac -d ..\..\target\classes org\apache\log4j\util\Compare.java
+javac -d ..\..\target\classes org\apache\log4j\util\ControlFilter.java
+javac -d ..\..\target\classes org\apache\log4j\util\Transformer.java
+javac -d ..\..\target\classes org\apache\log4j\util\LineNumberFilter.java
+javac -d ..\..\target\classes org\apache\log4j\util\AbsoluteDateAndTimeFilter.java
+javac -d ..\..\target\classes org\apache\log4j\MinimumTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\VectorAppender.java
+javac -d ..\..\target\classes org\apache\log4j\LoggerTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\util\ISO8601Filter.java
+javac -d ..\..\target\classes org\apache\log4j\util\SunReflectFilter.java
+javac -d ..\..\target\classes org\apache\log4j\util\JunitTestRunnerFilter.java
+javac -d ..\..\target\classes org\apache\log4j\xml\DOMTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\xml\XLevel.java
+javac -d ..\..\target\classes org\apache\log4j\xml\CustomLevelTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\customLogger\XLogger.java
+javac -d ..\..\target\classes org\apache\log4j\customLogger\XLoggerTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\defaultInit\TestCase1.java
+javac -d ..\..\target\classes org\apache\log4j\defaultInit\TestCase3.java
+javac -d ..\..\target\classes org\apache\log4j\defaultInit\TestCase4.java
+javac -d ..\..\target\classes org\apache\log4j\util\XMLTimestampFilter.java
+javac -d ..\..\target\classes org\apache\log4j\util\XMLLineAttributeFilter.java
+javac -d ..\..\target\classes org\apache\log4j\xml\XMLLayoutTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\AsyncAppenderTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\helpers\OptionConverterTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\helpers\BoundedFIFOTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\helpers\CyclicBufferTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\or\ORTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\varia\LevelMatchFilterTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\helpers\PatternParserTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\util\AbsoluteTimeFilter.java
+javac -d ..\..\target\classes org\apache\log4j\util\RelativeTimeFilter.java
+javac -d ..\..\target\classes org\apache\log4j\PatternLayoutTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\MyPatternParser.java
+javac -d ..\..\target\classes org\apache\log4j\MyPatternLayout.java
+javac -d ..\..\target\classes org\apache\log4j\VectorErrorHandler.java
+javac -d ..\..\target\classes org\apache\log4j\DRFATestCase.java
cd ..\..
mkdir output
java junit.textui.TestRunner org.apache.log4j.CoreTestSuite
@@ -53,23 +68,23 @@
java junit.textui.TestRunner org.apache.log4j.xml.DOMTestCase
java junit.textui.TestRunner org.apache.log4j.xml.CustomLevelTestCase
java junit.textui.TestRunner org.apache.log4j.customLogger.XLoggerTestCase
-del classes\log4j.xml
-del classes\log4j.properties
+del target\classes\log4j.xml
+del target\classes\log4j.properties
java junit.textui.TestRunner org.apache.log4j.defaultInit.TestCase1
-copy input\xml\defaultInit.xml classes\log4j.xml
+copy input\xml\defaultInit.xml target\classes\log4j.xml
java junit.textui.TestRunner org.apache.log4j.defaultInit.TestCase2
-del classes\log4j.xml
-copy input\xml\defaultInit.xml classes\log4j.xml
+del target\classes\log4j.xml
+copy input\xml\defaultInit.xml target\classes\log4j.xml
java -Dlog4j.defaultInitOverride=true junit.textui.TestRunner org.apache.log4j.defaultInit.TestCase1
-del classes\log4j.xml
-copy input\defaultInit3.properties classes\log4j.properties
+del target\classes\log4j.xml
+copy input\defaultInit3.properties target\classes\log4j.properties
java junit.textui.TestRunner org.apache.log4j.defaultInit.TestCase3
-del classes\log4j.properties
-copy input\xml\defaultInit.xml classes\log4j.xml
-copy input\defaultInit3.properties classes\log4j.properties
+del target\classes\log4j.properties
+copy input\xml\defaultInit.xml target\classes\log4j.xml
+copy input\defaultInit3.properties target\classes\log4j.properties
java junit.textui.TestRunner org.apache.log4j.defaultInit.TestCase4
-del classes\log4j.xml
-del classes\log4j.properties
+del target\classes\log4j.xml
+del target\classes\log4j.properties
java junit.textui.TestRunner org.apache.log4j.xml.XMLLayoutTestCase
java junit.textui.TestRunner org.apache.log4j.AsyncAppenderTestCase
java junit.textui.TestRunner org.apache.log4j.helpers.OptionConverterTestCase
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org