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

added support for ant tests to partest 

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@26075 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
michelou 2011-11-27 15:57:15 +00:00
parent 166671da6e
commit 98622693e4
7 changed files with 236 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build.xml
View File

@ -1559,6 +1559,20 @@ BOOTRAPING TEST AND TEST SUITE
</partest>
</target>
<target name="test.ant" depends="pack.done">
<property name="partest.srcdir" value="files" />
<partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java"
srcdir="${partest.srcdir}"
scalacopts="${scalac.args.optimise}">
<compilationpath>
<path refid="pack.classpath"/>
<pathelement location="${pack.dir}/lib/scala-swing.jar"/>
<fileset dir="${partest.dir}/files/lib" includes="*.jar" />
</compilationpath>
<anttests dir="${partest.dir}/${partest.srcdir}/ant" includes="*build.xml"/>
</partest>
</target>
<target name="test.suite" depends="pack.done">
<property name="partest.srcdir" value="files" />
<partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java"

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

@ -6,8 +6,6 @@
** |/ **
\* */
// $Id$
package scala.tools
package partest
@ -25,6 +23,39 @@ import org.apache.tools.ant.Task
import org.apache.tools.ant.types.{Path, Reference, FileSet}
import org.apache.tools.ant.types.Commandline.Argument
/** An Ant task to execute the Scala test suite (NSC).
*
* This task can take the following parameters as attributes:
* - `srcdir`,
* - `classpath`,
* - `classpathref`,
* - `showlog`,
* - `showdiff`,
* - `erroronfailed`,
* - `javacmd`,
* - `javaccmd`,
* - `scalacopts`,
* - `timeout`,
* - `debug`,
* - `junitreportdir`.
*
* It also takes the following parameters as nested elements:
* - `compilationpath`.
* - `postests`,
* - `negtests`,
* - `runtests`,
* - `jvmtests`,
* - `residenttests`,
* - `buildmanagertests`,
* - `shootouttests`,
* - `scalaptests`,
* - `scalachecktests`,
* - `specializedtests`,
* - `presentationtests`,
* - `scripttests`.
*
* @author Philippe Haller
*/
class PartestTask extends Task with CompilationPathProperty {
def addConfiguredPosTests(input: FileSet) {
@ -66,7 +97,7 @@ class PartestTask extends Task with CompilationPathProperty {
def addConfiguredScalapTests(input: FileSet) {
scalapFiles = Some(input)
}
def addConfiguredSpecializedTests(input: FileSet) {
specializedFiles = Some(input)
}
@ -75,6 +106,10 @@ class PartestTask extends Task with CompilationPathProperty {
presentationFiles = Some(input)
}
def addConfiguredAntTests(input: FileSet) {
antFiles = Some(input)
}
def setSrcDir(input: String) {
srcDir = Some(input)
@ -158,6 +193,7 @@ class PartestTask extends Task with CompilationPathProperty {
private var scalapFiles: Option[FileSet] = None
private var specializedFiles: Option[FileSet] = None
private var presentationFiles: Option[FileSet] = None
private var antFiles: Option[FileSet] = None
private var errorOnFailed: Boolean = false
private var scalacArgs: Option[Seq[Argument]] = None
private var timeout: Option[String] = None
@ -213,6 +249,7 @@ class PartestTask extends Task with CompilationPathProperty {
private def getScalapFiles = getFiles(scalapFiles)
private def getSpecializedFiles = getFiles(specializedFiles)
private def getPresentationFiles = getDirs(presentationFiles)
private def getAntFiles = getFiles(antFiles)
override def execute() {
val opts = getProject().getProperties() get "env.PARTEST_OPTS"
@ -276,7 +313,8 @@ class PartestTask extends Task with CompilationPathProperty {
(getShootoutFiles, "shootout", "Running shootout tests"),
(getScalapFiles, "scalap", "Running scalap tests"),
(getSpecializedFiles, "specialized", "Running specialized files"),
(getPresentationFiles, "presentation", "Running presentation compiler test files")
(getPresentationFiles, "presentation", "Running presentation compiler test files"),
(getAntFiles, "ant", "Running ant task tests")
)
def runSet(set: TFSet): (Int, Int, Iterable[String]) = {
@ -320,7 +358,8 @@ class PartestTask extends Task with CompilationPathProperty {
f(msg)
}
def oneResult(res: (String, Int)) =
private def oneResult(res: (String, Int)) =
<testcase name={res._1}>{
res._2 match {
case 0 => scala.xml.NodeSeq.Empty
@ -329,7 +368,7 @@ class PartestTask extends Task with CompilationPathProperty {
}
}</testcase>
def testReport(kind: String, results: Iterable[(String, Int)], succs: Int, fails: Int) =
private def testReport(kind: String, results: Iterable[(String, Int)], succs: Int, fails: Int) =
<testsuite name={kind} tests={(succs + fails).toString} failures={fails.toString}>
<properties/>
{

1
src/partest/scala/tools/partest/nest/CompileManager.scala
View File

@ -96,6 +96,7 @@ class DirectCompiler(val fileManager: FileManager) extends SimpleCompiler {
case "scalacheck" => ScalaCheckTestFile.apply
case "specialized" => SpecializedTestFile.apply
case "presentation" => PresentationTestFile.apply
case "ant" => AntTestFile.apply
}
val test: TestFile = testFileFn(files.head, fileManager)
if (!test.defineSettings(command.settings, out.isEmpty)) {

6
src/partest/scala/tools/partest/nest/ConsoleRunner.scala
View File

@ -21,7 +21,8 @@ class ConsoleRunner extends DirectRunner {
import PathSettings.{ srcDir, testRoot }
case class TestSet(kind: String, filter: Path => Boolean, msg: String)
def stdFilter(p: Path) = p.isDirectory || (p hasExtension "scala")
private def stdFilter(p: Path) = p.isDirectory || (p hasExtension "scala")
private def antFilter(p: Path) = p.isFile && (p endsWith "build.xml")
val testSets = {
val pathFilter: Path => Boolean = x => x.isDirectory || (x hasExtension "scala")
@ -38,7 +39,8 @@ class ConsoleRunner extends DirectRunner {
TestSet("scalacheck", stdFilter, "Testing ScalaCheck tests"),
TestSet("scalap", _.isDirectory, "Run scalap decompiler tests"),
TestSet("specialized", stdFilter, "Testing specialized tests"),
TestSet("presentation", _.isDirectory, "Testing presentation compiler tests.")
TestSet("presentation", _.isDirectory, "Testing presentation compiler tests."),
TestSet("ant", antFilter, "Run Ant task tests.")
)
}

2
src/partest/scala/tools/partest/nest/DirectRunner.scala
View File

@ -24,7 +24,7 @@ trait DirectRunner {
import PartestDefaults.numActors
def denotesTestFile(arg: String) = Path(arg).hasExtension("scala", "res")
def denotesTestFile(arg: String) = Path(arg).hasExtension("scala", "res", "xml")
def denotesTestDir(arg: String) = Path(arg).ifDirectory(_.files.nonEmpty) exists (x => x)
def denotesTestPath(arg: String) = denotesTestDir(arg) || denotesTestFile(arg)

1
src/partest/scala/tools/partest/nest/TestFile.scala
View File

@ -66,3 +66,4 @@ case class SpecializedTestFile(file: JFile, fileManager: FileManager) extends Te
}
}
case class PresentationTestFile(file: JFile, fileManager: FileManager) extends TestFile("presentation")
case class AntTestFile(file: JFile, fileManager: FileManager) extends TestFile("ant")

293
src/partest/scala/tools/partest/nest/Worker.scala
View File

@ -3,8 +3,6 @@
* @author Philipp Haller
*/
// $Id$
package scala.tools.partest
package nest
@ -106,7 +104,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
val scalaCheckFileManager = new ScalaCheckFileManager(fileManager)
var reporter: ConsoleReporter = _
val timer = new Timer
val timer = new Timer
val javaCmd = propOrElse("partest.javacmd", Path(javaHome) / "bin" / "java" path)
val javacCmd = propOrElse("partest.javac_cmd", Path(jdkHome) / "bin" / "javac" path)
@ -212,7 +210,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
status.toList.map(x => " " + x._1 + " -> " + x._2).sorted.mkString("\n") + "\n"
)
def workerError(msg: String): Unit = reporter.error(
private def workerError(msg: String): Unit = reporter.error(
FakePos("scalac"),
msg + "\n scalac -help gives more information"
)
@ -229,7 +227,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
}
}
def printInfoStart(file: File, printer: PrintWriter) {
private def printInfoStart(file: File, printer: PrintWriter) {
NestUI.outline("testing: ", printer)
val filesdir = file.getAbsoluteFile.getParentFile.getParentFile
val testdir = filesdir.getParentFile
@ -244,29 +242,29 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
NestUI.normal("[...]%s%s".format(name, " " * (totalWidth - name.length)), printer)
}
def printInfoEnd(success: Boolean, printer: PrintWriter) {
private def printInfoEnd(success: Boolean, printer: PrintWriter) {
NestUI.normal("[", printer)
if (success) NestUI.success(" OK ", printer)
else NestUI.failure("FAILED", printer)
NestUI.normal("]\n", printer)
}
def printInfoTimeout(printer: PrintWriter) {
private def printInfoTimeout(printer: PrintWriter) {
NestUI.normal("[", printer)
NestUI.failure("TIMOUT", printer)
NestUI.normal("]\n", printer)
}
def createLogFile(file: File) = fileManager.getLogFile(file, kind)
private def createLogFile(file: File) = fileManager.getLogFile(file, kind)
def createOutputDir(dir: File): File = {
private def createOutputDir(dir: File): File = {
val outDir = Path(dir) / Directory("%s-%s.obj".format(fileBase, kind))
outDir.createDirectory()
toDelete += outDir.jfile
outDir.jfile
}
def javac(outDir: File, files: List[File], output: File): Boolean = {
private def javac(outDir: File, files: List[File], output: File): Boolean = {
// compile using command-line javac compiler
val args = Seq(
javacCmd,
@ -283,16 +281,12 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
/** Runs command redirecting standard out and
* error out to output file.
*/
def runCommand(args: Seq[String], outFile: File): Boolean = {
private def runCommand(args: Seq[String], outFile: File): Boolean = {
NestUI.verbose("running command:\n"+args.map(" " + _ + "\n").mkString)
(Process(args) #> outFile !) == 0
}
private def q(s: String) = {
val quot = "\""
if ((s == "") || (s.head == '"')) s else quot + s + quot
}
def execTest(outDir: File, logFile: File, classpathPrefix: String = ""): Boolean = {
private def execTest(outDir: File, logFile: File, classpathPrefix: String = ""): Boolean = {
// check whether there is a ".javaopts" file
val argsFile = new File(logFile.getParentFile, fileBase + ".javaopts")
val argString = file2String(argsFile)
@ -348,15 +342,15 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
runCommand(cmd, logFile)
}
def getCheckFilePath(dir: File, suffix: String = "") = {
private def getCheckFilePath(dir: File, suffix: String = "") = {
def chkFile(s: String) = (Directory(dir) / "%s%s.check".format(fileBase, s)).toFile
if (chkFile("").isFile || suffix == "") chkFile("")
else chkFile("-" + suffix)
}
def getCheckFile(dir: File) = Some(getCheckFilePath(dir, kind)) filter (_.canRead)
private def getCheckFile(dir: File) = Some(getCheckFilePath(dir, kind)) filter (_.canRead)
def compareOutput(dir: File, logFile: File): String = {
private def compareOutput(dir: File, logFile: File): String = {
val checkFile = getCheckFilePath(dir, kind)
// if check file exists, compare with log file
val diff =
@ -372,25 +366,26 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
else diff
}
def isJava(f: File) = SFile(f) hasExtension "java"
def isScala(f: File) = SFile(f) hasExtension "scala"
def isJavaOrScala(f: File) = isJava(f) || isScala(f)
def outputLogFile(logFile: File) {
@inline private def isJava(f: File) = SFile(f) hasExtension "java"
@inline private def isScala(f: File) = SFile(f) hasExtension "scala"
@inline private def isJavaOrScala(f: File) = isJava(f) || isScala(f)
private def outputLogFile(logFile: File) {
val lines = SFile(logFile).lines
if (lines.nonEmpty) {
NestUI.normal("Log file '" + logFile + "': \n")
lines foreach (x => NestUI.normal(x + "\n"))
}
}
def logStackTrace(logFile: File, t: Throwable, msg: String): Boolean = {
private def logStackTrace(logFile: File, t: Throwable, msg: String): Boolean = {
SFile(logFile).writeAll(msg, stackTraceString(t))
outputLogFile(logFile) // if running the test threw an exception, output log file
false
}
def exHandler(logFile: File): PartialFunction[Throwable, Boolean] = exHandler(logFile, "")
def exHandler(logFile: File, msg: String): PartialFunction[Throwable, Boolean] = {
private def exHandler(logFile: File): PartialFunction[Throwable, Boolean] =
exHandler(logFile, "")
private def exHandler(logFile: File, msg: String): PartialFunction[Throwable, Boolean] = {
case e: Exception => logStackTrace(logFile, e, msg)
}
@ -398,7 +393,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
*
* @param files The list of test files
*/
def runTests(files: List[File])(topcont: Map[String, Int] => Unit) {
private def runTests(files: List[File])(topcont: Map[String, Int] => Unit) {
val compileMgr = new CompileManager(fileManager)
// if (kind == "scalacheck")
fileManager.CLASSPATH += File.pathSeparator + PathSettings.scalaCheck
@ -409,7 +404,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
var done = filesRemaining.isEmpty
var errors = 0
var diff = ""
def initNextTest() = {
val swr = new StringWriter
val wr = new PrintWriter(swr, true)
@ -427,7 +422,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
succeeded = diff == ""
succeeded
}
def timed[T](body: => T): (T, Long) = {
val t1 = System.currentTimeMillis
val result = body
@ -443,7 +438,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
// When option "--failed" is provided, execute test only if log file is present
// (which means it failed before)
val logFile = createLogFile(file)
if (fileManager.failed && !logFile.canRead)
LogContext(logFile)
else {
@ -525,11 +520,62 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
execTest(outDir, logFile) && diffCheck(compareOutput(dir, logFile))
})
// Apache Ant 1.6 or newer
def ant(args: Seq[String], output: File): Boolean = {
val antDir = Directory(System.getProperty("ANT_HOME", "/opt/ant/"))
val antLibDir = Directory(antDir / "lib")
val antLauncherPath = SFile(antLibDir / "ant-launcher.jar").path
val antOptions =
if (NestUI._verbose) List("-verbose", "-noinput")
else List("-noinput")
val cmd = javaCmd +: (
JAVA_OPTS.split(' ').map(_.trim).filter(_ != "") ++ Seq(
"-classpath",
antLauncherPath,
"org.apache.tools.ant.launch.Launcher"
) ++ antOptions ++ args
)
try runCommand(cmd, output)
catch exHandler(output, "ant command '" + cmd + "' failed:\n")
}
def runAntTest(file: File): LogContext = {
val logFile = createLogFile(file)
if (!fileManager.failed || logFile.canRead) {
val (swr, wr) = initNextTest()
printInfoStart(file, wr)
NestUI.verbose(this+" running test "+fileBase)
try {
val binary = "-Dbinary="+(
if (fileManager.LATEST_LIB endsWith "build/quick/classes/library") "quick"
else if (fileManager.LATEST_LIB endsWith "build/pack/lib/scala-library.jar") "pack"
else if (fileManager.LATEST_LIB endsWith "dists/latest/lib/scala-library.jar/") "latest"
else "installed"
)
val args = Array(binary, "-logfile", logFile.path, "-file", file.path)
NestUI.verbose("ant "+args.mkString(" "))
succeeded = ant(args, logFile)
diffCheck(compareOutput(file.getParentFile, logFile))
}
catch { // *catch-all*
case e: Exception =>
NestUI.verbose("caught "+e)
succeeded = false
}
LogContext(logFile, swr, wr)
} else
LogContext(logFile)
}
def runSpecializedTest(file: File): LogContext =
runTestCommon(file, expectFailure = false)((logFile, outDir) => {
val dir = file.getParentFile
// adding the instrumented library to the classpath
execTest(outDir, logFile, PathSettings.srcSpecLib.toString) &&
diffCheck(compareOutput(dir, logFile))
@ -539,15 +585,15 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
case "scalacheck" =>
val succFn: (File, File) => Boolean = { (logFile, outDir) =>
NestUI.verbose("compilation of "+file+" succeeded\n")
val outURL = outDir.getAbsoluteFile.toURI.toURL
val logWriter = new PrintStream(new FileOutputStream(logFile), true)
Output.withRedirected(logWriter) {
// this classloader is test specific: its parent contains library classes and others
ScalaClassLoader.fromURLs(List(outURL), params.scalaCheckParentClassLoader).run("Test", Nil)
}
NestUI.verbose(file2String(logFile))
// obviously this must be improved upon
val lines = SFile(logFile).lines map (_.trim) filterNot (_ == "") toBuffer;
@ -558,7 +604,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
else {
NestUI.normal("ScalaCheck test failed. Output:\n")
lines foreach (x => NestUI.normal(x + "\n"))
false
false
}
}
runTestCommon(file, expectFailure = false)(
@ -572,7 +618,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
(_, _) => ()
)
case "neg" =>
case "neg" =>
runTestCommon(file, expectFailure = true)((logFile, outDir) => {
// compare log file to check file
val dir = file.getParentFile
@ -584,13 +630,16 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
case "run" | "jvm" =>
runJvmTest(file)
case "specialized" =>
runSpecializedTest(file)
case "presentation" =>
runJvmTest(file) // for the moment, it's exactly the same as for a run test
case "ant" =>
runAntTest(file)
case "buildmanager" =>
val logFile = createLogFile(file)
if (!fileManager.failed || logFile.canRead) {
@ -619,7 +668,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
}
}
)
if (outDir != null) {
// Pre-conditions satisfied
try {
@ -655,7 +704,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
!reporter.hasErrors
}
}
val updateFiles = (line: String) => {
NestUI.verbose("updating " + line)
val res =
@ -702,7 +751,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
false
}
}
Output.withRedirected(logWriter) {
try loop()
finally testReader.close()
@ -782,7 +831,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
case line => action(line) && loop(action)
}
}
Output.withRedirected(logWriter) {
try loop(resCompile)
finally resReader.close()
@ -794,55 +843,54 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
LogContext(logFile)
}
case "shootout" => {
// when option "--failed" is provided
// execute test only if log file is present
// (which means it failed before)
val logFile = createLogFile(file)
if (!fileManager.failed || logFile.canRead) {
val (swr, wr) = initNextTest()
printInfoStart(file, wr)
case "shootout" =>
// when option "--failed" is provided
// execute test only if log file is present
// (which means it failed before)
val logFile = createLogFile(file)
if (!fileManager.failed || logFile.canRead) {
val (swr, wr) = initNextTest()
printInfoStart(file, wr)
NestUI.verbose(this+" running test "+fileBase)
val dir = file.getParentFile
val outDir = createOutputDir(dir)
NestUI.verbose(this+" running test "+fileBase)
val dir = file.getParentFile
val outDir = createOutputDir(dir)
// 2. define file {outDir}/test.scala that contains code to compile/run
val testFile = new File(outDir, "test.scala")
NestUI.verbose("outDir: "+outDir)
NestUI.verbose("logFile: "+logFile)
NestUI.verbose("testFile: "+testFile)
// 2. define file {outDir}/test.scala that contains code to compile/run
val testFile = new File(outDir, "test.scala")
NestUI.verbose("outDir: "+outDir)
NestUI.verbose("logFile: "+logFile)
NestUI.verbose("testFile: "+testFile)
// 3. cat {test}.scala.runner {test}.scala > testFile
val runnerFile = new File(dir, fileBase+".scala.runner")
val bodyFile = new File(dir, fileBase+".scala")
SFile(testFile).writeAll(
file2String(runnerFile),
file2String(bodyFile)
)
// 3. cat {test}.scala.runner {test}.scala > testFile
val runnerFile = new File(dir, fileBase+".scala.runner")
val bodyFile = new File(dir, fileBase+".scala")
SFile(testFile).writeAll(
file2String(runnerFile),
file2String(bodyFile)
)
// 4. compile testFile
val ok = compileMgr.shouldCompile(List(testFile), kind, logFile)
NestUI.verbose("compilation of " + testFile + (if (ok) "succeeded" else "failed"))
if (ok) {
execTest(outDir, logFile) && {
NestUI.verbose(this+" finished running "+fileBase)
diffCheck(compareOutput(dir, logFile))
}
// 4. compile testFile
val ok = compileMgr.shouldCompile(List(testFile), kind, logFile)
NestUI.verbose("compilation of " + testFile + (if (ok) "succeeded" else "failed"))
if (ok) {
execTest(outDir, logFile) && {
NestUI.verbose(this+" finished running "+fileBase)
diffCheck(compareOutput(dir, logFile))
}
LogContext(logFile, swr, wr)
}
else
LogContext(logFile)
LogContext(logFile, swr, wr)
}
else
LogContext(logFile)
case "scalap" =>
runInContext(file, (logFile: File, outDir: File) => {
val sourceDir = Directory(if (file.isFile) file.getParent else file)
val sources = sourceDir.files filter (_ hasExtension "scala") map (_.jfile) toList
val results = sourceDir.files filter (_.name == "result.test") map (_.jfile) toList
if (sources.length != 1 || results.length != 1) {
NestUI.warning("Misconfigured scalap test directory: " + sourceDir + " \n")
false
@ -871,51 +919,50 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
}
})
case "script" => {
// when option "--failed" is provided
// execute test only if log file is present
// (which means it failed before)
val logFile = createLogFile(file)
if (!fileManager.failed || logFile.canRead) {
val (swr, wr) = initNextTest()
printInfoStart(file, wr)
case "script" =>
// when option "--failed" is provided
// execute test only if log file is present
// (which means it failed before)
val logFile = createLogFile(file)
if (!fileManager.failed || logFile.canRead) {
val (swr, wr) = initNextTest()
printInfoStart(file, wr)
NestUI.verbose(this+" running test "+fileBase)
NestUI.verbose(this+" running test "+fileBase)
// check whether there is an args file
val argsFile = new File(file.getParentFile, fileBase+".args")
NestUI.verbose("argsFile: "+argsFile)
val argString = file2String(argsFile)
// check whether there is an args file
val argsFile = new File(file.getParentFile, fileBase+".args")
NestUI.verbose("argsFile: "+argsFile)
val argString = file2String(argsFile)
try {
val cmdString =
if (isWin) {
val batchFile = new File(file.getParentFile, fileBase+".bat")
NestUI.verbose("batchFile: "+batchFile)
batchFile.getAbsolutePath
}
else file.getAbsolutePath
try {
val cmdString =
if (isWin) {
val batchFile = new File(file.getParentFile, fileBase+".bat")
NestUI.verbose("batchFile: "+batchFile)
batchFile.getAbsolutePath
}
else file.getAbsolutePath
succeeded = ((cmdString+argString) #> logFile !) == 0
diffCheck(compareOutput(file.getParentFile, logFile))
}
catch { // *catch-all*
case e: Exception =>
NestUI.verbose("caught "+e)
succeeded = false
}
succeeded = ((cmdString+argString) #> logFile !) == 0
diffCheck(compareOutput(file.getParentFile, logFile))
}
catch { // *catch-all*
case e: Exception =>
NestUI.verbose("caught "+e)
succeeded = false
}
LogContext(logFile, swr, wr)
} else
LogContext(logFile)
}
LogContext(logFile, swr, wr)
} else
LogContext(logFile)
}
def reportAll(results: Map[String, Int], cont: Map[String, Int] => Unit) {
timer.cancel()
cont(results)
}
object TestState {
val Ok = 0
val Fail = 1
@ -927,7 +974,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
val isFail = state == TestState.Fail
val isTimeout = state == TestState.Timeout
val hasLog = logFile != null
if (isGood) {
// add logfile from deletion list if test passed
if (hasLog)
@ -953,19 +1000,19 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
}
cleanup()
}
def finish() = {
def finish() {
done = true
cancelTimerTask()
reportAll(status.toMap, topcont)
}
Actor.loopWhile(!done) {
val parent = self
actor {
val testFile = getNextFile()
if (testFile == null)
finish()
else {
@ -1000,7 +1047,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
null,
Some((swr, wr))
)
case Result(file, logs) =>
val state = if (succeeded) TestState.Ok else TestState.Fail
updateStatus(file.getAbsolutePath, state)
@ -1015,7 +1062,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
private def filesToSet(pre: String, fs: List[String]): Set[AbstractFile] =
fs flatMap (s => Option(AbstractFile getFile (pre + s))) toSet
private def copyTestFiles(testDir: File, destDir: File) {
val invalidExts = List("changes", "svn", "obj")
testDir.listFiles.toList filter (
@ -1024,7 +1071,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
{ f => fileManager.copyFile(f, destDir) }
}
def showLog(logFile: File) {
private def showLog(logFile: File) {
file2String(logFile) match {
case "" if logFile.canRead => ()
case "" => NestUI.failure("Couldn't open log file: " + logFile + "\n")