summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHubert Plociniczak <hubert.plociniczak@epfl.ch>2010-11-02 00:15:24 +0000
committerHubert Plociniczak <hubert.plociniczak@epfl.ch>2010-11-02 00:15:24 +0000
commit6fddcaa5f9eb15beeb25d27c773093796c78ca0b (patch)
treebf6b638d574557cf8fd44fa69173f77da048b9fd /src
parentbcfe76ee680852c66781882d70ac02bd76e09ac9 (diff)
downloadscala-6fddcaa5f9eb15beeb25d27c773093796c78ca0b.tar.gz
scala-6fddcaa5f9eb15beeb25d27c773093796c78ca0b.tar.bz2
scala-6fddcaa5f9eb15beeb25d27c773093796c78ca0b.zip
Enable test directories for 'run'.
Diffstat (limited to 'src')
-rw-r--r--src/partest/scala/tools/partest/PartestTask.scala2
-rw-r--r--src/partest/scala/tools/partest/nest/ConsoleRunner.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/partest/scala/tools/partest/PartestTask.scala b/src/partest/scala/tools/partest/PartestTask.scala
index 7c7863f118..4f829a99ed 100644
--- a/src/partest/scala/tools/partest/PartestTask.scala
+++ b/src/partest/scala/tools/partest/PartestTask.scala
@@ -175,7 +175,7 @@ class PartestTask extends Task with CompilationPathProperty {
private def getPosFiles = getFilesAndDirs(posFiles)
private def getNegFiles = getFilesAndDirs(negFiles)
- private def getRunFiles = getFiles(runFiles)
+ private def getRunFiles = getFilesAndDirs(runFiles)
private def getJvmFiles = getFilesAndDirs(jvmFiles)
private def getResidentFiles = getFiles(residentFiles)
private def getBuildManagerFiles = getFilesAndDirs(buildManagerFiles)
diff --git a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala
index eb7d9b9e2b..eb5cff4fa5 100644
--- a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala
+++ b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala
@@ -28,7 +28,7 @@ class ConsoleRunner extends DirectRunner {
List(
TestSet("pos", pathFilter, "Testing compiler (on files whose compilation should succeed)"),
TestSet("neg", pathFilter, "Testing compiler (on files whose compilation should fail)"),
- TestSet("run", pathFilter, "Testing JVM backend"),
+ TestSet("run", pathFilter, "Testing interpreter and backend"),
TestSet("jvm", pathFilter, "Testing JVM backend"),
TestSet("res", x => x.isFile && (x hasExtension "res"), "Testing resident compiler"),
TestSet("buildmanager", _.isDirectory, "Testing Build Manager"),