summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2013-10-18 16:31:33 -0700
committerEugene Burmako <xeno.by@gmail.com>2013-10-18 16:31:33 -0700
commite3666d5bf57a7e25569fc59ac665a48a9d75685e (patch)
treeaef95a0e333ad978ac4831cc7ed208333075bbf4 /build.xml
parentb43f13c7419562a16c5ed563ba9a0e6a0f5eaa21 (diff)
parent089cbc7d0c3a56de51a4e0b487bfce947ff88ad5 (diff)
downloadscala-e3666d5bf57a7e25569fc59ac665a48a9d75685e.tar.gz
scala-e3666d5bf57a7e25569fc59ac665a48a9d75685e.tar.bz2
scala-e3666d5bf57a7e25569fc59ac665a48a9d75685e.zip
Merge pull request #3029 from xeno-by/ticket/6240
reflection sync
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 d28b2f209c..d99f4669e0 100755
--- a/build.xml
+++ b/build.xml
@@ -1480,6 +1480,7 @@ TODO:
<srcfiles dir="${build-pack.dir}">
<include name="**/*"/>
</srcfiles>
+ <srcfiles file="${build-pack.dir}/lib/*.jar"/>
</uptodate>
<if><not><isset property="osgi.bundles.available"/></not><then>
@@ -1541,6 +1542,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}">
@@ -1548,7 +1550,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>