diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.btrace/exception.cc | 6 | ||||
| -rwxr-xr-x | gdb/testsuite/gdb.btrace/exception.exp | 26 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.btrace/function_call_history.exp | 20 |
4 files changed, 37 insertions, 21 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 3712199..1e79a14 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2021-03-03 Markus Metzger <markus.t.metzger@intel.com> + * gdb.btrace/exception.cc (main): Update test source. + * gdb.btrace/exception.exp: Update patterns. + * gdb.btrace/function_call_history.exp: Likewise. + +2021-03-03 Markus Metzger <markus.t.metzger@intel.com> + * gdb.btrace/unknown_functions.exp: Move -Wl,-x to ldflags. 2021-03-03 Markus Metzger <markus.t.metzger@intel.com> diff --git a/gdb/testsuite/gdb.btrace/exception.cc b/gdb/testsuite/gdb.btrace/exception.cc index 6e4f872..0c660bb 100644 --- a/gdb/testsuite/gdb.btrace/exception.cc +++ b/gdb/testsuite/gdb.btrace/exception.cc @@ -50,7 +50,11 @@ test (void) int main (void) { + int ret; + test (); test (); /* bp.1 */ - return 0; /* bp.2 */ + + ret = 0; + return ret; /* bp.2 */ } diff --git a/gdb/testsuite/gdb.btrace/exception.exp b/gdb/testsuite/gdb.btrace/exception.exp index 33cd0ea..7b840e4 100755 --- a/gdb/testsuite/gdb.btrace/exception.exp +++ b/gdb/testsuite/gdb.btrace/exception.exp @@ -60,19 +60,25 @@ gdb_expect_list "flat" "\r\n$gdb_prompt $" [list \ "3\tfoo\\(\\)" \ "4\tbar\\(\\)" \ "5\tbad\\(\\)\r" \ - ] \ - "" \ - "\[0-9\]*\ttest\\(\\)"] + ] "" \ + [multi_line \ + "\[0-9\]*\ttest\\(\\)" \ + "\[0-9\]*\tmain\\(\\)" \ + ] "" \ + ] # show the branch trace with calls indented send_gdb "record function-call-history /c 1\n" gdb_expect_list "indented" "\r\n$gdb_prompt $" [list \ [multi_line \ "1\tmain\\(\\)" \ - "2\t test\\(\\)" \ - "3\t foo\\(\\)" \ - "4\t bar\\(\\)" \ - "5\t bad\\(\\)\r" \ - ] \ - "" \ - "\[0-9\]*\t test\\(\\)"] + "2\t test\\(\\)" \ + "3\t foo\\(\\)" \ + "4\t bar\\(\\)" \ + "5\t bad\\(\\)\r" \ + ] "" \ + [multi_line \ + "\[0-9\]*\t test\\(\\)" \ + "\[0-9\]*\tmain\\(\\)" \ + ] "" \ + ] diff --git a/gdb/testsuite/gdb.btrace/function_call_history.exp b/gdb/testsuite/gdb.btrace/function_call_history.exp index 568f794..f995016 100644 --- a/gdb/testsuite/gdb.btrace/function_call_history.exp +++ b/gdb/testsuite/gdb.btrace/function_call_history.exp @@ -148,29 +148,29 @@ gdb_test_no_output "set filename-display basename" # moving forward again, but this time with file and line number, expected to see the first 15 entries gdb_test "record function-call-history /l +" [multi_line \ "\[0-9\]*\tmain\tat $srcfile:40,41" \ - "\[0-9\]*\tinc\tat $srcfile:22,24" \ + "\[0-9\]*\tinc\tat $srcfile:22,2\[34\]" \ "\[0-9\]*\tmain\tat $srcfile:40,41" \ - "\[0-9\]*\tinc\tat $srcfile:22,24" \ + "\[0-9\]*\tinc\tat $srcfile:22,2\[34\]" \ "\[0-9\]*\tmain\tat $srcfile:40,41" \ - "\[0-9\]*\tinc\tat $srcfile:22,24" \ + "\[0-9\]*\tinc\tat $srcfile:22,2\[34\]" \ "\[0-9\]*\tmain\tat $srcfile:40,41" \ - "\[0-9\]*\tinc\tat $srcfile:22,24" \ + "\[0-9\]*\tinc\tat $srcfile:22,2\[34\]" \ "\[0-9\]*\tmain\tat $srcfile:40,41" \ - "\[0-9\]*\tinc\tat $srcfile:22,24" \ + "\[0-9\]*\tinc\tat $srcfile:22,2\[34\]" \ "\[0-9\]*\tmain\tat $srcfile:40,41" \ - "\[0-9\]*\tinc\tat $srcfile:22,24" \ + "\[0-9\]*\tinc\tat $srcfile:22,2\[34\]" \ "\[0-9\]*\tmain\tat $srcfile:40,41" \ - "\[0-9\]*\tinc\tat $srcfile:22,24" \ + "\[0-9\]*\tinc\tat $srcfile:22,2\[34\]" \ "\[0-9\]*\tmain\tat $srcfile:40,41" \ ] "forward /l - 1" # moving forward and expect to see the latest 6 entries gdb_test "record function-call-history /l +" [multi_line \ - "\[0-9\]*\tinc\tat $srcfile:22,24" \ + "\[0-9\]*\tinc\tat $srcfile:22,2\[34\]" \ "\[0-9\]*\tmain\tat $srcfile:40,41" \ - "\[0-9\]*\tinc\tat $srcfile:22,24" \ + "\[0-9\]*\tinc\tat $srcfile:22,2\[34\]" \ "\[0-9\]*\tmain\tat $srcfile:40,41" \ - "\[0-9\]*\tinc\tat $srcfile:22,24" \ + "\[0-9\]*\tinc\tat $srcfile:22,2\[34\]" \ "\[0-9\]*\tmain\tat $srcfile:40,43" \ ] "forward /l - 2" |