aoo-ant.xml (41f03cd9) aoo-ant.xml (f9bad0d2)
1<?xml version="1.0" encoding="UTF-8"?>
2<!--***********************************************************
3 *
4 * Licensed to the Apache Software Foundation (ASF) under one
5 * or more contributor license agreements. See the NOTICE file
6 * distributed with this work for additional information
7 * regarding copyright ownership. The ASF licenses this file
8 * to you under the Apache License, Version 2.0 (the

--- 105 unchanged lines hidden (view full) ---

114 debug="${main.debug}"
115 debuglevel="lines,vars,source"
116 deprecation="${main.deprecation}"
117 classpathref="main.classpath"
118 includeantruntime="false"/>
119 </target>
120
121 <target name="test-compile" depends="compile,idl">
1<?xml version="1.0" encoding="UTF-8"?>
2<!--***********************************************************
3 *
4 * Licensed to the Apache Software Foundation (ASF) under one
5 * or more contributor license agreements. See the NOTICE file
6 * distributed with this work for additional information
7 * regarding copyright ownership. The ASF licenses this file
8 * to you under the Apache License, Version 2.0 (the

--- 105 unchanged lines hidden (view full) ---

114 debug="${main.debug}"
115 debuglevel="lines,vars,source"
116 deprecation="${main.deprecation}"
117 classpathref="main.classpath"
118 includeantruntime="false"/>
119 </target>
120
121 <target name="test-compile" depends="compile,idl">
122 <property property="test.skip" value="true" if:blank="${OOO_JUNIT_JAR}"/>
123 <echo message="No junit, skipping tests" if:blank="${OOO_JUNIT_JAR}"/>
122 <property name="test.skip" value="true" unless:set="OOO_JUNIT_JAR"/>
123 <echo message="No junit, skipping tests" unless:set="OOO_JUNIT_JAR"/>
124
124
125 <mkdir dir="${test.build.dir}" unless:blank="${OOO_JUNIT_JAR}"/>
125 <mkdir dir="${test.build.dir}" if:set="OOO_JUNIT_JAR"/>
126 <javac srcdir="${test.src.dir}"
127 destdir="${test.build.dir}"
128 debug="${test.debug}"
129 debuglevel="lines,vars,source"
130 deprecation="${test.deprecation}"
131 classpathref="internal.test.classpath"
132 includeantruntime="false"
126 <javac srcdir="${test.src.dir}"
127 destdir="${test.build.dir}"
128 debug="${test.debug}"
129 debuglevel="lines,vars,source"
130 deprecation="${test.deprecation}"
131 classpathref="internal.test.classpath"
132 includeantruntime="false"
133 unless:blank="${OOO_JUNIT_JAR}"/>
133 if:set="OOO_JUNIT_JAR"/>
134 </target>
135
136 <!-- fork="true" is sadly necessary on Ubuntu due to multiple versions of junit confusing Ant,
137 see https://github.com/real-logic/simple-binary-encoding/issues/96 -->
134 </target>
135
136 <!-- fork="true" is sadly necessary on Ubuntu due to multiple versions of junit confusing Ant,
137 see https://github.com/real-logic/simple-binary-encoding/issues/96 -->
138 <target name="test" depends="test-compile" unless:set="${test.skip}">
138 <target name="test" depends="test-compile" unless="${test.skip}">
139 <mkdir dir="${test.reports.dir}"/>
140 <junit printsummary="yes" haltonfailure="yes" showoutput="true" filtertrace="false" fork="true">
141 <classpath refid="internal.test.classpath"/>
142 <formatter type="plain"/>
143 <batchtest todir="${test.reports.dir}">
144 <fileset dir="${test.src.dir}">
145 <include name="**/*_Test.java"/>
146 </fileset>

--- 38 unchanged lines hidden --- 		139 <mkdir dir="${test.reports.dir}"/>
140 <junit printsummary="yes" haltonfailure="yes" showoutput="true" filtertrace="false" fork="true">
141 <classpath refid="internal.test.classpath"/>
142 <formatter type="plain"/>
143 <batchtest todir="${test.reports.dir}">
144 <fileset dir="${test.src.dir}">
145 <include name="**/*_Test.java"/>
146 </fileset>

--- 38 unchanged lines hidden ---