diff options
| author | Daniel Jacobowitz <drow@false.org> | 2007-04-29 17:13:57 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2007-04-29 17:13:57 +0000 |
| commit | b1d53152e0cda88893253882fd974c2c4b142fe9 (patch) | |
| tree | 34f3c49643670d0541153ec5bc066a16581e4878 | |
| parent | d084b3317a56e70846746ea30faeeb61a47eea71 (diff) | |
| download | gdb-b1d53152e0cda88893253882fd974c2c4b142fe9.zip gdb-b1d53152e0cda88893253882fd974c2c4b142fe9.tar.gz gdb-b1d53152e0cda88893253882fd974c2c4b142fe9.tar.bz2 | |
* gdb.java/jmain.exp: Handle demangled names with and without method
signatures.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.java/jmain.exp | 34 |
2 files changed, 36 insertions, 3 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index bc8b6ce..c4b7e68 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2007-04-29 Daniel Jacobowitz <dan@codesourcery.com> + * gdb.java/jmain.exp: Handle demangled names with and without method + signatures. + +2007-04-29 Daniel Jacobowitz <dan@codesourcery.com> + * gdb.mi/mi-syn-frame.c (main, foo, bar) (have_a_very_merry_interrupt): Remove calls to puts. * gdb.mi/mi-syn-frame.exp, gdb.mi/mi2-syn-frame.exp: Do not expect diff --git a/gdb/testsuite/gdb.java/jmain.exp b/gdb/testsuite/gdb.java/jmain.exp index 79cb1dd..d486866 100644 --- a/gdb/testsuite/gdb.java/jmain.exp +++ b/gdb/testsuite/gdb.java/jmain.exp @@ -50,18 +50,46 @@ gdb_test "set print sevenbit-strings" ".*" set bpmain "Breakpoint .* file .*jmain.java, line 5\." +# Where GCC PR 16439 puts the breakpoint. +set earlybpmain "Breakpoint .* file .*jmain.java, line 4\." + gdb_load "${binfile}" setup_kfail *-*-* java/1567 gdb_test "break main" "${bpmain}" # Check that an unqualified "main" works. - gdb_load "${binfile}" setup_kfail *-*-* java/1565 gdb_test "break jmain.main" "${bpmain}" # Check that a fully qualified "main" works. gdb_load "${binfile}" -setup_xfail *-*-* gcc/16439 -gdb_test "break \'${testfile}.main(java.lang.String\[\])\'" "${bpmain}" +set cmd "break \'${testfile}.main(java.lang.String\[\])\'" +set msg $cmd +gdb_test_multiple $cmd $msg { + -re "${bpmain}\r\n$gdb_prompt $" { + pass $msg + } + -re "${earlybpmain}\r\n$gdb_prompt $" { + setup_xfail *-*-* gcc/16439 + fail $msg + } + -re "Make breakpoint pending.* \\(y or \\\[n\\\]\\) $" { + gdb_test "n" "" "" + + # Check again with a method signature at the end. + set cmd "break \'${testfile}.main(java.lang.String\[\])void\'" + set msg $cmd + gdb_test_multiple $cmd $msg { + -re "${bpmain}\r\n$gdb_prompt $" { + pass $msg + } + -re "${earlybpmain}\r\n$gdb_prompt $" { + setup_xfail *-*-* gcc/16439 + fail $msg + } + } + } +} + |