Merge pull request #2945 from som-snytt/test/jsr223-service

SI-7843 Restore JSR 223 service entry

3 files changed, 13 insertions, 2 deletions

diff --git a/build.xml b/build.xml
index c8256a4a24..bd0642be33 100755
--- a/build.xml
+++ b/build.xml
@@ -1358,11 +1358,10 @@ TODO:
           <attribute name="Class-Path" value="scala-reflect.jar scala-library.jar"/>
         </manifest>
       </pre>
-      <!-- script api is 2.11-only so far
+      <!-- JSR-223 support introduced in 2.11 -->
       <jar-opts>
         <service type="javax.script.ScriptEngineFactory" provider="scala.tools.nsc.interpreter.IMain$Factory"/>
       </jar-opts>
-      -->
     </staged-pack>
   </target>
 
diff --git a/test/files/run/t7843-jsr223-service.check b/test/files/run/t7843-jsr223-service.check
new file mode 100644
index 0000000000..a668df3567
--- /dev/null
+++ b/test/files/run/t7843-jsr223-service.check
@@ -0,0 +1,2 @@
+n: Object = 10
+12345678910
diff --git a/test/files/run/t7843-jsr223-service.scala b/test/files/run/t7843-jsr223-service.scala
new file mode 100644
index 0000000000..0e3a9e572c
--- /dev/null
+++ b/test/files/run/t7843-jsr223-service.scala
@@ -0,0 +1,10 @@
+
+import javax.script._
+import scala.tools.nsc.interpreter.IMain
+
+object Test extends App {
+  val engine = new ScriptEngineManager getEngineByName "scala"
+  engine.asInstanceOf[IMain].settings.usejavacp.value = true
+  engine put ("n", 10)
+  engine eval "1 to n.asInstanceOf[Int] foreach print"
+}