Members removed from partest.

It has accreted its share through the bumpy years.

11 files changed, 5 insertions, 67 deletions

diff --git a/src/partest/scala/tools/partest/CompilerTest.scala b/src/partest/scala/tools/partest/CompilerTest.scala
index d73d99bc89..bb0732dcc6 100644
--- a/src/partest/scala/tools/partest/CompilerTest.scala
+++ b/src/partest/scala/tools/partest/CompilerTest.scala
@@ -21,7 +21,7 @@ abstract class CompilerTest extends DirectTest {
   lazy val global: Global = newCompiler()
   lazy val units = compilationUnits(global)(sources: _ *)
   import global._
-  import definitions._
+  import definitions.{ compilerTypeFromTag }
 
   override def extraSettings = "-usejavacp -d " + testOutput.path
 
@@ -32,7 +32,6 @@ abstract class CompilerTest extends DirectTest {
   def sources: List[String] = List(code)
 
   // Utility functions
-
   class MkType(sym: Symbol) {
     def apply[M](implicit t: ru.TypeTag[M]): Type =
       if (sym eq NoSymbol) NoType
diff --git a/src/partest/scala/tools/partest/SecurityTest.scala b/src/partest/scala/tools/partest/SecurityTest.scala
index 2d6f61d0b1..1f1c8a95ea 100644
--- a/src/partest/scala/tools/partest/SecurityTest.scala
+++ b/src/partest/scala/tools/partest/SecurityTest.scala
@@ -10,23 +10,10 @@ import java.util._
 
 abstract class SecurityTest extends App {
   def throwIt(x: Any) = throw new AccessControlException("" + x)
-
-  def readPerm(p: PropertyPermission)            = p.getActions contains "read"
-  def writePerm(p: PropertyPermission)           = p.getActions contains "write"
   def propertyCheck(p: PropertyPermission): Unit = throwIt(p)
 
   def check(perm: Permission): Unit = perm match {
     case p: PropertyPermission  => propertyCheck(p)
     case _                      => ()
   }
-
-  lazy val sm = new SecurityManager {
-    // these two are the choke points for all permissions checks
-    override def checkPermission(perm: Permission): Unit = check(perm)
-    override def checkPermission(perm: Permission, context: Object): Unit = check(perm)
-  }
-  def securityOn(): Boolean = {
-    try   { System.setSecurityManager(sm) ; true }
-    catch { case _: SecurityException => false }
-  }
 }
diff --git a/src/partest/scala/tools/partest/TestUtil.scala b/src/partest/scala/tools/partest/TestUtil.scala
index 9bfd444180..5c177ac962 100644
--- a/src/partest/scala/tools/partest/TestUtil.scala
+++ b/src/partest/scala/tools/partest/TestUtil.scala
@@ -24,14 +24,6 @@ trait TestUtil {
   }
   def nanos(body: => Unit): Long = alsoNanos(body)._1
 
-  def verifySpeed(body1: => Unit, body2: => Unit, acceptableMultiple: Double) = {
-    val t1 = nanos(body1).toDouble
-    val t2 = nanos(body2).toDouble
-    val mult = if (t1 > t2) t1 / t2 else t2 / t1
-
-    assert(mult <= acceptableMultiple, "Performance difference too great: multiple = " + mult)
-  }
-
   def intercept[T <: Exception : ClassTag](code: => Unit): Unit =
     try {
       code
@@ -41,6 +33,6 @@ trait TestUtil {
     }
 }
 
+// Used in tests.
 object TestUtil extends TestUtil {
-
 }
diff --git a/src/partest/scala/tools/partest/instrumented/Instrumentation.scala b/src/partest/scala/tools/partest/instrumented/Instrumentation.scala
index 8a284b313b..18dd740208 100644
--- a/src/partest/scala/tools/partest/instrumented/Instrumentation.scala
+++ b/src/partest/scala/tools/partest/instrumented/Instrumentation.scala
@@ -78,6 +78,7 @@ object Instrumentation {
     !t.className.startsWith("scala/util/DynamicVariable")
   }
 
+  // Used in tests.
   def printStatistics(stats: Statistics = getStatistics, filter: MethodCallTrace => Boolean = standardFilter): Unit = {
     val stats = getStatistics
     println("Method call statistics:")
diff --git a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala
index 75aed449a8..7000e8280b 100644
--- a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala
+++ b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala
@@ -79,7 +79,6 @@ class ConsoleFileManager extends FileManager {
       testClassesDir = Path(testClasses.get).toCanonical.toDirectory
       NestUI.verbose("Running with classes in "+testClassesDir)
 
-      latestFile        = testClassesDir.parent / "bin"
       latestLibFile     = testClassesDir / "library"
       latestActorsFile  = testClassesDir / "library" / "actors"
       latestReflectFile = testClassesDir / "reflect"
@@ -90,7 +89,6 @@ class ConsoleFileManager extends FileManager {
     else if (testBuild.isDefined) {
       val dir = Path(testBuild.get)
       NestUI.verbose("Running on "+dir)
-      latestFile        = dir / "bin"
       latestLibFile     = dir / "lib/scala-library.jar"
       latestActorsFile  = dir / "lib/scala-actors.jar"
       latestReflectFile = dir / "lib/scala-reflect.jar"
@@ -101,7 +99,6 @@ class ConsoleFileManager extends FileManager {
     else {
       def setupQuick() {
         NestUI.verbose("Running build/quick")
-        latestFile        = prefixFile("build/quick/bin")
         latestLibFile     = prefixFile("build/quick/classes/library")
         latestActorsFile  = prefixFile("build/quick/classes/library/actors")
         latestReflectFile = prefixFile("build/quick/classes/reflect")
@@ -112,7 +109,6 @@ class ConsoleFileManager extends FileManager {
       def setupInst() {
         NestUI.verbose("Running dist (installed)")
         val p = testParent.getParentFile
-        latestFile        = prefixFileWith(p, "bin")
         latestLibFile     = prefixFileWith(p, "lib/scala-library.jar")
         latestActorsFile  = prefixFileWith(p, "lib/scala-actors.jar")
         latestReflectFile = prefixFileWith(p, "lib/scala-reflect.jar")
@@ -122,7 +118,6 @@ class ConsoleFileManager extends FileManager {
 
       def setupDist() {
         NestUI.verbose("Running dists/latest")
-        latestFile        = prefixFile("dists/latest/bin")
         latestLibFile     = prefixFile("dists/latest/lib/scala-library.jar")
         latestActorsFile  = prefixFile("dists/latest/lib/scala-actors.jar")
         latestReflectFile = prefixFile("dists/latest/lib/scala-reflect.jar")
@@ -132,7 +127,6 @@ class ConsoleFileManager extends FileManager {
 
       def setupPack() {
         NestUI.verbose("Running build/pack")
-        latestFile        = prefixFile("build/pack/bin")
         latestLibFile     = prefixFile("build/pack/lib/scala-library.jar")
         latestActorsFile  = prefixFile("build/pack/lib/scala-actors.jar")
         latestReflectFile = prefixFile("build/pack/lib/scala-reflect.jar")
@@ -175,7 +169,6 @@ class ConsoleFileManager extends FileManager {
   var LATEST_PARTEST: String = ""
   var LATEST_ACTORS: String = ""
 
-  var latestFile: File = _
   var latestLibFile: File = _
   var latestActorsFile: File = _
   var latestReflectFile: File = _
@@ -187,8 +180,6 @@ class ConsoleFileManager extends FileManager {
   // initialize above fields
   findLatest()
 
-  var testFiles: List[io.Path] = Nil
-
   def getFiles(kind: String, cond: Path => Boolean): List[File] = {
     def ignoreDir(p: Path) = List("svn", "obj") exists (p hasExtension _)
 
@@ -197,9 +188,7 @@ class ConsoleFileManager extends FileManager {
     if (dir.isDirectory) NestUI.verbose("look in %s for tests" format dir)
     else NestUI.failure("Directory '%s' not found" format dir)
 
-    val files =
-      if (testFiles.nonEmpty) testFiles filter (_.parent isSame dir)
-      else dir.list filterNot ignoreDir filter cond toList
+    val files = dir.list filterNot ignoreDir filter cond toList
 
     ( if (failed) files filter (x => logFileExists(x, kind)) else files ) map (_.jfile)
   }
diff --git a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala
index d23ee81e4d..d146618d0e 100644
--- a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala
+++ b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala
@@ -51,8 +51,6 @@ class ConsoleRunner extends DirectRunner {
   private val testSetArgs   = testSets map ("--" + _.kind)
   private val testSetArgMap = testSetArgs zip testSets toMap
 
-  def denotesTestSet(arg: String)  = testSetArgs contains arg
-
   private def printVersion() { NestUI outline (versionMsg + "\n") }
 
   private val unaryArgs = List(
diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala
index 21fd314552..a4c4e7e6a6 100644
--- a/src/partest/scala/tools/partest/nest/FileManager.scala
+++ b/src/partest/scala/tools/partest/nest/FileManager.scala
@@ -72,17 +72,11 @@ trait FileManager extends FileUtil {
   var SCALAC_OPTS = PartestDefaults.scalacOpts.split(' ').toSeq
   var JAVA_OPTS   = PartestDefaults.javaOpts
   var timeout     = PartestDefaults.timeout
-  // how can 15 minutes not be enough? What are you doing, run/lisp.scala?
-  // You complete in 11 seconds on my machine.
-  var oneTestTimeout = 60 * 60 * 1000
 
   /** Only when --debug is given. */
   lazy val testTimings = new mutable.HashMap[String, Long]
   def recordTestTiming(name: String, milliseconds: Long) =
     synchronized { testTimings(name) = milliseconds }
-  def showTestTimings() {
-    testTimings.toList sortBy (-_._2) foreach { case (k, v) => println("%s: %s".format(k, v)) }
-  }
 
   def getLogFile(dir: File, fileBase: String, kind: String): File =
     new File(dir, fileBase + "-" + kind + ".log")
diff --git a/src/partest/scala/tools/partest/nest/NestUI.scala b/src/partest/scala/tools/partest/nest/NestUI.scala
index 70db6d0ed1..ab90d387d0 100644
--- a/src/partest/scala/tools/partest/nest/NestUI.scala
+++ b/src/partest/scala/tools/partest/nest/NestUI.scala
@@ -54,9 +54,6 @@ object NestUI {
   }
 
   def warning(msg: String) = print(_warning  + msg + _default)
-  def warning(msg: String, wr: PrintWriter) = synchronized {
-    wr.print(_warning + msg + _default)
-  }
 
   def normal(msg: String) = print(_default + msg)
   def normal(msg: String, wr: PrintWriter) = synchronized {
@@ -104,7 +101,6 @@ object NestUI {
   }
 
   var _verbose = false
-  var _debug = false
 
   def verbose(msg: String) {
     if (_verbose) {
@@ -112,10 +108,4 @@ object NestUI {
       println(msg)
     }
   }
-  def debug(msg: String) {
-    if (isPartestDebug) {
-      outline("debug: ")
-      println(msg)
-    }
-  }
 }
diff --git a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala
index 22010d4b16..4b0ed1f82a 100644
--- a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala
+++ b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala
@@ -3,8 +3,6 @@
  * @author Philipp Haller
  */
 
-// $Id$
-
 package scala.tools.partest
 package nest
 
diff --git a/src/partest/scala/tools/partest/nest/RunnerManager.scala b/src/partest/scala/tools/partest/nest/RunnerManager.scala
index 548c5abbd9..f2ce19a950 100644
--- a/src/partest/scala/tools/partest/nest/RunnerManager.scala
+++ b/src/partest/scala/tools/partest/nest/RunnerManager.scala
@@ -286,15 +286,10 @@ class RunnerManager(kind: String, val fileManager: FileManager, params: TestRunP
     def newTestWriters() = {
       val swr = new StringWriter
       val wr  = new PrintWriter(swr, true)
-      // diff    = ""
 
       ((swr, wr))
     }
 
-    def fail(what: Any) = {
-      NestUI.verbose("scalac: compilation of "+what+" failed\n")
-      false
-    }
     def diffCheck(testFile: File, diff: String) = {
       testDiff = diff
       testDiff == ""
diff --git a/src/partest/scala/tools/partest/package.scala b/src/partest/scala/tools/partest/package.scala
index 58cc7d5b0b..2b2ce2e435 100644
--- a/src/partest/scala/tools/partest/package.scala
+++ b/src/partest/scala/tools/partest/package.scala
@@ -12,11 +12,7 @@ import scala.sys.process.javaVmArguments
 import java.util.concurrent.Callable
 
 package partest {
-  class TestState {
-    def isOk      = this eq TestState.Ok
-    def isFail    = this eq TestState.Fail
-    def isTimeout = this eq TestState.Timeout
-  }
+  class TestState { }
   object TestState {
     val Ok      = new TestState
     val Fail    = new TestState
@@ -43,7 +39,6 @@ package object partest {
 
   def callable[T](body: => T): Callable[T] = new Callable[T] { override def call() = body }
 
-  def path2String(path: String) = file2String(new JFile(path))
   def file2String(f: JFile) =
     try SFile(f).slurp(scala.io.Codec.UTF8)
     catch { case _: FileNotFoundException => "" }