Added specialized test to ant build, and ported old specialized 'run' tests to check the number of boxings.
No review. git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@23999 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
parent
2c98a10eea
commit
4725aaf6eb
|
@ -1569,7 +1569,9 @@ BOOTRAPING TEST AND TEST SUITE
|
|||
<scalachecktests dir="${partest.dir}/${partest.srcdir}/scalacheck">
|
||||
<include name="*.scala"/>
|
||||
</scalachecktests>
|
||||
<specializedtests dir="${partest.dir}/${partest.srcdir}/specialized"/>
|
||||
<specializedtests dir="${partest.dir}/${partest.srcdir}/specialized">
|
||||
<include name="*.scala"/>
|
||||
</specializedtests>
|
||||
<!-- <scripttests dir="${partest.dir}/${partest.srcdir}/script" includes="*.scala"/> -->
|
||||
</partest>
|
||||
</target>
|
||||
|
|
|
@ -68,6 +68,10 @@ class PartestTask extends Task with CompilationPathProperty {
|
|||
scalapFiles = Some(input)
|
||||
}
|
||||
|
||||
def addConfiguredSpecializedTests(input: FileSet) {
|
||||
specializedFiles = Some(input)
|
||||
}
|
||||
|
||||
def setSrcDir(input: String) {
|
||||
srcDir = Some(input)
|
||||
}
|
||||
|
@ -141,6 +145,7 @@ class PartestTask extends Task with CompilationPathProperty {
|
|||
private var scriptFiles: Option[FileSet] = None
|
||||
private var shootoutFiles: Option[FileSet] = None
|
||||
private var scalapFiles: Option[FileSet] = None
|
||||
private var specializedFiles: Option[FileSet] = None
|
||||
private var errorOnFailed: Boolean = false
|
||||
private var scalacOpts: Option[String] = None
|
||||
private var timeout: Option[String] = None
|
||||
|
@ -183,6 +188,7 @@ class PartestTask extends Task with CompilationPathProperty {
|
|||
private def getScriptFiles = getFiles(scriptFiles)
|
||||
private def getShootoutFiles = getFiles(shootoutFiles)
|
||||
private def getScalapFiles = getFiles(scalapFiles)
|
||||
private def getSpecializedFiles = getFiles(specializedFiles)
|
||||
|
||||
override def execute() {
|
||||
if (isPartestDebug || debug) {
|
||||
|
@ -229,7 +235,8 @@ class PartestTask extends Task with CompilationPathProperty {
|
|||
(getScalacheckFiles, "scalacheck", "Running scalacheck tests"),
|
||||
(getScriptFiles, "script", "Running script files"),
|
||||
(getShootoutFiles, "shootout", "Running shootout tests"),
|
||||
(getScalapFiles, "scalap", "Running scalap tests")
|
||||
(getScalapFiles, "scalap", "Running scalap tests"),
|
||||
(getSpecializedFiles, "specialized", "Running specialized files")
|
||||
)
|
||||
|
||||
def runSet(set: TFSet): (Int, Int, Iterable[String]) = {
|
||||
|
|
|
@ -35,7 +35,8 @@ class ConsoleRunner extends DirectRunner {
|
|||
TestSet("shootout", pathFilter, "Testing shootout tests"),
|
||||
TestSet("script", pathFilter, "Testing script tests"),
|
||||
TestSet("scalacheck", x => pathFilter(x) || x.isDirectory, "Testing ScalaCheck tests"),
|
||||
TestSet("scalap", _.isDirectory, "Run scalap decompiler tests")
|
||||
TestSet("scalap", _.isDirectory, "Run scalap decompiler tests"),
|
||||
TestSet("specialized", pathFilter, "Testing specialized tests")
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
*
|
||||
4080500
|
||||
4081500
|
Loading…
Reference in New Issue