diff options
author | Philipp Haller <hallerp@gmail.com> | 2008-01-24 10:42:18 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2008-01-24 10:42:18 +0000 |
commit | fb51361c652acab3f624ca178b187810e82c6587 (patch) | |
tree | d5b039b51604e59fb380bcafa8a4e6c0d969d70a /src | |
parent | cfa21f44a039776e87f7c1291418503d2f5ea766 (diff) | |
download | scala-fb51361c652acab3f624ca178b187810e82c6587.tar.gz scala-fb51361c652acab3f624ca178b187810e82c6587.tar.bz2 scala-fb51361c652acab3f624ca178b187810e82c6587.zip |
Fixed build
Diffstat (limited to 'src')
-rw-r--r-- | src/partest/scala/tools/partest/TestRunner.scala | 10 | ||||
-rw-r--r-- | src/partest/scala/tools/partest/WorkerActor.scala | 14 |
2 files changed, 10 insertions, 14 deletions
diff --git a/src/partest/scala/tools/partest/TestRunner.scala b/src/partest/scala/tools/partest/TestRunner.scala index 780d965d49..b1cfc4cdb5 100644 --- a/src/partest/scala/tools/partest/TestRunner.scala +++ b/src/partest/scala/tools/partest/TestRunner.scala @@ -175,13 +175,11 @@ object TestRunner { master.start val posFiles = getFiles("pos", posCheck) - /*if (! posFiles.isEmpty) { + if (! posFiles.isEmpty) { printOutline("\nTesting compiler (on files whose compilation should succeed)\n") for (file <- posFiles) master ! PosTest(file) - }*/ - master ! PosTest(posFiles(0)) - - /*val negFiles = getFiles("neg", negCheck) + } + val negFiles = getFiles("neg", negCheck) if (! negFiles.isEmpty) { printOutline("\nTesting compiler (on files whose compilation should fail)\n") for (file <- negFiles) master ! NegTest(file) @@ -202,7 +200,7 @@ object TestRunner { if (! shootFiles.isEmpty) { printOutline("\nTesting shootout benchmarks\n") for (file <- shootFiles) master! ShootoutTest(createTestFile(file, "shootout")) - }*/ + } master ! ("start", conservative) } diff --git a/src/partest/scala/tools/partest/WorkerActor.scala b/src/partest/scala/tools/partest/WorkerActor.scala index 8d8fb556c2..557d048515 100644 --- a/src/partest/scala/tools/partest/WorkerActor.scala +++ b/src/partest/scala/tools/partest/WorkerActor.scala @@ -89,16 +89,16 @@ class WorkerActor(val master: MasterActor, val settings: Settings, var reporter: } var start = System.currentTimeMillis - println("Starting..." + test.kind + " " + test.test) + //println("Starting..." + test.kind + " " + test.test) var toCompile = List(test.file.getPath) var outDir: File = new File(test.dir, test.fileBase + "-" + test.kind + ".obj") if (! outDir.exists) { outDir.mkdir - println(this.toString + " " + "Created " + outDir) + //println(this.toString + " " + "Created " + outDir) } else { - println(this.toString + " " + "Didn't need to create " + outDir) + //println(this.toString + " " + "Didn't need to create " + outDir) } test match { case NegTest(_) => @@ -139,16 +139,16 @@ class WorkerActor(val master: MasterActor, val settings: Settings, var reporter: val c = compiler - println("about to define compilation settings...") + //println("about to define compilation settings...") test.defineSettings(settings) try { - println(this.toString + " " + "Launching compiler on " + toCompile) + //println(this.toString + " " + "Launching compiler on " + toCompile) (new c.Run) compile toCompile reporter.printSummary reporter.writer.flush reporter.writer.close - println(this.toString + " " + "Finished compiling " + test.fileBase) + //println(this.toString + " " + "Finished compiling " + test.fileBase) } catch { case e => { e.printStackTrace @@ -172,8 +172,6 @@ class WorkerActor(val master: MasterActor, val settings: Settings, var reporter: case NegTest(_) => reporter.hasErrors case _ => !reporter.hasErrors } - println("success: "+success) - (bypassObjectRunner, success, test) match { case (_, _, PosTest(_)) => case (_, _, NegTest(_)) => |