Changeset 7040 in josm for trunk/build.xml

Timestamp:

2014-05-02T00:04:06+02:00 (10 years ago)

Author:

Don-vip

Message:

tests/build update:

• update Jacoco to version 0.7.0
• compile performance tests even if not run by ant task
• do not create empty package-info.class files in javac task
• move RemoteControl test to unit tests to get coverage information
• fix NPEs seen in tests in headless mode
• proper test failures when properties files can not be loaded

File:

• trunk/build.xml (modified) (3 diffs)

trunk/build.xml

@@ -199 +199 @@
         <!-- COTS -->
         <javac srcdir="src" includes="com/**,oauth/**,org/apache/commons/codec/**,org/glassfish/**" nowarn="on"
-                destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" encoding="iso-8859-1">
+                destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="iso-8859-1">
             <!-- get rid of "internal proprietary API" warning -->
                 <compilerarg value="-XDignore.symbol.file"/>
@@ -205 +205 @@
         <!-- JMapViewer/JOSM -->
         <javac srcdir="src" excludes="com/**,oauth/**,org/apache/commons/codec/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java" 
-                destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" encoding="UTF-8">
+                destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
             <compilerarg value="-Xlint:cast"/>
             <compilerarg value="-Xlint:deprecation"/>
@@ -268 +268 @@
     </target>
     <target name="test-compile" depends="test-init,dist">
-        <javac srcdir="${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/build" target="1.7" source="1.7" debug="on" includeantruntime="false" encoding="UTF-8">
+        <javac srcdir="${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/build" target="1.7" source="1.7" debug="on"
+                includeantruntime="false" createMissingPackageInfoClass="off" encoding="UTF-8">
             <compilerarg value="-Xlint:all"/>
             <compilerarg value="-Xlint:-serial"/>
         </javac>
-        <javac srcdir="${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/build" target="1.7" source="1.7" debug="on" includeantruntime="false" encoding="UTF-8">
+        <javac srcdir="${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/build" target="1.7" source="1.7" debug="on"
+                includeantruntime="false" createMissingPackageInfoClass="off" encoding="UTF-8">
+            <compilerarg value="-Xlint:all"/>
+            <compilerarg value="-Xlint:-serial"/>
+        </javac>
+        <javac srcdir="${test.dir}/performance" classpathref="test.classpath" destdir="${test.dir}/build" target="1.7" source="1.7" debug="on"
+                includeantruntime="false" createMissingPackageInfoClass="off" encoding="UTF-8">
             <compilerarg value="-Xlint:all"/>
             <compilerarg value="-Xlint:-serial"/>