summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-08-09 16:47:39 +0200
committerEugene Burmako <xeno.by@gmail.com>2013-10-18 17:44:39 +0200
commitf94b2246361ed6ed19300d27033aedad7e3ddd9d (patch)
tree93e95b30800985a8d0835e303789b15e06a48bec /build.xml
parent48c28452fcc30838503388e8e7215a1411a826ba (diff)
downloadscala-f94b2246361ed6ed19300d27033aedad7e3ddd9d.tar.gz
scala-f94b2246361ed6ed19300d27033aedad7e3ddd9d.tar.bz2
scala-f94b2246361ed6ed19300d27033aedad7e3ddd9d.zip
improves OSGi test runner in Ant
- Include pack/lib/*.jar in the uptodatecheck - (Hopefully that saves the next guy a few hours) - Switch the the XML formatter (I couldn't find output from the other one) and mention the output directory.
Diffstat (limited to 'build.xml')
-rwxr-xr-xbuild.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/build.xml b/build.xml
index cb159b6c9e..1d262b485a 100755
--- a/build.xml
+++ b/build.xml
@@ -1476,6 +1476,7 @@ TODO:
<include name="build.xml"/>
<include name="src/build/bnd/*.bnd"/>
</srcfiles>
+ <srcfiles file="${build-pack.dir}/lib/*.jar"/>
</uptodate>
<if><not><isset property="osgi.bundles.available"/></not><then>
@@ -1537,6 +1538,7 @@ TODO:
<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}">
@@ -1544,7 +1546,7 @@ TODO:
<include name="**/*Test.class"/>
</fileset>
</batchtest>
- <formatter type="brief" /> <!-- 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" -->
+ <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"/>
</target>