[SCM] archer-pmuldoon-next-over-throw2: rewrite test case to work with more gcj versions

[SCM] archer-pmuldoon-next-over-throw2: rewrite test case to work with more gcj versions

[tromey]

The branch, archer-pmuldoon-next-over-throw2 has been updated
       via  0c4d9d1c06c18faa7bce9e63a5c9a514ef95f3c8 (commit)
      from  6b808ead605d6287bd35447ad5a6b383524086f8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 0c4d9d1c06c18faa7bce9e63a5c9a514ef95f3c8
Author: Tom Tromey <tromey@redhat.com>
Date:   Tue Nov 30 12:07:48 2010 -0700

    rewrite test case to work with more gcj versions

-----------------------------------------------------------------------

Summary of changes:
 gdb/testsuite/gdb.java/jnpe.exp  |   12 ++++++++----
 gdb/testsuite/gdb.java/jnpe.java |    4 +++-
 2 files changed, 11 insertions(+), 5 deletions(-)

First 500 lines of diff:
diff --git a/gdb/testsuite/gdb.java/jnpe.exp b/gdb/testsuite/gdb.java/jnpe.exp
index 10ce365..f2895f6 100644
--- a/gdb/testsuite/gdb.java/jnpe.exp
+++ b/gdb/testsuite/gdb.java/jnpe.exp
@@ -59,12 +59,16 @@ gdb_test "handle SIGSEGV nostop noprint" \
   "SIGSEGV.*fault" \
   "disable SIGSEGV for next-over-NPE"
 
-# The line where we stop differs according to gcj; check just we did
-# not already execute the catch point.
+# The line where we stop differs according to gcj; just check that we
+# did not already execute the catch point.  This is done in a somewhat
+# funny way due to other gcj debuginfo oddities that don't
+# meaningfully affect the user's experience.
 
 gdb_test "next" \
   ".*" \
   "next over NPE"
 
-gdb_breakpoint [gdb_get_line_number "catch point"]
-gdb_continue_to_breakpoint "catch point" ".*// catch point.*"
+set line [gdb_get_line_number "stop point"]
+gdb_breakpoint $line
+gdb_test "continue" "Continuing.\[\r\n\]*success\[\r\n\]*Breakpoint .*:$line\[\r\n\]*.*// stop point\[\r\n\]*" \
+  "continue to success for next-over-NPE"
diff --git a/gdb/testsuite/gdb.java/jnpe.java b/gdb/testsuite/gdb.java/jnpe.java
index bd28d96..be096ce 100644
--- a/gdb/testsuite/gdb.java/jnpe.java
+++ b/gdb/testsuite/gdb.java/jnpe.java
@@ -32,7 +32,9 @@ public class jnpe
       }
     catch (NullPointerException n)
       {
-	System.out.println ("success"); // catch point
+	System.out.println ("success");
       }
+
+    System.out.println ("blah");	// stop point
   }
 }


hooks/post-receive
--
Repository for Project Archer.