--- /dev/null	2014-01-26 17:18:43.389006830 +0400
+++ new/test/testlibrary_tests/whitebox/WBStackSize.java	2014-01-29 18:56:02.723513315 +0400
@@ -0,0 +1,89 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test WBStackSize
+ * @summary verify that whitebox functions getThreadFullStackSize() and getThreadRemainingStackSize are working
+ * @library /testlibrary /testlibrary/whitebox
+ * @build WBStackSize
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xss512k WBStackSize
+ */
+
+import com.sun.management.HotSpotDiagnosticMXBean;
+import sun.hotspot.WhiteBox;
+
+public class WBStackSize {
+
+    static WhiteBox wb = WhiteBox.getWhiteBox();
+
+    static class SOE extends RuntimeException {
+        long rss;
+        SOE(long rss) { this.rss = rss; }
+    }
+
+    static void recursive(long n) {
+        try {
+            recursive(n + 1);
+        } catch ( StackOverflowError e ) {
+            throw new SOE(wb.getThreadRemainingStackSize());
+        }
+    }
+
+    public static void main(String... args) {
+        HotSpotDiagnosticMXBean bean = sun.management.ManagementFactoryHelper.getDiagnosticMXBean();
+        long sso = Long.valueOf(bean.getVMOption("ThreadStackSize").getValue()) * 1024;
+
+        System.out.println("ThreadStackSize VM option = " + sso);
+
+        long fss = wb.getThreadFullStackSize();
+        long rss = wb.getThreadRemainingStackSize();
+
+        System.out.print("Full stack size " + fss + ": ");
+
+        // Test has -Xss512k option
+        if ( fss < sso * 0.8 || fss > sso * 1.2 ) {
+            throw new RuntimeException("getThreadFullStackSize value [" + fss + "] should be within 80%..120% of the value returned by HotSpotDiagnosticMXBean");
+        } else {
+            System.out.println("OK");
+        }
+
+        System.out.print("Remaining stack size " + rss + ": ");
+        if ( fss < sso * 0.8 || fss > sso * 1.2 ) {
+            throw new RuntimeException("getThreadRemainingStackSize value [" + fss + "] should be within 80%..120% of the value returned by HotSpotDiagnosticMXBean");
+        } else {
+            System.out.println("OK");
+        }
+
+        try {
+            recursive(0);
+        } catch ( SOE e ) {
+            System.out.print("Remaining stack size on stack overflow " + e.rss + ": ");
+            if ( e.rss > 8 * 1024 ) {
+                throw new RuntimeException("Remaining stack size when StackOverflowError is caught should be at least 8K");
+            } else {
+                System.out.print("OK");
+            }
+        }
+    }
+}