diff options
Diffstat (limited to 'gdb/testsuite/gdb.base')
| -rw-r--r-- | gdb/testsuite/gdb.base/constvars.exp | 14 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/miscexprs.exp | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/pointers.exp | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/scope.exp | 12 |
4 files changed, 28 insertions, 12 deletions
diff --git a/gdb/testsuite/gdb.base/constvars.exp b/gdb/testsuite/gdb.base/constvars.exp index 312b524..1cdc231 100644 --- a/gdb/testsuite/gdb.base/constvars.exp +++ b/gdb/testsuite/gdb.base/constvars.exp @@ -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" } diff --git a/gdb/testsuite/gdb.base/miscexprs.exp b/gdb/testsuite/gdb.base/miscexprs.exp index f7a5fd2..21f5f0f 100644 --- a/gdb/testsuite/gdb.base/miscexprs.exp +++ b/gdb/testsuite/gdb.base/miscexprs.exp @@ -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" } diff --git a/gdb/testsuite/gdb.base/pointers.exp b/gdb/testsuite/gdb.base/pointers.exp index 539f875..b7cce51 100644 --- a/gdb/testsuite/gdb.base/pointers.exp +++ b/gdb/testsuite/gdb.base/pointers.exp @@ -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" } diff --git a/gdb/testsuite/gdb.base/scope.exp b/gdb/testsuite/gdb.base/scope.exp index 6c3f9f2..b4f9936 100644 --- a/gdb/testsuite/gdb.base/scope.exp +++ b/gdb/testsuite/gdb.base/scope.exp @@ -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" |