diff options
| author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-11-02 00:15:24 +0000 |
|---|---|---|
| committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-11-02 00:15:24 +0000 |
| commit | 6fddcaa5f9eb15beeb25d27c773093796c78ca0b (patch) | |
| tree | bf6b638d574557cf8fd44fa69173f77da048b9fd | |
| parent | bcfe76ee680852c66781882d70ac02bd76e09ac9 (diff) | |
| download | scala-6fddcaa5f9eb15beeb25d27c773093796c78ca0b.tar.gz scala-6fddcaa5f9eb15beeb25d27c773093796c78ca0b.tar.bz2 scala-6fddcaa5f9eb15beeb25d27c773093796c78ca0b.zip | |
Enable test directories for 'run'.
| -rw-r--r-- | build.xml | 8 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/PartestTask.scala | 2 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/ConsoleRunner.scala | 2 |
3 files changed, 4 insertions, 8 deletions
@@ -1560,9 +1560,7 @@ BOOTRAPING TEST AND TEST SUITE </compilationpath> <postests dir="${partest.dir}/${partest.srcdir}/pos" includes="*.scala"/> <negtests dir="${partest.dir}/${partest.srcdir}/neg" includes="*.scala"/> - <runtests dir="${partest.dir}/${partest.srcdir}"> - <include name="run/**/*.scala"/> - </runtests> + <runtests dir="${partest.dir}/${partest.srcdir}/run" includes="*.scala"/> <jvmtests dir="${partest.dir}/${partest.srcdir}/jvm" includes="*.scala"/> <residenttests dir="${partest.dir}/${partest.srcdir}/res" includes="*.res"/> <buildmanagertests dir="${partest.dir}/${partest.srcdir}/buildmanager" includes="*"/> @@ -1585,9 +1583,7 @@ BOOTRAPING TEST AND TEST SUITE <fileset dir="${partest.dir}/files/lib" includes="*.jar" /> </compilationpath> <negtests dir="${partest.dir}/${partest.srcdir}/continuations-neg" includes="*.scala"/> - <runtests dir="${partest.dir}/${partest.srcdir}"> - <include name="continuations-run/**/*.scala"/> - </runtests> + <runtests dir="${partest.dir}/${partest.srcdir}/continuations-run" includes="*.scala"/> </partest> </target> 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"), |