From ee02ad59ce2c42758712a1385f33ce962ae4107c Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Mon, 26 Oct 2009 09:56:33 +0000 Subject: new classpaths. --- test/files/jvm/interpreter.scala | 7 +++++-- test/files/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1 | 2 +- test/files/neg/plugin-before-parser/lib/plugins.jar.desired.sha1 | 2 +- .../neg/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1 | 2 +- test/files/neg/plugin-rafter-before-1/lib/plugins.jar.desired.sha1 | 2 +- .../neg/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1 | 2 +- test/files/run/constrained-types.scala | 2 ++ test/files/run/docgenerator.scala | 2 ++ test/files/run/lisp.scala | 2 +- test/files/run/t1500.scala | 2 ++ test/files/run/t1501.scala | 3 +++ 11 files changed, 20 insertions(+), 8 deletions(-) (limited to 'test') diff --git a/test/files/jvm/interpreter.scala b/test/files/jvm/interpreter.scala index a079af8fe2..2c2756828b 100644 --- a/test/files/jvm/interpreter.scala +++ b/test/files/jvm/interpreter.scala @@ -175,10 +175,13 @@ def f(e: Exp) = e match {{ // non-exhaustive warning here val output = new PrintWriter( new Skip1Writer(new OutputStreamWriter(Console.out))) val repl = new InterpreterLoop(input, output) - repl.main(new Settings) + val settings = new Settings + // when running that compiler, give it a scala-library to the classpath + settings.classpath.value = System.getProperty("java.class.path") + repl.main(settings) println() - val interp = new Interpreter(new Settings) + val interp = new Interpreter(settings) interp.interpret("def plusOne(x: Int) = x + 1") interp.interpret("plusOne(5)") interp.reset() diff --git a/test/files/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1 index 260293d333..23c54fb2de 100644 --- a/test/files/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1 +++ b/test/files/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1 @@ -1 +1 @@ -aaa554ce4b5988ad53f25f03a79d31c41aef4880 ?plugins.jar +cf80703ed94f5176dc099c60b32d0483322de9eb ?plugins.jar diff --git a/test/files/neg/plugin-before-parser/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-before-parser/lib/plugins.jar.desired.sha1 index e5e4f8ff4e..27c022e853 100644 --- a/test/files/neg/plugin-before-parser/lib/plugins.jar.desired.sha1 +++ b/test/files/neg/plugin-before-parser/lib/plugins.jar.desired.sha1 @@ -1 +1 @@ -72ab27cee282cf10760e6b7c342a21be7404ff6c ?plugins.jar +2e05e73ed90aaf286fa6555d992c1da18de3ceca ?plugins.jar diff --git a/test/files/neg/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1 index df598bcf21..f1fb45387c 100644 --- a/test/files/neg/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1 +++ b/test/files/neg/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1 @@ -1 +1 @@ -c2ca32f8eea54ff22a37d2c8a6ac1a6c5bb3e4ea ?plugins.jar +d96a5f1b3885225a5e203ae59ae2f2f3e3c65c9b ?plugins.jar diff --git a/test/files/neg/plugin-rafter-before-1/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-rafter-before-1/lib/plugins.jar.desired.sha1 index e53d2f4084..b07cece8b9 100644 --- a/test/files/neg/plugin-rafter-before-1/lib/plugins.jar.desired.sha1 +++ b/test/files/neg/plugin-rafter-before-1/lib/plugins.jar.desired.sha1 @@ -1 +1 @@ -1b9020d80db1bcb54d7f67c4f9b78907368dbadd ?plugins.jar +398fa866d1d5c6608c9607dd1079afc12182119f ?plugins.jar diff --git a/test/files/neg/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1 index f1cb183ef1..78a4fc0c98 100644 --- a/test/files/neg/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1 +++ b/test/files/neg/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1 @@ -1 +1 @@ -4a096491a11759166159b0830f1c112072790782 ?plugins.jar +b2166b6bc2a55264d959e613fa52695295db2281 ?plugins.jar diff --git a/test/files/run/constrained-types.scala b/test/files/run/constrained-types.scala index 56fbd749c0..59fd0b1b8c 100644 --- a/test/files/run/constrained-types.scala +++ b/test/files/run/constrained-types.scala @@ -90,6 +90,8 @@ object Test { settings.Xexperimental.value = true settings.selfInAnnots.value = true settings.deprecation.value = true + // when running that compiler, give it a scala-library to the classpath + settings.classpath.value = System.getProperty("java.class.path") val interp = new Interpreter(settings) diff --git a/test/files/run/docgenerator.scala b/test/files/run/docgenerator.scala index f3738f4fc0..59f90ba415 100644 --- a/test/files/run/docgenerator.scala +++ b/test/files/run/docgenerator.scala @@ -113,6 +113,8 @@ object Foo2 { var reporter: ConsoleReporter = _ def process(args: Array[String]) { val docSettings = new scala.tools.nsc.doc.Settings(error) + // when running that compiler, give it a scala-library to the classpath + docSettings.classpath.value = System.getProperty("java.class.path") reporter = new ConsoleReporter(docSettings) val command = new CompilerCommand(args.toList, docSettings, error, false) try { diff --git a/test/files/run/lisp.scala b/test/files/run/lisp.scala index 014990fc37..fe3941d0db 100644 --- a/test/files/run/lisp.scala +++ b/test/files/run/lisp.scala @@ -332,7 +332,7 @@ object LispAny extends Lisp { val result = eval1(x, env); if (trace) { indent -= 1; - for (val x <- range(1, indent)) Console.print(" "); + for (x <- range(1, indent)) Console.print(" "); Console.println("<=== " + result); } curexp = prevexp; diff --git a/test/files/run/t1500.scala b/test/files/run/t1500.scala index 58adea221c..de79b84e75 100644 --- a/test/files/run/t1500.scala +++ b/test/files/run/t1500.scala @@ -20,6 +20,8 @@ object Test { val tool = new Interpreter(new Settings()) val global = tool.compiler + // when running that compiler, give it a scala-library to the classpath + global.settings.classpath.value = System.getProperty("java.class.path") import global._ import definitions._ diff --git a/test/files/run/t1501.scala b/test/files/run/t1501.scala index 2a29a6c5a5..851daae0bb 100644 --- a/test/files/run/t1501.scala +++ b/test/files/run/t1501.scala @@ -31,6 +31,9 @@ object Test { val tool = new Interpreter(new Settings()) val global = tool.compiler + // when running that compiler, give it a scala-library to the classpath + global.settings.classpath.value = System.getProperty("java.class.path") + import global._ import definitions._ -- cgit v1.2.3