Merge

nashorn/make/build-nasgen.xml

@@ -43,14 +43,14 @@
         </java>
     </target>
 
-    <target name="run-nasgen-eclipse">
+    <target name="run-nasgen-eclipse" depends="load-properties">
         <mkdir dir="${basedir}/build/eclipse/.nasgentmp"/>
 
         <java classname="jdk.nashorn.internal.tools.nasgen.Main" fork="true" failonerror="true">
             <classpath>
                 <pathelement location="${basedir}/buildtools/nasgen/dist/nasgen.jar"/>
             </classpath>
-            <jvmarg value="-Xbootclasspath/p:${basedir}/build/eclipse"/>
+            <jvmarg line="${nasgen.module.imports}"/>
             <arg value="${basedir}/build/eclipse"/>
             <arg value="jdk.nashorn.internal.objects"/>
             <arg value="${basedir}/build/eclipse/.nasgentmp"/>

nashorn/make/build.xml

@@ -27,11 +27,14 @@
   <import file="build-nasgen.xml"/>
   <import file="code_coverage.xml"/>
 
-  <target name="init-conditions">
+  <target name="load-properties">
     <!-- loading locally defined resources and properties. NB they owerwrite default ones defined later -->
     <property file="${user.home}/.nashorn.project.local.properties"/>
 
     <loadproperties srcFile="make/project.properties"/>
+  </target>
+
+  <target name="init-conditions" depends="load-properties">
     <path id="nashorn.jar.path">
          <pathelement location="${nashorn.jar}"/>
     </path>

nashorn/test/script/nosecurity/logcoverage.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
  */
 
 /**
- * mh_coverage.js
  * Screen scrape various logs to ensure that we cover enough functionality,
  * e.g. method handle instrumentation
  *
  * @test
- * @run
+ * @fork
+ * @option -Dnashorn.debug=true
  */
 
 /*
@@ -37,32 +37,32 @@
 
 function runScriptEngine(opts, name) {
     var imports = new JavaImporter(
-        Packages.jdk.nashorn.api.scripting,
-        java.io, java.lang, java.util);
+            Packages.jdk.nashorn.api.scripting,
+            java.io, java.lang, java.util);
 
-    with(imports) {
+    with (imports) {
         var fac = new NashornScriptEngineFactory();
         // get current System.err
         var oldErr = System.err;
-    var oldOut = System.out;
+        var oldOut = System.out;
         var baosErr = new ByteArrayOutputStream();
         var newErr = new PrintStream(baosErr);
         var baosOut = new ByteArrayOutputStream();
-    var newOut = new PrintStream(baosOut);
+        var newOut = new PrintStream(baosOut);
         try {
             // set new standard err
             System.setErr(newErr);
             System.setOut(newOut);
             var engine = fac.getScriptEngine(Java.to(opts, "java.lang.String[]"));
-        var reader = new java.io.FileReader(name);
+            var reader = new java.io.FileReader(name);
             engine.eval(reader);
             newErr.flush();
-        newOut.flush();
+            newOut.flush();
             return new java.lang.String(baosErr.toByteArray());
         } finally {
             // restore System.err to old value
             System.setErr(oldErr);
-        System.setOut(oldOut);
+            System.setOut(oldOut);
         }
     }
 }
@@ -70,36 +70,36 @@ function runScriptEngine(opts, name) {
 var str;
 
 var methodsCalled = [
-   'asCollector',
-   'asType',
-   'bindTo',
-   'dropArguments',
-   'explicitCastArguments',
-   'filterArguments',
-   'filterReturnValue',
-   'findStatic',
-   'findVirtual',
-   'foldArguments',
-   'getter',
-   'guardWithTest',
-   'insertArguments',
-   'methodType',
-   'setter'
+    'asCollector',
+    'asType',
+    'bindTo',
+    'dropArguments',
+    'explicitCastArguments',
+    'filterArguments',
+    'filterReturnValue',
+    'findStatic',
+    'findVirtual',
+    'foldArguments',
+    'getter',
+    'guardWithTest',
+    'insertArguments',
+    'methodType',
+    'setter'
 ];
 
 function check(str, strs) {
     for each (s in strs) {
-       if (str.indexOf(s) !== -1) {
-       continue;
-       }
-       print(s + " not found");
-       return;
+        if (str.indexOf(s) !== -1) {
+            continue;
+        }
+        print(s + " not found");
+        return;
     }
     print("check ok!");
 }
 
-str = runScriptEngine([ "--log=codegen,compiler=finest,methodhandles=finest,fields=finest" ], __DIR__ + "../basic/NASHORN-19.js");
-str += runScriptEngine([ "--log=codegen,compiler=finest,methodhandles=finest,fields=finest" ], __DIR__ + "../basic/varargs.js");
+str = runScriptEngine(["--log=codegen,compiler=finest,methodhandles=finest,fields=finest"], __DIR__ + "../basic/NASHORN-19.js");
+str += runScriptEngine(["--log=codegen,compiler=finest,methodhandles=finest,fields=finest"], __DIR__ + "../basic/varargs.js");
 
 check(str, methodsCalled);
 check(str, ['return', 'get', 'set', '[fields]']);

nashorn/test/script/nosecurity/logcoverage.js.EXPECTED

@@ -0,0 +1,4 @@
+check ok!
+check ok!
+check ok!
+hello, world!