92 lines
3.7 KiB
Diff
92 lines
3.7 KiB
Diff
diff --git a/build.xml b/build.xml
|
|
index f914179..78e1b33 100644
|
|
--- a/build.xml
|
|
+++ b/build.xml
|
|
@@ -437,53 +437,41 @@
|
|
</jar>
|
|
</target>
|
|
|
|
- <target name="init-jacoco" depends="jar" unless="skip.test">
|
|
- <ivy:cachepath organisation="org.jacoco" module="org.jacoco.ant" revision="0.8.3"
|
|
- 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}"/>
|
|
- <jacoco:coverage xmlns:jacoco="antlib:org.jacoco.ant" destfile="${jacoco.log}"
|
|
- exclclassloader="sun.reflect.DelegatingClassLoader:javassist.Loader">
|
|
- <junit
|
|
- haltonfailure="off"
|
|
- haltonerror="off"
|
|
- errorproperty="test.failed"
|
|
- failureproperty="test.failed"
|
|
- showoutput="no"
|
|
- printsummary="yes"
|
|
- includeantruntime="no"
|
|
- dir="${basedir}"
|
|
- tempdir="${build.dir}"
|
|
- fork="true">
|
|
- <classpath>
|
|
- <path refid="test.classpath"/>
|
|
- </classpath>
|
|
-
|
|
- <!-- pass the proxy properties to the forked junit process to use correct proxy -->
|
|
- <syspropertyset>
|
|
- <propertyref prefix="http"/>
|
|
- </syspropertyset>
|
|
- <!-- We select specific HTTPS protocols, based on the Java version we are running
|
|
- on -->
|
|
- <sysproperty key="https.protocols" value="${java.sysprop.https.protocols}"/>
|
|
-
|
|
- <!-- Added this to test IVY-65 -->
|
|
- <jvmarg value="-Duser.region=TR"/>
|
|
- <jvmarg value="-Duser.language=tr"/>
|
|
-
|
|
- <formatter type="xml"/>
|
|
- <batchtest todir="${test.xml.dir}">
|
|
- <fileset refid="test.fileset"/>
|
|
- </batchtest>
|
|
- </junit>
|
|
- </jacoco:coverage>
|
|
+ <junit
|
|
+ haltonfailure="off"
|
|
+ haltonerror="off"
|
|
+ errorproperty="test.failed"
|
|
+ failureproperty="test.failed"
|
|
+ showoutput="no"
|
|
+ printsummary="yes"
|
|
+ includeantruntime="no"
|
|
+ dir="${basedir}"
|
|
+ tempdir="${build.dir}"
|
|
+ fork="true">
|
|
+ <classpath>
|
|
+ <path refid="test.classpath"/>
|
|
+ </classpath>
|
|
+
|
|
+ <!-- pass the proxy properties to the forked junit process to use correct proxy -->
|
|
+ <syspropertyset>
|
|
+ <propertyref prefix="http"/>
|
|
+ </syspropertyset>
|
|
+ <!-- We select specific HTTPS protocols, based on the Java version we are running
|
|
+ on -->
|
|
+ <sysproperty key="https.protocols" value="${java.sysprop.https.protocols}"/>
|
|
+
|
|
+ <!-- Added this to test IVY-65 -->
|
|
+ <jvmarg value="-Duser.region=TR"/>
|
|
+ <jvmarg value="-Duser.language=tr"/>
|
|
+
|
|
+ <formatter type="xml"/>
|
|
+ <batchtest todir="${test.xml.dir}">
|
|
+ <fileset refid="test.fileset"/>
|
|
+ </batchtest>
|
|
+ </junit>
|
|
</target>
|
|
|
|
<target name="test" depends="test-internal" description="Run the test">
|