diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-06-04 12:50:34 +0200 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-06-04 12:50:34 +0200 |
commit | 86fc1ceae4db611aa4f990973cea484c41f79e44 (patch) | |
tree | 56d6481c195cdf2b64a66694737916c63e2eb28f /build.xml | |
parent | b24e7573a17332606d9f9da49a397e02abec1b63 (diff) | |
download | scala-86fc1ceae4db611aa4f990973cea484c41f79e44.tar.gz scala-86fc1ceae4db611aa4f990973cea484c41f79e44.tar.bz2 scala-86fc1ceae4db611aa4f990973cea484c41f79e44.zip |
Disable OSGi tests under Java 8
I've lodged SI-8642 with more details of the failure to make sure we
get them going again.
Diffstat (limited to 'build.xml')
-rwxr-xr-x | build.xml | 32 |
1 files changed, 18 insertions, 14 deletions
@@ -1357,20 +1357,24 @@ TODO: </target> <target name="test.osgi" depends="test.osgi.comp"> - <stopwatch name="test.osgi.timer"/> - <mkdir dir="${test.osgi.classes}"/> - - <echo message="Running OSGi JUnit tests. Output in ${build-osgi.dir}"/> - <junit fork="yes" haltonfailure="yes"> - <classpath refid="test.osgi.compiler.build.path"/> - <batchtest fork="yes" todir="${build-osgi.dir}"> - <fileset dir="${test.osgi.classes}"> - <include name="**/*Test.class"/> - </fileset> - </batchtest> - <formatter type="xml" /> <!-- silenced by having it use a file; I tried for an hour to use other formatters but classpath issues drove me to this usefile="false" --> - </junit> - <stopwatch name="test.osgi.timer" action="total"/> + <if><isset property="has.java8"/><then> + <echo message="Skipping OSGi JUnit tests on Java 8. See SI-8642"/> + </then><else> + <echo message="Running OSGi JUnit tests. Output in ${build-osgi.dir}"/> + <stopwatch name="test.osgi.timer"/> + <mkdir dir="${test.osgi.classes}"/> + + <junit fork="yes" haltonfailure="yes"> + <classpath refid="test.osgi.compiler.build.path"/> + <batchtest fork="yes" todir="${build-osgi.dir}"> + <fileset dir="${test.osgi.classes}"> + <include name="**/*Test.class"/> + </fileset> + </batchtest> + <formatter type="xml" /> <!-- silenced by having it use a file; I tried for an hour to use other formatters but classpath issues drove me to this usefile="false" --> + </junit> + <stopwatch name="test.osgi.timer" action="total"/> + </else></if> </target> |