natas_hw
/
legacy-svn-scala
mirror of https://github.com/scala/legacy-svn-scala
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changed build script to run shootout and script tests 

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@15657 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
rytz 2008-07-31 13:47:13 +00:00
parent 4762849482
commit 08ab5ea5a7
2 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -955,6 +955,8 @@ BOOTRAPING TEST AND TEST SUITE
<include name="jvm5/**/*.scala"/>
</runtests>
<residenttests dir="${test.dir}/files/res" includes="*.res"/>
<scripttests dir="${test.dir}/files/script" includes="*.scala"/>
<shootouttests dir="${test.dir}/files/shootout" includes="*.scala"/>
</partest>
</target>

47
src/partest/scala/tools/partest/PartestTask.scala
View File

@ -31,7 +31,13 @@ class PartestTask extends Task {
def addConfiguredResidentTests(input: FileSet): Unit =
residentFiles = Some(input)
def addConfiguredScriptTests(input: FileSet): Unit =
scriptFiles = Some(input)
def addConfiguredShootoutTests(input: FileSet): Unit =
shootoutFiles = Some(input)
def setClasspath(input: Path): Unit =
if (classpath.isEmpty)
classpath = Some(input)
@ -73,6 +79,8 @@ class PartestTask extends Task {
private var negFiles: Option[FileSet] = None
private var runFiles: Option[FileSet] = None
private var residentFiles: Option[FileSet] = None
private var scriptFiles: Option[FileSet] = None
private var shootoutFiles: Option[FileSet] = None
private var errorOnFailed: Boolean = false
private var scalacOpts: Option[String] = None
private var timeout: Option[String] = None
@ -108,8 +116,23 @@ class PartestTask extends Task {
}
else
Array()
private def getScriptFiles: Array[File] =
if (!scriptFiles.isEmpty) {
val files = scriptFiles.get
(files.getDirectoryScanner(getProject).getIncludedFiles map { fs => new File(files.getDir(getProject), fs) })
}
else
Array()
private def getShootoutFiles: Array[File] =
if (!shootoutFiles.isEmpty) {
val files = shootoutFiles.get
(files.getDirectoryScanner(getProject).getIncludedFiles map { fs => new File(files.getDir(getProject), fs) })
}
else
Array()
override def execute(): Unit = {
if (classpath.isEmpty)
@ -196,8 +219,22 @@ class PartestTask extends Task {
allSucesses += successes
allFailures += failures
}
if ((getPosFiles.size + getNegFiles.size + getRunFiles.size + getResidentFiles.size) == 0)
if (getScriptFiles.size > 0) {
log("Running script files")
val (successes, failures) = runTestsForFiles(getScriptFiles, "script")
allSucesses += successes
allFailures += failures
}
if (getShootoutFiles.size > 0) {
log("Running shootout tests")
val (successes, failures) = runTestsForFiles(getShootoutFiles, "shootout")
allSucesses += successes
allFailures += failures
}
if ((getPosFiles.size + getNegFiles.size + getRunFiles.size + getResidentFiles.size + getScriptFiles.size + getShootoutFiles.size) == 0)
log("There where no tests to run.")
else if (allFailures == 0)
log("Test suite finished with no failures.")