changeset 39791:c039d31b1f55

Merge
author amurillo
date Thu, 21 Jul 2016 17:13:46 +0000
parents ab6677d50e5e 079ffba6e096
children 3ed4aa54785e
files nashorn/test/script/currently-failing/logcoverage.js
diffstat 5 files changed, 118 insertions(+), 111 deletions(-) [+]
line wrap: on
line diff
--- a/nashorn/make/build-nasgen.xml	Thu Jul 21 16:43:00 2016 +0000
+++ b/nashorn/make/build-nasgen.xml	Thu Jul 21 17:13:46 2016 +0000
@@ -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"/>
--- a/nashorn/make/build.xml	Thu Jul 21 16:43:00 2016 +0000
+++ b/nashorn/make/build.xml	Thu Jul 21 17:13:46 2016 +0000
@@ -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>
--- a/nashorn/test/script/currently-failing/logcoverage.js	Thu Jul 21 16:43:00 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * mh_coverage.js
- * Screen scrape various logs to ensure that we cover enough functionality,
- * e.g. method handle instrumentation
- *
- * @test
- * @run
- */
-
-/*
- * creates new script engine initialized with given options and
- * runs given code on it. Returns standard output captured.
- */
-
-function runScriptEngine(opts, name) {
-    var imports = new JavaImporter(
-        Packages.jdk.nashorn.api.scripting,
-        java.io, java.lang, java.util);
-
-    with(imports) {
-        var fac = new NashornScriptEngineFactory();
-        // get current System.err
-        var oldErr = System.err;
-    var oldOut = System.out;
-        var baosErr = new ByteArrayOutputStream();
-        var newErr = new PrintStream(baosErr);
-        var baosOut = new ByteArrayOutputStream();
-    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);
-            engine.eval(reader);
-            newErr.flush();
-        newOut.flush();
-            return new java.lang.String(baosErr.toByteArray());
-        } finally {
-            // restore System.err to old value
-            System.setErr(oldErr);
-        System.setOut(oldOut);
-        }
-    }
-}
-
-var str;
-
-var methodsCalled = [
-   '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;
-    }
-    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");
-
-check(str, methodsCalled);
-check(str, ['return', 'get', 'set', '[fields]']);
-check(str, ['codegen']);
-
-print("hello, world!");
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/nosecurity/logcoverage.js	Thu Jul 21 17:13:46 2016 +0000
@@ -0,0 +1,108 @@
+/*
+ * 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Screen scrape various logs to ensure that we cover enough functionality,
+ * e.g. method handle instrumentation
+ *
+ * @test
+ * @fork
+ * @option -Dnashorn.debug=true
+ */
+
+/*
+ * creates new script engine initialized with given options and
+ * runs given code on it. Returns standard output captured.
+ */
+
+function runScriptEngine(opts, name) {
+    var imports = new JavaImporter(
+            Packages.jdk.nashorn.api.scripting,
+            java.io, java.lang, java.util);
+
+    with (imports) {
+        var fac = new NashornScriptEngineFactory();
+        // get current System.err
+        var oldErr = System.err;
+        var oldOut = System.out;
+        var baosErr = new ByteArrayOutputStream();
+        var newErr = new PrintStream(baosErr);
+        var baosOut = new ByteArrayOutputStream();
+        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);
+            engine.eval(reader);
+            newErr.flush();
+            newOut.flush();
+            return new java.lang.String(baosErr.toByteArray());
+        } finally {
+            // restore System.err to old value
+            System.setErr(oldErr);
+            System.setOut(oldOut);
+        }
+    }
+}
+
+var str;
+
+var methodsCalled = [
+    '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;
+    }
+    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");
+
+check(str, methodsCalled);
+check(str, ['return', 'get', 'set', '[fields]']);
+check(str, ['codegen']);
+
+print("hello, world!");
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/nosecurity/logcoverage.js.EXPECTED	Thu Jul 21 17:13:46 2016 +0000
@@ -0,0 +1,4 @@
+check ok!
+check ok!
+check ok!
+hello, world!