diff options
author | Philipp Haller <hallerp@gmail.com> | 2008-01-24 10:33:29 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2008-01-24 10:33:29 +0000 |
commit | cfa21f44a039776e87f7c1291418503d2f5ea766 (patch) | |
tree | 2b1fd85b5dc6768f5ff32b6dd706dec3f25d95b1 /src/partest | |
parent | ed48d258dcdc879b4f5d046f7497f1a18876c98d (diff) | |
download | scala-cfa21f44a039776e87f7c1291418503d2f5ea766.tar.gz scala-cfa21f44a039776e87f7c1291418503d2f5ea766.tar.bz2 scala-cfa21f44a039776e87f7c1291418503d2f5ea766.zip |
Deleted obsolete file
Diffstat (limited to 'src/partest')
-rw-r--r-- | src/partest/scala/tools/partest/TestRunner.scala | 10 | ||||
-rw-r--r-- | src/partest/scala/tools/partest/WorkerActor.scala | 13 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/partest/scala/tools/partest/TestRunner.scala b/src/partest/scala/tools/partest/TestRunner.scala index b1cfc4cdb5..780d965d49 100644 --- a/src/partest/scala/tools/partest/TestRunner.scala +++ b/src/partest/scala/tools/partest/TestRunner.scala @@ -175,11 +175,13 @@ 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) - } - val negFiles = getFiles("neg", negCheck) + }*/ + master ! PosTest(posFiles(0)) + + /*val negFiles = getFiles("neg", negCheck) if (! negFiles.isEmpty) { printOutline("\nTesting compiler (on files whose compilation should fail)\n") for (file <- negFiles) master ! NegTest(file) @@ -200,7 +202,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 88bf957582..8d8fb556c2 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,6 +172,7 @@ 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(_)) => |