summaryrefslogtreecommitdiff
path: root/src/build
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 /src/build
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 'src/build')
-rw-r--r--src/build/four.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/build/four.xml b/src/build/four.xml
index 7e5506d067..8d046df9c8 100644
--- a/src/build/four.xml
+++ b/src/build/four.xml
@@ -347,8 +347,8 @@ work on a JVM 1.5.
<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"/>
<residenttests dir="${test.dir}/files/res" includes="*.res"/>
</partest>
</target>
@@ -385,8 +385,8 @@ work on a JVM 1.4.
<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"/>
<residenttests dir="${test.dir}/files/res" includes="*.res"/>
</partest>
</target>