diff options
Diffstat (limited to 'build.xml')
| -rwxr-xr-x | build.xml | 34 |
1 files changed, 18 insertions, 16 deletions
@@ -187,8 +187,6 @@ TODO: <property name="copyright.string" value="Copyright 2002-2013, LAMP/EPFL"/> - <property name="jline.version" value="2.11"/> - <!-- These are NOT the flags used to run SuperSabbus, but the ones written into the script runners created with scala.tools.ant.ScalaTool --> <property name="java.flags" value="-Xmx256M -Xms32M"/> @@ -1357,20 +1355,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> |