Please get a peer review before pushing. Approved. Regards, Sean.
On 7 April 2015 06:44:52 GMT+01:00, "A. Sundararajan" <[email protected]> wrote: >Please approve. > >Bug: 8076972: Several nashorn tests failing > >Fix for https://bugs.openjdk.java.net/browse/JDK-8076646 resulted in a >number of jtreg test failures. The current fix is to fix that >regression. > >jdk9 review thread: >http://mail.openjdk.java.net/pipermail/nashorn-dev/2015-April/004428.html > >jdk8 webrev: http://cr.openjdk.java.net/~sundar/8076972/8u60/ > >Apart from backporting fix for 8076972 "as is", I had to include one >missing change in 8076446 fix. > >http://cr.openjdk.java.net/~sundar/8076646/webrev.00/test/src/jdk/nashorn/api/scripting/test/ScriptEngineTest.java.udiff.html >@@ -539,11 +540,11 @@ > @Test > public void scriptObjectAutoConversionTest() throws ScriptException { > final ScriptEngineManager m = new ScriptEngineManager(); > final ScriptEngine e = m.getEngineByName("nashorn"); > e.eval("obj = { foo: 'hello' }"); >- e.put("Window", >e.eval("Packages.jdk.nashorn.api.scripting.Window")); >+ e.put("Window", >e.eval("Packages.jdk.nashorn.api.scripting.test.Window")); > assertEquals(e.eval("Window.funcJSObject(obj)"), "hello"); > assertEquals(e.eval("Window.funcScriptObjectMirror(obj)"), >"hello"); > assertEquals(e.eval("Window.funcMap(obj)"), "hello"); > assertEquals(e.eval("Window.funcJSObject(obj)"), "hello"); > } > >was missed. CC'ing nashorn team just in case if additional review is >needed. > >Related fix: >http://mail.openjdk.java.net/pipermail/jdk8u-dev/2015-April/003347.html > >Thanks, >-Sundar -- Sent from my Android device with K-9 Mail. Please excuse my brevity.
