--- a/nashorn/test/script/basic/JDK-8055762.js	Mon Aug 25 17:38:53 2014 +0400
+++ b/nashorn/test/script/basic/JDK-8055762.js	Mon Aug 25 20:26:53 2014 +0530
@@ -23,7 +23,9 @@
 
 /**
  * JDK-8055762: Nashorn misses linker for netscape.javascript.JSObject instances
+ *
  * @test
+ * @option -scripting
  * @run
  */
 
@@ -31,32 +33,52 @@
 // instances. For this test, we just subclass that class rather than
 // involve actual browser script engine or javafx webkit objects.
 
-var JSObject = Java.type("netscape.javascript.JSObject");
-var obj = new (Java.extend(JSObject))() {
-    getMember: function(name) {
-        if (name == "func") {
-            return function(arg) {
-                print("func called with " + arg);
-            }
+function main() {
+    var JSObject;
+    try {
+        JSObject = Java.type("netscape.javascript.JSObject");
+    } catch (e) {
+        if (e instanceof java.lang.ClassNotFoundException) {
+            // pass vacuously by emitting the .EXPECTED file content
+            var str = readFully(__DIR__ + "JDK-8055762.js.EXPECTED");
+            print(str.substring(0, str.length - 1));
+            return;
+        } else{
+            fail("unexpected exception for JSObject", e);
         }
-        return name.toUpperCase();
-    },
-
-    getSlot: function(index) {
-        return index^2;
-    },
+    }
+    test(JSObject);
+}
 
-    setMember: function(name, value) {
-        print(name + " set to " + value);
-    },
+function test(JSObject) {
+    var obj = new (Java.extend(JSObject))() {
+        getMember: function(name) {
+            if (name == "func") {
+                return function(arg) {
+                    print("func called with " + arg);
+                }
+            }
+            return name.toUpperCase();
+        },
+
+        getSlot: function(index) {
+            return index^2;
+        },
 
-    setSlot: function(index, value) {
-        print("[" + index + "] set to " + value);
-    }
-};
+        setMember: function(name, value) {
+            print(name + " set to " + value);
+        },
+
+        setSlot: function(index, value) {
+            print("[" + index + "] set to " + value);
+        }
+    };
 
-print(obj["foo"]);
-print(obj[2]);
-obj.bar = 23;
-obj[3] = 23;
-obj.func("hello");
+    print(obj["foo"]);
+    print(obj[2]);
+    obj.bar = 23;
+    obj[3] = 23;
+    obj.func("hello");
+}
+
+main();

--- a/nashorn/test/script/basic/JDK-8055796.js	Mon Aug 25 17:38:53 2014 +0400
+++ b/nashorn/test/script/basic/JDK-8055796.js	Mon Aug 25 20:26:53 2014 +0530
@@ -35,33 +35,3 @@
 print("foo =", jsobj['getMember(java.lang.String)']("foo"));
 print("eval =", jsobj['eval(String)']("this + 44"));
 print("valueOf function? =", (jsobj.valueOf)['isFunction()']());
-
-var JSObject = Java.type("netscape.javascript.JSObject");
-var bjsobj = new (Java.extend(JSObject))() {
-    getMember: function(name) {
-        if (name == "func") {
-            return function(arg) {
-                print("func called with " + arg);
-            }
-        }
-        return name.toUpperCase();
-    },
-
-    getSlot: function(index) {
-        return index*index;
-    },
-
-    setMember: function(name, value) {
-        print(name + " set to " + value);
-    },
-
-    setSlot: function(index, value) {
-        print("[" + index + "] set to " + value);
-    }
-};
-
-print("getMember('foo') =", bjsobj['getMember(String)']('foo'));
-print("getSlot(6) =", bjsobj['getSlot(int)'](6));
-bjsobj['setMember(String, Object)']('bar', 'hello');
-bjsobj['setSlot(int, Object)'](10, 42);
-

--- a/nashorn/test/script/basic/JDK-8055796.js.EXPECTED	Mon Aug 25 17:38:53 2014 +0400
+++ b/nashorn/test/script/basic/JDK-8055796.js.EXPECTED	Mon Aug 25 20:26:53 2014 +0530
@@ -1,7 +1,3 @@
 foo = 33
 eval = 86
 valueOf function? = true
-getMember('foo') = FOO
-getSlot(6) = 36
-bar set to hello
-[10] set to 42

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8055796_2.js	Mon Aug 25 20:26:53 2014 +0530
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+/**
+ * JDK-8055796: JSObject and browser JSObject linkers should provide fallback to call underlying Java methods directly
+ *
+ * @test
+ * @option -scripting
+ * @run
+ */
+
+function main() {
+    var JSObject;
+    try {
+        JSObject = Java.type("netscape.javascript.JSObject");
+    } catch (e) {
+        if (e instanceof java.lang.ClassNotFoundException) {
+            // pass vacuously by emitting the .EXPECTED file content
+            var str = readFully(__DIR__ + "JDK-8055796_2.js.EXPECTED");
+            print(str.substring(0, str.length - 1));
+            return;
+        } else {
+            fail("unexpected exception on JSObject", e);
+        }
+    }
+    test(JSObject);
+}
+
+function test(JSObject) {
+    var bjsobj = new (Java.extend(JSObject))() {
+        getMember: function(name) {
+            if (name == "func") {
+                return function(arg) {
+                    print("func called with " + arg);
+                }
+            }
+            return name.toUpperCase();
+        },
+
+        getSlot: function(index) {
+            return index*index;
+        },
+
+        setMember: function(name, value) {
+            print(name + " set to " + value);
+        },
+
+        setSlot: function(index, value) {
+            print("[" + index + "] set to " + value);
+        }
+    };
+
+    print("getMember('foo') =", bjsobj['getMember(String)']('foo'));
+    print("getSlot(6) =", bjsobj['getSlot(int)'](6));
+    bjsobj['setMember(String, Object)']('bar', 'hello');
+    bjsobj['setSlot(int, Object)'](10, 42);
+}
+
+main();

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8055796_2.js.EXPECTED	Mon Aug 25 20:26:53 2014 +0530
@@ -0,0 +1,4 @@
+getMember('foo') = FOO
+getSlot(6) = 36
+bar set to hello
+[10] set to 42