changeset 51611:2ef81feac8b8

8067354: com/sun/jdi/GetLocalVariables4Test.sh failed Reviewed-by: jcbeyler, sspitsyn
author amenkov
date Fri, 31 Aug 2018 09:53:37 -0700
parents cdef4df6b0e7
children bdac20c6c8dd
files test/jdk/ProblemList.txt test/jdk/com/sun/jdi/GetLocalVariables4Test.java test/jdk/com/sun/jdi/GetLocalVariables4Test.sh
diffstat 3 files changed, 77 insertions(+), 86 deletions(-) [+]
line wrap: on
line diff
--- a/test/jdk/ProblemList.txt	Fri Aug 31 10:22:04 2018 -0400
+++ b/test/jdk/ProblemList.txt	Fri Aug 31 09:53:37 2018 -0700
@@ -840,8 +840,6 @@
 
 com/sun/jdi/RepStep.java                                        8043571 generic-all
 
-com/sun/jdi/GetLocalVariables4Test.sh                           8067354 windows-all
-
 com/sun/jdi/sde/SourceDebugExtensionTest.java                   8158066 windows-all
 
 com/sun/jdi/NashornPopFrameTest.java                            8187143 generic-all
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/com/sun/jdi/GetLocalVariables4Test.java	Fri Aug 31 09:53:37 2018 -0700
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2002, 2018, 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
+ * @bug 4070747 4486859
+ * @summary Compiler fails to generate local var tbl entry for exception passed to catch
+ * @comment converted from test/jdk/com/sun/jdi/GetLocalVariables4Test.sh
+ *
+ * @library /test/lib
+ * @compile -g GetLocalVariables4Test.java
+ * @run main/othervm GetLocalVariables4Test
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import lib.jdb.JdbCommand;
+import lib.jdb.JdbTest;
+
+class GetLocalVariables4Targ {
+    public static void main(String[] args) {
+        System.out.println("Howdy!");
+        int i = 0;
+        try {
+            i = 16 / i;
+        } catch(Exception e) {
+            System.out.println("e should be visible");    // @1 breakpoint
+        }
+        System.out.println("Goodbye from GetLocalVariables4Targ!");
+    }
+}
+
+public class GetLocalVariables4Test extends JdbTest {
+    public static void main(String argv[]) {
+        new GetLocalVariables4Test().run();
+    }
+
+    private GetLocalVariables4Test() {
+        super(DEBUGGEE_CLASS);
+    }
+
+    private static final String DEBUGGEE_CLASS = GetLocalVariables4Targ.class.getName();
+
+    @Override
+    protected void runCases() {
+        setBreakpointsFromTestSource("GetLocalVariables4Test.java", 1);
+        // Run to breakpoint #1
+        jdb.command(JdbCommand.run());
+        jdb.command(JdbCommand.locals());
+        jdb.contToExit(1);
+
+        new OutputAnalyzer(getJdbOutput())
+                .shouldContain("e = instance of java.lang.ArithmeticException");
+        new OutputAnalyzer(getDebuggeeOutput())
+                .shouldContain("Howdy")
+                .shouldContain("Goodbye from GetLocalVariables4Targ");
+    }
+}
--- a/test/jdk/com/sun/jdi/GetLocalVariables4Test.sh	Fri Aug 31 10:22:04 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2002, 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
-#  @bug 4070747 4486859
-#  @summary Compiler fails to generate local var tbl entry for exception passed to catch
-#  @author Tim Bell
-#
-#  @run shell GetLocalVariables4Test.sh
-#
-classname=GetLocalVariables4Targ
-
-createJavaFile()
-{
-    cat <<EOF > $classname.java.1
-public class GetLocalVariables4Targ {
-    public static void main(String[] args) {
-        System.out.println("Howdy!");
-        int i = 0;
-        try {
-            i = 16 / i;
-        } catch(Exception e) {
-            System.out.println("e should be visible");    // @1 breakpoint
-        }
-        System.out.println("Goodbye from GetLocalVariables4Targ!");
-    }
-}
-EOF
-}
-
-# This is called to feed cmds to jdb.
-dojdbCmds()
-{
-   setBkpts @1
-   runToBkpt @1
-   cmd locals
-   cmd allowExit cont
-}
-
-mysetup()
-{
-    compileOptions="-g"
-    if [ -z "$TESTSRC" ] ; then
-        TESTSRC=.
-    fi
-
-    for ii in . $TESTSRC $TESTSRC/.. ; do
-        if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh
-            break
-        fi
-    done
-}
-
-mysetup
-
-runit
-jdbFailIfNotPresent "e = instance of java.lang.ArithmeticException"
-debuggeeFailIfNotPresent "Howdy"
-debuggeeFailIfNotPresent "Goodbye from GetLocalVariables4Targ"
-pass