diff options
Diffstat (limited to 'gdb/testsuite/gdb.cp')
| -rw-r--r-- | gdb/testsuite/gdb.cp/annota2.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/annota3.exp | 3 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/mb-inline.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/mb-templates.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/method.exp | 4 |
5 files changed, 6 insertions, 9 deletions
diff --git a/gdb/testsuite/gdb.cp/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp index a48e2ea..4092a43 100644 --- a/gdb/testsuite/gdb.cp/annota2.exp +++ b/gdb/testsuite/gdb.cp/annota2.exp @@ -116,7 +116,7 @@ gdb_test_multiple "print a" "print class" { # `a.x is 1' is asynchronous regarding to `frames-invalid'. # gdb_test_multiple "continue" "continue until exit" { - -re "\r\n\032\032post-prompt\r\nContinuing.\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)*\r\na.x is 1\r\n\(\r\n\032\032frames-invalid\r\n\)*\r\n\032\032exited 0\r\n\r\nProgram exited normally.\r\n\r\n\032\032stopped\r\n$gdb_prompt$" { + -re "\r\n\032\032post-prompt\r\nContinuing.\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)*\r\na.x is 1\r\n\(\r\n\032\032frames-invalid\r\n\)*\r\n\032\032exited 0\r\n.$inferior_exited_re normally.\r\n\r\n\032\032stopped\r\n$gdb_prompt$" { pass "continue until exit" } } diff --git a/gdb/testsuite/gdb.cp/annota3.exp b/gdb/testsuite/gdb.cp/annota3.exp index 17021fb..a2b5d22 100644 --- a/gdb/testsuite/gdb.cp/annota3.exp +++ b/gdb/testsuite/gdb.cp/annota3.exp @@ -122,8 +122,7 @@ gdb_expect_list "continue to exit" "$gdb_prompt$" { "\r\n\032\032starting\r\n" "a.x is 1\r\n" "\r\n\032\032exited 0\r\n" - "\r\n" - "Program exited normally.\r\n" + ".$inferior_exited_re normally.\r\n" "\r\n\032\032stopped\r\n" } diff --git a/gdb/testsuite/gdb.cp/mb-inline.exp b/gdb/testsuite/gdb.cp/mb-inline.exp index 46d7cc2..c8f90d0 100644 --- a/gdb/testsuite/gdb.cp/mb-inline.exp +++ b/gdb/testsuite/gdb.cp/mb-inline.exp @@ -101,9 +101,7 @@ gdb_expect { } } -gdb_test "continue" \ - ".*Program exited normally.*" \ - "continue with disabled breakpoint 1.2" +gdb_continue_to_end "disabled breakpoint 1.2" # Make sure we can set a breakpoint on a source statement that spans # multiple lines. diff --git a/gdb/testsuite/gdb.cp/mb-templates.exp b/gdb/testsuite/gdb.cp/mb-templates.exp index 2f8f091..80c080b 100644 --- a/gdb/testsuite/gdb.cp/mb-templates.exp +++ b/gdb/testsuite/gdb.cp/mb-templates.exp @@ -129,7 +129,7 @@ gdb_test_no_output "disable 1" "disable breakpoint: disable" gdb_run_cmd gdb_expect { - -re "Program exited normally.*$gdb_prompt $" { + -re "$inferior_exited_re normally.*$gdb_prompt $" { pass "disable breakpoint: run to breakpoint" } -re "$gdb_prompt $" { diff --git a/gdb/testsuite/gdb.cp/method.exp b/gdb/testsuite/gdb.cp/method.exp index 848a06d..fff718d 100644 --- a/gdb/testsuite/gdb.cp/method.exp +++ b/gdb/testsuite/gdb.cp/method.exp @@ -175,10 +175,10 @@ gdb_test_multiple "ptype A" "ptype A" { } gdb_test_multiple "cont" "finish program" { - -re "Continuing.\r\n\r\nProgram exited normally.*$gdb_prompt $" { + -re "Continuing.\r\n$inferior_exited_re normally.*$gdb_prompt $" { pass "finish program" } - -re "Continuing.* EXIT code 0.*Program exited normally.*$gdb_prompt $" { + -re "Continuing.* EXIT code 0.*$inferior_exited_re normally.*$gdb_prompt $" { pass "finish program (exit wrapper)" } } |