build.xml reverted to revision 646405 (not to be committed in 646527)
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@646530 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
3c1c5bac83
commit
3c92cf0fd9
@ -202,7 +202,6 @@ under the License.
|
|||||||
<path id="scratchpad.classpath">
|
<path id="scratchpad.classpath">
|
||||||
<path refid="main.classpath"/>
|
<path refid="main.classpath"/>
|
||||||
<pathelement location="${main.output.dir}"/>
|
<pathelement location="${main.output.dir}"/>
|
||||||
<pathelement location="${scratchpad.output.dir}"/>
|
|
||||||
</path>
|
</path>
|
||||||
|
|
||||||
<path id="contrib.classpath">
|
<path id="contrib.classpath">
|
||||||
@ -235,7 +234,6 @@ under the License.
|
|||||||
|
|
||||||
<path id="test.ooxml.classpath">
|
<path id="test.ooxml.classpath">
|
||||||
<path refid="ooxml.classpath"/>
|
<path refid="ooxml.classpath"/>
|
||||||
<path refid="scratchpad.classpath"/>
|
|
||||||
<pathelement location="${ooxml.output.dir}"/>
|
<pathelement location="${ooxml.output.dir}"/>
|
||||||
<pathelement location="${ooxml.output.test.dir}"/>
|
<pathelement location="${ooxml.output.test.dir}"/>
|
||||||
<pathelement location="${main.output.test.dir}"/> <!-- ooxml tests use some utilities from main tests -->
|
<pathelement location="${main.output.test.dir}"/> <!-- ooxml tests use some utilities from main tests -->
|
||||||
@ -555,7 +553,7 @@ under the License.
|
|||||||
</javac>
|
</javac>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="test" depends="test-main,test-scratchpad,test-contrib,test-ooxml"
|
<target name="test" depends="test-main,test-scratchpad,test-contrib"
|
||||||
description="Tests main, contrib and scratchpad"/>
|
description="Tests main, contrib and scratchpad"/>
|
||||||
|
|
||||||
<target name="-test-main-check">
|
<target name="-test-main-check">
|
||||||
@ -587,8 +585,6 @@ under the License.
|
|||||||
<exclude name="**/All*Tests.java"/>
|
<exclude name="**/All*Tests.java"/>
|
||||||
<exclude name="**/TestUnfixedBugs.java"/>
|
<exclude name="**/TestUnfixedBugs.java"/>
|
||||||
<exclude name="**/TestcaseRecordInputStream.java"/>
|
<exclude name="**/TestcaseRecordInputStream.java"/>
|
||||||
<exclude name="**/TestRawDataBlock.java"/>
|
|
||||||
<exclude name="**/TestRawDataBlockList.java"/>
|
|
||||||
</fileset>
|
</fileset>
|
||||||
</batchtest>
|
</batchtest>
|
||||||
</junit>
|
</junit>
|
||||||
@ -796,7 +792,6 @@ under the License.
|
|||||||
<fileset dir="${ooxml.src.test}">
|
<fileset dir="${ooxml.src.test}">
|
||||||
<include name="**/Test*.java"/>
|
<include name="**/Test*.java"/>
|
||||||
<exclude name="**/All*Tests.java"/>
|
<exclude name="**/All*Tests.java"/>
|
||||||
<exclude name="**/TestExtractorFactory.java"/>
|
|
||||||
</fileset>
|
</fileset>
|
||||||
</batchtest>
|
</batchtest>
|
||||||
</junit>
|
</junit>
|
||||||
@ -1320,7 +1315,7 @@ FORREST_HOME environment variable!</echo>
|
|||||||
<!-- Abort the build if JUnit is missing. -->
|
<!-- Abort the build if JUnit is missing. -->
|
||||||
<target name="fail-unless-junit-is-available" depends="init">
|
<target name="fail-unless-junit-is-available" depends="init">
|
||||||
<condition property="isAvailable.junit">
|
<condition property="isAvailable.junit">
|
||||||
<available file="${junit.jar1.dir}"/>
|
<available classname="junit.framework.TestCase"/>
|
||||||
</condition>
|
</condition>
|
||||||
<antcall target="fail-junit"/>
|
<antcall target="fail-junit"/>
|
||||||
</target>
|
</target>
|
||||||
|
Loading…
Reference in New Issue
Block a user