diff options
Diffstat (limited to 'src/partest/scala/tools/partest/nest/ConsoleFileManager.scala')
-rw-r--r-- | src/partest/scala/tools/partest/nest/ConsoleFileManager.scala | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala index b270a6b65a..68e9753575 100644 --- a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala +++ b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala @@ -85,6 +85,7 @@ class ConsoleFileManager extends FileManager { latestLibFile = testClassesDir / "library" latestActorsFile = testClassesDir / "library" / "actors" latestActMigFile = testClassesDir / "actors-migration" + latestReflectFile = testClassesDir / "reflect" latestCompFile = testClassesDir / "compiler" latestPartestFile = testClassesDir / "partest" latestFjbgFile = testParent / "lib" / "fjbg.jar" @@ -96,6 +97,7 @@ class ConsoleFileManager extends FileManager { latestLibFile = dir / "lib/scala-library.jar" latestActorsFile = dir / "lib/scala-actors.jar" latestActMigFile = dir / "lib/scala-actors-migration.jar" + latestReflectFile = dir / "lib/scala-reflect.jar" latestCompFile = dir / "lib/scala-compiler.jar" latestPartestFile = dir / "lib/scala-partest.jar" latestFjbgFile = testParent / "lib" / "fjbg.jar" @@ -107,6 +109,7 @@ class ConsoleFileManager extends FileManager { latestLibFile = prefixFile("build/quick/classes/library") latestActorsFile = prefixFile("build/quick/classes/library/actors") latestActMigFile = prefixFile("build/quick/classes/actors-migration") + latestReflectFile = prefixFile("build/quick/classes/reflect") latestCompFile = prefixFile("build/quick/classes/compiler") latestPartestFile = prefixFile("build/quick/classes/partest") } @@ -118,6 +121,7 @@ class ConsoleFileManager extends FileManager { latestLibFile = prefixFileWith(p, "lib/scala-library.jar") latestActorsFile = prefixFileWith(p, "lib/scala-actors.jar") latestActMigFile = prefixFileWith(p, "lib/scala-actors-migration.jar") + latestReflectFile = prefixFileWith(p, "lib/scala-reflect.jar") latestCompFile = prefixFileWith(p, "lib/scala-compiler.jar") latestPartestFile = prefixFileWith(p, "lib/scala-partest.jar") } @@ -128,6 +132,7 @@ class ConsoleFileManager extends FileManager { latestLibFile = prefixFile("dists/latest/lib/scala-library.jar") latestActorsFile = prefixFile("dists/latest/lib/scala-actors.jar") latestActMigFile = prefixFile("dists/latest/lib/scala-actors-migration.jar") + latestReflectFile = prefixFile("dists/latest/lib/scala-reflect.jar") latestCompFile = prefixFile("dists/latest/lib/scala-compiler.jar") latestPartestFile = prefixFile("dists/latest/lib/scala-partest.jar") } @@ -138,6 +143,7 @@ class ConsoleFileManager extends FileManager { latestLibFile = prefixFile("build/pack/lib/scala-library.jar") latestActorsFile = prefixFile("build/pack/lib/scala-actors.jar") latestActMigFile = prefixFile("build/pack/lib/scala-actors-migration.jar") + latestReflectFile = prefixFile("build/pack/lib/scala-reflect.jar") latestCompFile = prefixFile("build/pack/lib/scala-compiler.jar") latestPartestFile = prefixFile("build/pack/lib/scala-partest.jar") } @@ -151,10 +157,10 @@ class ConsoleFileManager extends FileManager { names map (x => prefixFile(base + "/" + x).lastModified) reduceLeft (_ max _) // detect most recent build - val quickTime = mostRecentOf("build/quick/classes", "compiler/compiler.properties", "library/library.properties") - val packTime = mostRecentOf("build/pack/lib", "scala-compiler.jar", "scala-library.jar") - val distTime = mostRecentOf("dists/latest/lib", "scala-compiler.jar", "scala-library.jar") - val instTime = mostRecentOf("lib", "scala-compiler.jar", "scala-library.jar") + val quickTime = mostRecentOf("build/quick/classes", "compiler/compiler.properties", "reflect/reflect.properties", "library/library.properties") + val packTime = mostRecentOf("build/pack/lib", "scala-compiler.jar", "scala-reflect.jar", "scala-library.jar") + val distTime = mostRecentOf("dists/latest/lib", "scala-compiler.jar", "scala-reflect.jar", "scala-library.jar") + val instTime = mostRecentOf("lib", "scala-compiler.jar", "scala-reflect.jar", "scala-library.jar") val pairs = Map( (quickTime, () => setupQuick()), @@ -170,6 +176,7 @@ class ConsoleFileManager extends FileManager { } LATEST_LIB = latestLibFile.getAbsolutePath + LATEST_REFLECT = latestReflectFile.getAbsolutePath LATEST_COMP = latestCompFile.getAbsolutePath LATEST_PARTEST = latestPartestFile.getAbsolutePath LATEST_ACTORS = latestActorsFile.getAbsolutePath @@ -177,6 +184,7 @@ class ConsoleFileManager extends FileManager { } var LATEST_LIB: String = "" + var LATEST_REFLECT: String = "" var LATEST_COMP: String = "" var LATEST_PARTEST: String = "" var LATEST_ACTORS: String = "" @@ -186,6 +194,7 @@ class ConsoleFileManager extends FileManager { var latestLibFile: File = _ var latestActorsFile: File = _ var latestActMigFile: File = _ + var latestReflectFile: File = _ var latestCompFile: File = _ var latestPartestFile: File = _ var latestFjbgFile: File = _ |