diff options
author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-01-25 10:28:11 +0000 |
---|---|---|
committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-01-25 10:28:11 +0000 |
commit | 2a1f11991f0bd019dc76b72b2342124a30975dba (patch) | |
tree | 1dfc876d90a5361a2512baf3df3b0d90a90cf2a3 | |
parent | 743e8782a1c8f5239b90e401b1fe25780f24ff6e (diff) | |
download | scala-2a1f11991f0bd019dc76b72b2342124a30975dba.tar.gz scala-2a1f11991f0bd019dc76b72b2342124a30975dba.tar.bz2 scala-2a1f11991f0bd019dc76b72b2342124a30975dba.zip |
Fix ant task for build manager partest. no review.
-rw-r--r-- | build.xml | 3 | ||||
-rw-r--r-- | src/partest/scala/tools/partest/PartestTask.scala | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -1402,10 +1402,11 @@ BOOTRAPING TEST AND TEST SUITE <jvmtests dir="${test.dir}/files/jvm" includes="*.scala"/> <residenttests dir="${test.dir}/files/res" includes="*.res"/> <!-- <scripttests dir="${test.dir}/files/script" includes="*.scala"/> --> + <buildmanagertests dir="${test.dir}/files/buildmanager" includes="*"/> <scalaptests dir="${test.dir}/files/scalap" includes="**/*.scala"/> </partest> </target> - + <target name="test.done" depends="test.suite, test.stability"/> <!-- =========================================================================== diff --git a/src/partest/scala/tools/partest/PartestTask.scala b/src/partest/scala/tools/partest/PartestTask.scala index d97adfa166..905e52a491 100644 --- a/src/partest/scala/tools/partest/PartestTask.scala +++ b/src/partest/scala/tools/partest/PartestTask.scala @@ -154,7 +154,7 @@ class PartestTask extends Task { private def getRunFiles = getFiles(runFiles) private def getJvmFiles = getFilesAndDirs(jvmFiles) private def getResidentFiles = getFiles(residentFiles) - private def getBuildManagerFiles = getFiles(buildManagerFiles) + private def getBuildManagerFiles = getFilesAndDirs(buildManagerFiles) private def getScriptFiles = getFiles(scriptFiles) private def getShootoutFiles = getFiles(shootoutFiles) private def getScalapFiles = getFiles(scalapFiles) |