summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2009-01-16 16:31:52 +0000
committerPhilipp Haller <hallerp@gmail.com>2009-01-16 16:31:52 +0000
commit4666857e6cc7f82913a4b2c069e7909e98633e93 (patch)
tree60f5c9bbeef79d0578f51108f74779eae83926cc /build.xml
parent98ae895a95731e32019c706c35dbc82f71ce5674 (diff)
downloadscala-4666857e6cc7f82913a4b2c069e7909e98633e93.tar.gz
scala-4666857e6cc7f82913a4b2c069e7909e98633e93.tar.bz2
scala-4666857e6cc7f82913a4b2c069e7909e98633e93.zip
Fixed ant test.suite target for jvm tests that ...
Fixed ant test.suite target for jvm tests that contain directories. Added additional test for #1143.
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index e46daaadd8..2ab81d3b0b 100644
--- a/build.xml
+++ b/build.xml
@@ -1298,8 +1298,8 @@ BOOTRAPING TEST AND TEST SUITE
<negtests dir="${test.dir}/files/neg" includes="*.scala"/>
<runtests dir="${test.dir}/files">
<include name="run/**/*.scala"/>
- <include name="jvm/**/*.scala"/>
</runtests>
+ <jvmtests dir="${test.dir}/files/jvm" includes="*.scala"/>
<jvm5tests dir="${test.dir}/files/jvm5" includes="*.scala"/>
<residenttests dir="${test.dir}/files/res" includes="*.res"/>
<!-- <scripttests dir="${test.dir}/files/script" includes="*.scala"/> -->
@@ -1321,8 +1321,8 @@ BOOTRAPING TEST AND TEST SUITE
<negtests dir="${test.dir}/files/neg" includes="*.scala"/>
<runtests dir="${test.dir}/files">
<include name="run/**/*.scala"/>
- <include name="jvm/**/*.scala"/>
</runtests>
+ <jvmtests dir="${test.dir}/files/jvm" includes="*.scala"/>
<jvm5tests dir="${test.dir}/files/jvm5" includes="*.scala"/>
<residenttests dir="${test.dir}/files/res" includes="*.res"/>
<!-- <scripttests dir="${test.dir}/files/script" includes="*.scala"/> -->