mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
2ac61de87e
- Enables tests. - Builds with eant because of very complex test management. - Skips some tests which would otherwise neeed network access. - Disables jacoco coverage which would otherwise need network access. Bug: https://bugs.gentoo.org/916262 Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Part-of: https://codeberg.org/gentoo/gentoo/pulls/353 Merges: https://codeberg.org/gentoo/gentoo/pulls/353 Signed-off-by: Sam James <sam@gentoo.org>
109 lines
4.8 KiB
Diff
109 lines
4.8 KiB
Diff
--- a/build.xml
|
|
+++ b/build.xml
|
|
@@ -72,9 +72,11 @@
|
|
<fileset dir="${lib.dir}">
|
|
<include name="*.jar"/>
|
|
</fileset>
|
|
+ <pathelement path="${gentoo.classpath}"/>
|
|
</path>
|
|
<path id="build.bootstrap.classpath">
|
|
<pathelement location="${core.classes.build.dir}"/>
|
|
+ <pathelement location="${ant.jar}"/>
|
|
</path>
|
|
<path id="build.ant.classpath">
|
|
<pathelement location="${core.classes.build.dir}"/>
|
|
@@ -95,6 +97,7 @@
|
|
<pathelement location="${ant.classes.build.dir}"/>
|
|
<pathelement location="${optional.classes.build.dir}"/>
|
|
<pathelement path="${test.build.dir}"/>
|
|
+ <path refid="lib.classpath"/>
|
|
</path>
|
|
<path id="javadoc.test.classpath">
|
|
<path refid="run.classpath"/>
|
|
@@ -185,8 +188,6 @@
|
|
<javac srcdir="${src.dir}"
|
|
destdir="${core.classes.build.dir}"
|
|
sourcepath=""
|
|
- source="${ivy.minimum.javaversion}"
|
|
- target="${ivy.minimum.javaversion}"
|
|
debug="${debug.mode}"
|
|
includeantruntime="no">
|
|
<excludesfile name="ant.patterns"/>
|
|
@@ -221,8 +222,6 @@
|
|
destdir="${bootstrap.classes.build.dir}"
|
|
sourcepath=""
|
|
classpathref="build.bootstrap.classpath"
|
|
- source="${ivy.minimum.javaversion}"
|
|
- target="${ivy.minimum.javaversion}"
|
|
debug="${debug.mode}"
|
|
includeantruntime="yes">
|
|
<includesfile name="ant.patterns"/>
|
|
@@ -241,8 +240,6 @@
|
|
destdir="${ant.classes.build.dir}"
|
|
sourcepath=""
|
|
classpathref="build.ant.classpath"
|
|
- source="${ivy.minimum.javaversion}"
|
|
- target="${ivy.minimum.javaversion}"
|
|
debug="${debug.mode}"
|
|
includeantruntime="no">
|
|
<includesfile name="ant.patterns"/>
|
|
@@ -260,8 +257,6 @@
|
|
destdir="${optional.classes.build.dir}"
|
|
sourcepath=""
|
|
classpathref="build.optional.classpath"
|
|
- source="${ivy.minimum.javaversion}"
|
|
- target="${ivy.minimum.javaversion}"
|
|
debug="${debug.mode}"
|
|
includeantruntime="no">
|
|
<includesfile name="optional.patterns"/>
|
|
@@ -371,8 +366,6 @@
|
|
<javac srcdir="${test.dir}"
|
|
destdir="${test.build.dir}"
|
|
classpathref="run.classpath"
|
|
- source="${ivy.minimum.javaversion}"
|
|
- target="${ivy.minimum.javaversion}"
|
|
debug="${debug.mode}"
|
|
encoding="UTF-8"
|
|
includeantruntime="no"/>
|
|
@@ -388,8 +381,6 @@
|
|
<javac srcdir="${basedir}/test/custom-classpath"
|
|
destdir="${build.dir}/custom-classpath"
|
|
classpathref="run.classpath"
|
|
- source="${ivy.minimum.javaversion}"
|
|
- target="${ivy.minimum.javaversion}"
|
|
debug="${debug.mode}"
|
|
includeantruntime="no"/>
|
|
<jar destfile="${test.dir}/org/apache/ivy/core/settings/custom-resolver.jar"
|
|
@@ -418,22 +418,12 @@
|
|
</jar>
|
|
</target>
|
|
|
|
- <target name="init-jacoco" depends="jar" unless="skip.test">
|
|
- <ivy:cachepath organisation="org.jacoco" module="org.jacoco.ant" revision="${jacoco.version}"
|
|
- inline="true" conf="default" pathid="jacoco.classpath" log="download-only"/>
|
|
- <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml"
|
|
- classpathref="jacoco.classpath"/>
|
|
- </target>
|
|
-
|
|
- <target name="test-internal" depends="build-test,init-tests,prepare-osgi-tests,prepare-test-jar-repositories,init-jacoco" unless="skip.test">
|
|
+ <target name="test-internal" depends="build-test,init-tests,prepare-osgi-tests,prepare-test-jar-repositories" unless="skip.test">
|
|
<mkdir dir="${test.xml.dir}"/>
|
|
|
|
<!-- multiple runs into the same logfile let the later report generation fail -->
|
|
<delete file="${jacoco.log}"/>
|
|
<property name="jacoco.coverage.enabled" value="true"/>
|
|
- <jacoco:coverage xmlns:jacoco="antlib:org.jacoco.ant" destfile="${jacoco.log}"
|
|
- exclclassloader="sun.reflect.DelegatingClassLoader:javassist.Loader"
|
|
- enabled="${jacoco.coverage.enabled}">
|
|
<junit
|
|
haltonfailure="off"
|
|
haltonerror="off"
|
|
@@ -463,7 +453,6 @@
|
|
<fileset refid="test.fileset"/>
|
|
</batchtest>
|
|
</junit>
|
|
- </jacoco:coverage>
|
|
</target>
|
|
|
|
<target name="test" depends="test-internal" description="Run the test">
|