summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorStefan Zeiger <szeiger@novocode.com>2016-05-25 12:53:36 +0200
committerStefan Zeiger <szeiger@novocode.com>2016-05-25 12:53:36 +0200
commit139f6bf9d709fc18a23530f2f84afa8a1f97b464 (patch)
tree7571f14fb6fe8304868f69d026b8ced201008ae4 /test
parentcba585d41b9c2c47f256cbce45115bb205ae58a2 (diff)
parent206a657225f16c0fa847f0b2abaddc17b8d945d7 (diff)
downloadscala-139f6bf9d709fc18a23530f2f84afa8a1f97b464.tar.gz
scala-139f6bf9d709fc18a23530f2f84afa8a1f97b464.tar.bz2
scala-139f6bf9d709fc18a23530f2f84afa8a1f97b464.zip
Merge pull request #4959 from rjolly/scripting15
Use jarlister in build
Diffstat (limited to 'test')
-rw-r--r--test/files/run/t7843-jsr223-service.scala6
-rw-r--r--test/files/run/t7933.scala6
2 files changed, 4 insertions, 8 deletions
diff --git a/test/files/run/t7843-jsr223-service.scala b/test/files/run/t7843-jsr223-service.scala
index 31112212ea..3c853878ba 100644
--- a/test/files/run/t7843-jsr223-service.scala
+++ b/test/files/run/t7843-jsr223-service.scala
@@ -1,8 +1,6 @@
-import scala.tools.nsc.interpreter.IMain
-
object Test extends App {
- val engine = new IMain.Factory getScriptEngine()
- engine.asInstanceOf[IMain].settings.usejavacp.value = true
+ val m = new javax.script.ScriptEngineManager()
+ val engine = m.getEngineByName("scala")
engine put ("n", 10)
engine eval "1 to n.asInstanceOf[Int] foreach print"
}
diff --git a/test/files/run/t7933.scala b/test/files/run/t7933.scala
index b06dffcd80..58e39dd384 100644
--- a/test/files/run/t7933.scala
+++ b/test/files/run/t7933.scala
@@ -1,8 +1,6 @@
-import scala.tools.nsc.interpreter.IMain
-
object Test extends App {
- val engine = new IMain.Factory getScriptEngine()
- engine.asInstanceOf[IMain].settings.usejavacp.value = true
+ val m = new javax.script.ScriptEngineManager()
+ val engine = m.getEngineByName("scala")
val res2 = engine.asInstanceOf[javax.script.Compilable]
res2 compile "8" eval()
val res5 = res2 compile """println("hello") ; 8"""