OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2010-05-26 Michael Snyder <msnyder@msnyder-server.eng.vmware.com> 

* gdb.java/jmisc.exp: Replace send_gdb with gdb_test.
	* gdb.java/jprint.exp: Replace send_gdb with gdb_test.
This commit is contained in:
Michael Snyder 2010-05-26 18:34:12 +00:00
parent a127f7b491
commit 23de6b3410
3 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdb/testsuite/ChangeLog
View File

@ -1,5 +1,8 @@
2010-05-26 Michael Snyder <msnyder@msnyder-server.eng.vmware.com>
* gdb.java/jmisc.exp: Replace send_gdb with gdb_test.
* gdb.java/jprint.exp: Replace send_gdb with gdb_test.
* gdb.gdb/complaints.exp: Replace send_gdb with gdb_test.
* gdb.gdb/selftest.exp: Replace send_gdb with gdb_test.
* gdb.gdb/xfullpath.exp: Replace send_gdb with gdb_test.

38
gdb/testsuite/gdb.java/jmisc.exp
View File

@ -42,11 +42,7 @@ proc set_lang_java {} {
verbose "loading file '$binfile'"
gdb_load $binfile
send_gdb "set language java\n"
gdb_expect {
-re ".*$gdb_prompt $" {}
timeout { fail "set language java (timeout)" ; return 0 }
}
gdb_test_no_output "set language java"
return [gdb_test "show language" ".* source language is \"java\".*" \
"set language to \"java\""]
@ -73,33 +69,27 @@ if ![set_lang_java] then {
gdb_breakpoint "${function}void" { allow-pending }
gdb_continue_to_breakpoint $function
send_gdb "ptype jmisc\n"
gdb_expect {
-re "type = class jmisc extends java.lang.Object \{\[\r\n\ \t]+void main\\(java\.lang\.String\\\[]\\);\[\r\n\ \t]+jmisc\\(\\);\[\r\n\ \t]+\}\[\r\n\ \t]+$gdb_prompt $"
{ pass "ptype jmisc" }
-re "type = class jmisc extends java.lang.Object \{\[\r\n\ \t]+jmisc\\(\\);\[\r\n\ \t]+void main\\(java\.lang\.String\\\[]\\);\[\r\n\ \t]+\}\[\r\n\ \t]+$gdb_prompt $"
{ pass "ptype jmisc" }
-re ".*$gdb_prompt $" { fail "ptype jmisc" }
timeout { fail "ptype jmisc (timeout)" ; return }
gdb_test_multiple "ptype jmisc" "ptype jmisc" {
-re "type = class jmisc extends java.lang.Object \{\[\r\n\ \t]+void main\\(java\.lang\.String\\\[]\\);\[\r\n\ \t]+jmisc\\(\\);\[\r\n\ \t]+\}\[\r\n\ \t]+$gdb_prompt $" {
pass "ptype jmisc"
}
-re "type = class jmisc extends java.lang.Object \{\[\r\n\ \t]+jmisc\\(\\);\[\r\n\ \t]+void main\\(java\.lang\.String\\\[]\\);\[\r\n\ \t]+\}\[\r\n\ \t]+$gdb_prompt $" {
pass "ptype jmisc"
}
}
send_gdb "p args\n"
gdb_expect {
-re "\\\$1 = java\.lang\.String\\\[]@\[a-f0-9]+\[\r\n\ \t]+$gdb_prompt $" { pass "p args" }
-re ".*$gdb_prompt $" { fail "p args" }
timeout { fail "p args (timeout)" ; return }
}
gdb_test "p args" \
"\\\$1 = java\.lang\.String\\\[]@\[a-f0-9]+"
send_gdb "p *args\n"
gdb_expect {
-re "\\\$2 = \{length: 0\}\[\r\n\ \t]+$gdb_prompt $" { pass "p *args" }
gdb_test_multiple "p *args\n" "p *args\n" {
-re "\\\$2 = \{length: 0\}\[\r\n\ \t]+$gdb_prompt $" {
pass "p *args"
}
-re "\\\$2 = cannot find java.lang.Object.*$gdb_prompt $" {
# Sometimes GCC 4.x does not emit the necessary information
# about java.lang.Object.
kfail "p *args" gdb/2214
}
-re ".*$gdb_prompt $" { fail "p *args" }
timeout { fail "p *args (timeout)" ; return }
}
# The idea of running to 'exit' is that 'exit' is in a different

6
gdb/testsuite/gdb.java/jprint.exp
View File

@ -41,11 +41,7 @@ proc set_lang_java {} {
verbose "loading file '$binfile'"
gdb_load $binfile
send_gdb "set language java\n"
gdb_expect {
-re ".*$gdb_prompt $" {}
timeout { fail "set language java (timeout)" ; return 0 }
}
gdb_test_no_output "set language java"
return [gdb_test "show language" ".* source language is \"java\".*" \
"set language to \"java\""]