aboutsummaryrefslogtreecommitdiff
path: root/gdb/testsuite/gdb.java/jprint.exp
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2012-01-19 12:37:28 +0000
committerPedro Alves <palves@redhat.com>2012-01-19 12:37:28 +0000
commiteb5227ce3572901bb57e7ae3c81ed460a4aa1677 (patch)
tree64f04ea090b1fab9d1d4a3282b1f908b683642c9 /gdb/testsuite/gdb.java/jprint.exp
parent100fc76795de55f12f4a77e5a0a0e6aea70ae420 (diff)
downloadgdb-eb5227ce3572901bb57e7ae3c81ed460a4aa1677.zip
gdb-eb5227ce3572901bb57e7ae3c81ed460a4aa1677.tar.gz
gdb-eb5227ce3572901bb57e7ae3c81ed460a4aa1677.tar.bz2
2012-01-19 Pedro Alves <palves@redhat.com>
* gdb.java/jprint.exp: Don't rely on inferior output, but instead look at the funtions' returns. * gdb.java/jprint.java (jvclass.addprint, jprint.print(int)) (jprint.print(int, int)): Change return type to int. Adjust.
Diffstat (limited to 'gdb/testsuite/gdb.java/jprint.exp')
-rw-r--r--gdb/testsuite/gdb.java/jprint.exp12
1 files changed, 6 insertions, 6 deletions
diff --git a/gdb/testsuite/gdb.java/jprint.exp b/gdb/testsuite/gdb.java/jprint.exp
index 97660e6..131dd47 100644
--- a/gdb/testsuite/gdb.java/jprint.exp
+++ b/gdb/testsuite/gdb.java/jprint.exp
@@ -49,16 +49,16 @@ if [set_lang_java] then {
gdb_breakpoint "${function}void" { allow-pending }
gdb_continue_to_breakpoint $function
- gdb_test "p jvclass.addprint(4,5,6)" "sum is 15\r\n.*" "unambiguous static call"
+ gdb_test "p jvclass.addprint(4,5,6)" " = 15" "unambiguous static call"
gdb_test "next" ""
gdb_test "next" ""
- gdb_test "p x.print(44)" "x is 44\r\n.*" "single argument print call"
- gdb_test "p x.print(22,33)" "y is 33\r\n.*" "double argument print call"
- gdb_test "call x.dothat(55)" "new value is 58\r\n.*= 62.*" "virtual fn call"
- gdb_test "p x.addprint(1,2,3)" "sum is 6\r\n.*" "inherited static call"
- gdb_test "call x.addk(44)" "adding k gives 121\r\n.*= 121.*" "inherited virtual fn call"
+ gdb_test "p x.print(44)" " = 44" "single argument call"
+ gdb_test "p x.print(22,33)" " = 33" "double argument call"
+ gdb_test "p x.dothat(55)" " = 62.*" "virtual fn call"
+ gdb_test "p x.addprint(1,2,3)" "= 6" "inherited static call"
+ gdb_test "p x.addk(44)" " = 121" "inherited virtual fn call"
# Regression test for a crasher.
# GCC does not output location information for static class members,