2000-12-05 Michael Snyder <msnyder@mvstp600e.cygnus.com>

* gdb.base/constvars.exp: Test result of "up" command.
        * gdb.base/miscexprs.exp: Ditto.
        * gdb.base/pointers.exp:  Ditto.
        * gdb.base/scope.exp:     Ditto.
        * gdb.c++/derivation.exp: Ditto.
        * gdb.c++/local.exp:      Ditto.
        * gdb.c++/namespace.exp:  Ditto.
        * gdb.c++/overload.exp:   Ditto.
        * gdb.c++/ref-types.exp:  Ditto.
This commit is contained in:
Michael Snyder 2000-12-05 23:14:40 +00:00
parent 849ee22471
commit 660fd4696e
10 changed files with 63 additions and 22 deletions

View File

@ -1,3 +1,15 @@
2000-12-05 Michael Snyder <msnyder@mvstp600e.cygnus.com>
* gdb.base/constvars.exp: Test result of "up" command.
* gdb.base/miscexprs.exp: Ditto.
* gdb.base/pointers.exp: Ditto.
* gdb.base/scope.exp: Ditto.
* gdb.c++/derivation.exp: Ditto.
* gdb.c++/local.exp: Ditto.
* gdb.c++/namespace.exp: Ditto.
* gdb.c++/overload.exp: Ditto.
* gdb.c++/ref-types.exp: Ditto.
2000-11-22 Michael Chastain <chastain@redhat.com>
* mips_pro.exp: Accept either "middle -> top -> main" or

View File

@ -79,16 +79,22 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
-re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
send_gdb "up\n"
gdb_expect {
-re ".*$gdb_prompt $" {}
timeout { fail "up from marker1" }
-re ".*main.*$gdb_prompt $" {}
-re ".*$gdb_prompt $" {
fail "up from marker1"
}
timeout { fail "up from marker1 (timeout)" }
}
}
-re "Break.* marker1__.* \\(\\) at .*:$decimal.*$gdb_prompt $" {
fail "continue to marker1 (demangling)"
send_gdb "up\n"
gdb_expect {
-re ".*$gdb_prompt $" {}
timeout { fail "up from marker1" }
-re ".*main.*$gdb_prompt $" {}
-re ".*$gdb_prompt $" {
fail "up from marker1"
}
timeout { fail "up from marker1 (timeout)" }
}
}
-re "$gdb_prompt $" { fail "continue to marker1" }

View File

@ -69,8 +69,11 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
-re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
send_gdb "up\n"
gdb_expect {
-re ".*$gdb_prompt $" {}
timeout { fail "up from marker1" }
-re ".*main.*$gdb_prompt $" {}
-re ".*$gdb_prompt $" {
fail "up from marker1"
}
timeout { fail "up from marker1 (timeout)" }
}
}
-re "$gdb_prompt $" { fail "continue to marker1" }

View File

@ -371,8 +371,11 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
-re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
send_gdb "up\n"
gdb_expect {
-re ".*$gdb_prompt $" {}
timeout { fail "up from marker1" }
-re ".*more_code.*$gdb_prompt $" {}
-re ".*$gdb_prompt $" {
fail "up from marker1"
}
timeout { fail "up from marker1 (timeout)" }
}
}
-re "$gdb_prompt $" { fail "continue to marker1" }

View File

@ -452,7 +452,7 @@ proc test_at_autovars {} {
gdb_suppress_tests;
}
if [gdb_test "up" ".*" "" ] {
if [gdb_test "up" ".*autovars.*" "up from marker1 in scope.exp" ] {
gdb_suppress_tests ;
}
@ -484,7 +484,7 @@ proc test_at_localscopes {} {
if [gdb_test "cont" "Break.* marker2 \\(\\) at .*:$decimal.*" "continue to marker2"] {
gdb_suppress_tests;
}
if [gdb_test "up" ".*" "" ] {
if [gdb_test "up" ".*localscopes.*" "up from marker2 in scopes.exp" ] {
gdb_suppress_tests ;
}
@ -499,7 +499,9 @@ proc test_at_localscopes {} {
if [gdb_test "cont" "Break.* marker3 \\(\\) at .*:$decimal.*" \
"continue to marker3 in scope.exp"] then { gdb_suppress_tests }
if [gdb_test "up" "" "up from marker3 in scope.exp"] then { gdb_suppress_tests }
if [gdb_test "up" ".*localscopes.*" "up from marker3 in scope.exp"] {
gdb_suppress_tests
}
# Should be at next (first nested) scope. Check values.
@ -515,7 +517,9 @@ proc test_at_localscopes {} {
setup_xfail "a29k-*-udi" 2423
if [gdb_test "cont" "Break.* marker4.*at .*:$decimal.*" \
"continue to marker4 in scope.exp"] then { gdb_suppress_tests }
if [gdb_test "up" "" "up from marker4 in scope.exp"] then { gdb_suppress_tests }
if [gdb_test "up" ".*localscopes.*" "up from marker4 in scope.exp"] {
gdb_suppress_tests
}
gdb_test "print localval" " = 30" "print localval, innermost scope"
gdb_test "print localval1" " = 11" "print localval1, innermost scope"

View File

@ -76,8 +76,11 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
-re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
send_gdb "up\n"
gdb_expect {
-re ".*$gdb_prompt $" {}
timeout { fail "up from marker1" }
-re ".*main.*$gdb_prompt $" {}
-re ".*$gdb_prompt $" {
fail "up from marker1"
}
timeout { fail "up from marker1 (timeout)" }
}
}
-re "$gdb_prompt $" { fail "continue to marker1" }

View File

@ -68,8 +68,11 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
-re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
send_gdb "up\n"
gdb_expect {
-re ".*$gdb_prompt $" {}
timeout { fail "up from marker1" }
-re ".*main.*$gdb_prompt $" {}
-re ".*$gdb_prompt $" {
fail "up from marker1"
}
timeout { fail "up from marker1 (timeout)" }
}
}
-re "$gdb_prompt $" { fail "continue to marker1" }

View File

@ -73,8 +73,9 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
-re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
send_gdb "up\n"
gdb_expect {
-re ".*$gdb_prompt $" { pass "up from marker1" }
timeout { fail "up from marker1" }
-re ".*main.*$gdb_prompt $" { pass "up from marker1" }
-re ".*$gdb_prompt $" { fail "up from marker1" }
timeout { fail "up from marker1 (timeout)" }
}
}
-re "$gdb_prompt $" { fail "continue to marker1" }

View File

@ -68,8 +68,11 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
-re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
send_gdb "up\n"
gdb_expect {
-re ".*$gdb_prompt $" {}
timeout { fail "up from marker1" }
-re ".*main.*$gdb_prompt $" {}
-re ".*$gdb_prompt $" {
fail "up from marker1"
}
timeout { fail "up from marker1 (timeout)" }
}
}
-re "$gdb_prompt $" { fail "continue to marker1" }

View File

@ -61,8 +61,11 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
-re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
send_gdb "up\n"
gdb_expect {
-re ".*$gdb_prompt $" {}
timeout { fail "up from marker1" }
-re ".*main.*$gdb_prompt $" {}
-re ".*$gdb_prompt $" {
fail "up from marker1"
}
timeout { fail "up from marker1 (timeout)" }
}
}
-re "$gdb_prompt $" { fail "continue to marker1" }