Author: onealj
Date: Wed Oct 25 18:59:54 2017
New Revision: 1813342
URL: http://svn.apache.org/viewvc?rev=1813342&view=rev
Log:
remove test-ss and test-ooxml-ss ant targets, as these were causing problems
with the build/ooxml-testokfile.txt being written, requiring test-ooxml to be
rerun on subsequent ant calls even if had previously completed successfully and
not modifications to the ooxml source had been made.
Modified:
poi/trunk/build.xml
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1813342&r1=1813341&r2=1813342&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Wed Oct 25 18:59:54 2017
@@ -134,9 +134,6 @@ under the License.
<property name="ooxml.lite.output.dir"
location="build/ooxml-lite-classes"/>
<property name="ooxml.lite.testokfile"
location="build/ooxml-lite-testokfile.txt"/>
- <!-- XSSF/SXSSF subset of OOXML: -->
- <property name="ooxml.ss.testokfile"
location="build/ooxml-ss-testokfile.txt"/>
-
<!-- Integration testing: -->
<property name="integration.src.test" location="src/integrationtest"/>
<property name="integration.reports.test"
location="build/integration-test-results"/>
@@ -1080,50 +1077,6 @@ under the License.
</copy>
</target>
- <target name="compile-ooxml-ss"
depends="compile-main,compile-scratchpad,compile-ooxml-xsds">
- <!-- depends: compile-scratchpad needed for extractor -->
- <!-- compile the sources -->
- <javac target="${jdk.version.class}"
- source="${jdk.version.source}"
- destdir="${ooxml.output.dir}"
- srcdir="${ooxml.src}"
- debug="${compile.debug}"
- encoding="${java.source.encoding}"
- fork="yes"
- includeantruntime="false">
- <classpath>
- <path refid="ooxml.classpath"/>
- <path refid="ooxml.xmlsec.classpath"/>
- </classpath>
- <include name="org/apache/poi/ss/**/*.java"/>
- <include name="org/apache/poi/xssf/**/*.java"/>
- <include name="org/apache/poi/extractor/**/*.java"/>
- <include name="org/apache/poi/poifs/crypt/**/*.java"/>
- </javac>
- <!-- compile the tests -->
- <javac target="${jdk.version.class}"
- source="${jdk.version.source}"
- destdir="${ooxml.output.test.dir}"
- srcdir="${ooxml.src.test}"
- debug="${compile.debug}"
- encoding="${java.source.encoding}"
- fork="yes"
- includeantruntime="false">
- <classpath>
- <path refid="ooxml.classpath"/>
- <path refid="ooxml.xmlsec.classpath"/>
- <path refid="test.ooxml.classpath"/>
- <pathelement path="${ooxml.output.dir}"/>
- <pathelement path="${main.output.test.dir}"/>
- </classpath>
- <include name="org/apache/poi/ss/**/*.java"/>
- <include name="org/apache/poi/xssf/**/*.java"/>
- </javac>
- <copy todir="${ooxml.output.dir}">
- <fileset dir="${ooxml.resource1.dir}"/>
- </copy>
- </target>
-
<target name="compile-excelant" depends="compile-main,compile-ooxml">
<!-- compile the sources -->
<javac target="${jdk.version.class}"
@@ -1217,8 +1170,6 @@ under the License.
description="Tests main, scratchpad and ooxml"/>
<target name="test-all" depends="test,test-ooxml-lite,testcoveragereport"
description="Tests main, scratchpad, ooxml, ooxml-lite, and
coveragereport"/>
- <target name="test-ss" depends="test-hssf, test-ooxml-ss"
- description="Test POI Spreadsheet classes (SS, HSSF, XSSF,
SXSSF)"/>
<target name="testcoveragereport" depends="jacocotask" description="create
test-report" xmlns:jacoco="antlib:org.jacoco.ant" if="coverage.enabled">
<delete dir="${coverage.dir}"/>
@@ -1552,62 +1503,6 @@ under the License.
<echo file="${ooxml.testokfile}" append="false" message="testok"/>
</target>
- <!-- Section: test-ooxml-ss -->
- <target name="-test-ooxml-ss-check">
- <uptodate property="ooxml.ss.test.notRequired"
targetfile="${ooxml.ss.testokfile}">
- <srcfiles dir="${ooxml.src}"/>
- <srcfiles dir="${ooxml.src.test}"/>
- </uptodate>
- </target>
-
- <macrodef name="ooxml-ss-test-runner" xmlns:jacoco="antlib:org.jacoco.ant">
- <attribute name="classpath"/>
- <attribute name="type"/>
- <sequential>
- <jacoco:coverage enabled="${coverage.enabled}"
excludes="${coverage.excludes}" destfile="build/jacoco-@{type}-ss.exec">
- <junit printsummary="yes" fork="yes" forkmode="once"
haltonfailure="${halt.on.test.failure}"
- failureproperty="ooxml.ss.test.failed">
- <classpath refid="@{classpath}"/>
- <syspropertyset refid="junit.properties"/>
- <jvmarg value="-Xmx768M"/>
- <jvmarg value="-ea"/>
- <jvmarg value="${java9addmods}" />
- <jvmarg value="${java9addmodsvalue}" />
- <jvmarg value="${java9addopens1}" />
- <jvmarg value="${java9addopens2}" />
- <jvmarg value="${java9addopens3}" />
- <jvmarg value="${java9addopens4}" />
- <jvmarg value="${java9addopens5}" />
- <!-- jvmarg value="-Duser.timezone=UTC"/ -->
- <formatter type="plain"/>
- <formatter type="xml"/>
- <batchtest todir="${ooxml.reports.test}">
- <fileset dir="${ooxml.src.test}">
- <include
name="**/org/apache/poi/ss/**/${testpattern}.java"/>
- <include
name="**/org/apache/poi/xssf/**/${testpattern}.java"/>
- <exclude name="**/TestUnfixedBugs.java"/>
- <exclude name="**/All*Tests.java"/>
- <exclude name="**/${testexcludepattern}.java"/>
- <patternset refid="exclude-scratchpad-test"
if:true="${scratchpad.ignore}"/>
- </fileset>
- </batchtest>
- </junit>
- </jacoco:coverage>
- </sequential>
- </macrodef>
-
- <!-- XSSF and SXSSF subset of test-ooxml -->
- <target name="test-ooxml-ss"
depends="compile-main,compile-ooxml-ss,-test-ooxml-ss-check,jacocotask"
unless="ooxml.ss.test.notRequired"
- description="test XSSF and SXSSF classes">
- <ooxml-ss-test-runner classpath="test.ooxml.classpath" type="ooxml"/>
- <delete file="${ooxml.ss.testokfile}"/>
- <antcall target="-test-ooxml-ss-write-testfile"/>
- </target>
-
- <target name="-test-ooxml-ss-write-testfile" unless="ooxml.ss.test.failed">
- <echo file="${ooxml.ss.testokfile}" append="false" message="testok"/>
- </target>
-
<!-- Section: test-integration -->
<target name="-test-integration-check">
<uptodate property="integration.test.notRequired"
targetfile="${integration.testokfile}">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
