diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/execl-update-breakpoints.exp | 1 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/fork-print-inferior-events.exp | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ba11a4d..fa22fc3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2021-06-11 Kevin Buettner <kevinb@redhat.com> + + * gdb.base/execl-update-breakpoints.exp: Add regular + expression for optionally matching output related to + libthread_db. + * gdb.base/fork-print-inferior-events.exp: Likewise. + 2021-06-11 Felix Willgerodt <felix.willgerodt@intel.com> * gdb.mi/array.f: Convert into... diff --git a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp index 63e741e..f9cd7e8 100644 --- a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp +++ b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp @@ -132,6 +132,7 @@ proc test { always_inserted } { "Continuing\\.\r\n" \ "${not_nl} is executing new program: ${not_nl}\r\n" \ "(Reading ${not_nl} from remote target\\.\\.\\.\r\n)*" \ + "(?:.Thread debugging using .*? enabled.\r\nUsing .*? library .*?\\.\r\n)?" \ "\r\n" \ "Breakpoint 1, main.*$gdb_prompt $" set message "continue across exec" diff --git a/gdb/testsuite/gdb.base/fork-print-inferior-events.exp b/gdb/testsuite/gdb.base/fork-print-inferior-events.exp index 10afaf6..eda0f50 100644 --- a/gdb/testsuite/gdb.base/fork-print-inferior-events.exp +++ b/gdb/testsuite/gdb.base/fork-print-inferior-events.exp @@ -59,6 +59,7 @@ set detach_child_re "${reading_re}\\\[Detaching after fork from child .*\\\]\r\n set detach_parent_re "${reading_re}\\\[Detaching after fork from parent .*\\\]\r\n" set new_inf_re "${reading_re}\\\[New inferior $decimal \\(.*\\)\\\]\r\n" set inf_detached_re "${reading_re}\\\[Inferior $decimal \\(.*\\) detached\\\]\r\n" +set thread_db_re "(?:\\\[Thread debugging using .*? enabled\\\]\r\nUsing .*? library .*?\\.\r\n)?" set expected_output [list \ "${attach_child_re}${new_inf_re}${detach_parent_re}${inf_detached_re}" \ @@ -84,7 +85,7 @@ foreach_with_prefix print_inferior_events { "on" "off" } { set output [lindex $expected_output $i] # Always add the "Starting program..." string so that we # match exactly the lines we want. - set output "Starting program: $binfile\\s*\r\n${output}${exited_normally_re}" + set output "Starting program: $binfile\\s*\r\n${thread_db_re}${output}${thread_db_re}${exited_normally_re}" set i [expr $i + 1] gdb_test "run" $output } |