2 files changed, 3 insertions, 7 deletions
diff --git a/src/partest/scala/tools/partest/nest/CompileManager.scala b/src/partest/scala/tools/partest/nest/CompileManager.scala
index ee843cd05b..2b91e5cbb8 100644
--- a/src/partest/scala/tools/partest/nest/CompileManager.scala
+++ b/src/partest/scala/tools/partest/nest/CompileManager.scala
@@ -26,8 +26,6 @@ abstract class SimpleCompiler {
   def compile(out: Option[File], files: List[File], kind: String, log: File): Boolean
 }
 
-class TestSettings(fileMan: FileManager) extends Settings(_ => ()) { }
-
 class DirectCompiler(val fileManager: FileManager) extends SimpleCompiler {
   def newGlobal(settings: Settings, reporter: Reporter): Global =
     new Global(settings, reporter)
@@ -39,13 +37,12 @@ class DirectCompiler(val fileManager: FileManager) extends SimpleCompiler {
   }
 
   def newSettings(out: Option[String]) = {
-    val settings = new TestSettings(fileManager)
-    //settings.usejavacp.value = true
+    val settings = new Settings(_ => ())
     settings.deprecation.value = true
     settings.nowarnings.value = false
     settings.encoding.value = "ISO-8859-1"    // XXX why?
 
-    val classpathElements = settings.classpath.value :: fileManager.LATEST_LIB :: out.toList
+    val classpathElements = fileManager.LATEST_LIB :: out.toList
     settings.classpath.value = ClassPath.join(classpathElements: _*)
     out foreach (settings.outdir.value = _)
 
diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala
index 6e8ccff723..2a8bf18c7a 100644
--- a/src/partest/scala/tools/partest/nest/Worker.scala
+++ b/src/partest/scala/tools/partest/nest/Worker.scala
@@ -396,8 +396,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
      *     output directory as arguments.
      */
     def runInContext(file: File, kind: String, script: (File, File) => Unit): LogContext = {
-      // when option "--failed" is provided
-      // execute test only if log file is present
+      // When option "--failed" is provided, execute test only if log file is present
       // (which means it failed before)
       val logFile = createLogFile(file, kind)
       if (!fileManager.failed || logFile.canRead) {