diff options
author | Daniel Jacobowitz <dan@debian.org> | 2007-04-29 17:13:57 +0000 |
---|---|---|
committer | Daniel Jacobowitz <dan@debian.org> | 2007-04-29 17:13:57 +0000 |
commit | 7d972887ae2c1a476eaebfb41d4779280515b6a0 (patch) | |
tree | aa4a3e824b468ddcb4738c4c1ac319f7358eb09d /gdb/testsuite/gdb.java | |
parent | 59f7923389f3f7a11ded2adc681a960fd1a3bb73 (diff) | |
download | gdb-7d972887ae2c1a476eaebfb41d4779280515b6a0.tar.gz |
* gdb.java/jmain.exp: Handle demangled names with and without method
signatures.
Diffstat (limited to 'gdb/testsuite/gdb.java')
-rw-r--r-- | gdb/testsuite/gdb.java/jmain.exp | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/gdb/testsuite/gdb.java/jmain.exp b/gdb/testsuite/gdb.java/jmain.exp index 79cb1dd1f3d..d48686612f5 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 + } + } + } +} + |