From patchwork Wed Jan 31 16:57:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Durigan Junior X-Patchwork-Id: 25715 Received: (qmail 78502 invoked by alias); 31 Jan 2018 16:57:53 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 78487 invoked by uid 89); 31 Jan 2018 16:57:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=informing, 2329 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 31 Jan 2018 16:57:49 +0000 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 189B6C05FEC3 for ; Wed, 31 Jan 2018 16:57:48 +0000 (UTC) Received: from psique.yyz.redhat.com (unused-10-15-17-193.yyz.redhat.com [10.15.17.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C95660499; Wed, 31 Jan 2018 16:57:41 +0000 (UTC) From: Sergio Durigan Junior To: GDB Patches Cc: Jan Kratochvil , Pedro Alves , Sergio Durigan Junior Subject: [PATCH v2] Enable 'set print inferior-events' and cleanup attach/detach messages Date: Wed, 31 Jan 2018 11:57:35 -0500 Message-Id: <20180131165735.4339-1-sergiodj@redhat.com> In-Reply-To: <20180124194714.26222-1-sergiodj@redhat.com> References: <20180124194714.26222-1-sergiodj@redhat.com> X-IsSubscribed: yes This is a followup of Pedro's suggestion to turn 'set print inferior-events' always on, and do some cleanup on the messages printed by GDB when attaching/detaching a inferior, or when it exits. To make sure that the patch is correct, I've tested it with a handful of combinations of 'set follow-fork-mode', 'set detach-on-fork' and 'set print inferior-events'. In the end, I decided to make my hand-made test into an official testcase. More on that below. I've also made a few modifications to messages that are printed when 'set print inferior-events' is on. For example, a few of the messages did not contain the '[' and ']' as prefix/suffix, which led to a few inconsistencies like: Attaching after process 22995 fork to child process 22995. [New inferior 22999] Detaching after fork from child process 22999. [Inferior 22995 detached] [Inferior 2 (process 22999) exited normally] So I took the opportunity and included the square brackets where applicable. As suggested by Pedro, the "[Inferior %d exited]" message from 'exit_inferior' has been removed, because it got duplicated when 'inferior-events' is on. I'm also using the 'add_{thread,inferior}_silent' versions (instead of their verbose counterparts) on some locations, also to avoid duplicated messages. As for the tests, the configuration options being exercised are: - follow-fork-mode: child/parent - detach-on-fork: on/off - print inferior-events: on/off Built and regtested on BuildBot, without regressions. gdb/ChangeLog: 2018-01-30 Jan Kratochvil Sergio Durigan Junior Pedro Alves * inferior.c (print_inferior_events): Remove 'static'. Set as '1'. (exit_inferior): Remove message printed when 'print_inferior_events' is on. (initialize_inferiors): Use 'add_inferior_silent' to set 'current_inferior_'. * inferior.h (print_inferior_events): Declare here as 'extern'. * infrun.c (follow_fork_inferior): Print '[Detaching...]' message when 'print_inferior_events' is on. Use 'add_thread_silent' instead of 'add_thread'. Add '[' and ']' as prefix/suffix for 'Detaching...' message. (handle_vfork_child_exec_or_exit): Add '[' and ']' as prefix/suffix when printing 'Detaching...' message. Print them when 'print_inferior_events' is on. gdb/testsuite/ChangeLog: 2018-01-30 Jan Kratochvil Sergio Durigan Junior * gdb.base/attach-non-pgrp-leader.exp: Adjust 'Detaching...' regexps to expect for '[Inferior %d detached]' as well. * gdb.base/attach.exp: Likewise. * gdb.base/catch-syscall.exp (check_for_program_end): Adjust "gdb_continue_to_end". (test_catch_syscall_with_wrong_args): Likewise. * gdb.base/foll-fork.exp: Adjust regexps to match '[' and ']'. Don't set 'verbose' on. * gdb.base/foll-vfork.exp: Likewise. * gdb.base/fork-detach-info.c: New file. * gdb.base/fork-detach-info.exp: New file. * gdb.threads/clone-attach-detach.exp: Adjust 'Detaching...' regexps to expect for '[Inferior %d detached]' as well. * gdb.threads/process-dies-while-detaching.exp: Likewise. --- gdb/inferior.c | 10 +--- gdb/inferior.h | 4 ++ gdb/infrun.c | 28 ++++----- gdb/testsuite/gdb.base/attach-non-pgrp-leader.exp | 5 +- gdb/testsuite/gdb.base/attach.exp | 3 +- gdb/testsuite/gdb.base/catch-syscall.exp | 4 +- gdb/testsuite/gdb.base/foll-fork.exp | 14 ++--- gdb/testsuite/gdb.base/foll-vfork.exp | 16 ++--- gdb/testsuite/gdb.base/fork-detach-info.c | 37 ++++++++++++ gdb/testsuite/gdb.base/fork-detach-info.exp | 68 ++++++++++++++++++++++ gdb/testsuite/gdb.threads/clone-attach-detach.exp | 4 +- .../gdb.threads/process-dies-while-detaching.exp | 6 +- 12 files changed, 149 insertions(+), 50 deletions(-) create mode 100644 gdb/testsuite/gdb.base/fork-detach-info.c create mode 100644 gdb/testsuite/gdb.base/fork-detach-info.exp diff --git a/gdb/inferior.c b/gdb/inferior.c index 38b7369275..5bff8b3c07 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -45,9 +45,8 @@ DEFINE_REGISTRY (inferior, REGISTRY_ACCESS_FIELD) struct inferior *inferior_list = NULL; static int highest_inferior_num; -/* Print notices on inferior events (attach, detach, etc.), set with - `set print inferior-events'. */ -static int print_inferior_events = 0; +/* See inferior.h. */ +int print_inferior_events = 1; /* The Current Inferior. This is a strong reference. I.e., whenever an inferior is the current inferior, its refcount is @@ -232,9 +231,6 @@ exit_inferior (int pid) struct inferior *inf = find_inferior_pid (pid); exit_inferior_1 (inf, 0); - - if (print_inferior_events) - printf_unfiltered (_("[Inferior %d exited]\n"), pid); } void @@ -986,7 +982,7 @@ initialize_inferiors (void) can only allocate an inferior when all those modules have done that. Do this after initialize_progspace, due to the current_program_space reference. */ - current_inferior_ = add_inferior (0); + current_inferior_ = add_inferior_silent (0); current_inferior_->incref (); current_inferior_->pspace = current_program_space; current_inferior_->aspace = current_program_space->aspace; diff --git a/gdb/inferior.h b/gdb/inferior.h index 22008a005b..6550d50d53 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -220,6 +220,10 @@ extern enum stop_stack_kind stop_stack_dummy; extern int stopped_by_random_signal; +/* Print notices on inferior events (attach, detach, etc.), set with + `set print inferior-events'. */ +extern int print_inferior_events; + /* STEP_OVER_ALL means step over all subroutine calls. STEP_OVER_UNDEBUGGABLE means step over calls to undebuggable functions. STEP_OVER_NONE means don't step over any subroutine calls. */ diff --git a/gdb/infrun.c b/gdb/infrun.c index 45fe36a717..4ac5bde303 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -461,14 +461,14 @@ holding the child stopped. Try \"set detach-on-fork\" or \ remove_breakpoints_pid (ptid_get_pid (inferior_ptid)); } - if (info_verbose || debug_infrun) + if (print_inferior_events) { /* Ensure that we have a process ptid. */ ptid_t process_ptid = pid_to_ptid (ptid_get_pid (child_ptid)); target_terminal::ours_for_output (); fprintf_filtered (gdb_stdlog, - _("Detaching after %s from child %s.\n"), + _("[Detaching after %s from child %s.]\n"), has_vforked ? "vfork" : "fork", target_pid_to_str (process_ptid)); } @@ -489,7 +489,7 @@ holding the child stopped. Try \"set detach-on-fork\" or \ scoped_restore_current_pspace_and_thread restore_pspace_thread; inferior_ptid = child_ptid; - add_thread (inferior_ptid); + add_thread_silent (inferior_ptid); set_current_inferior (child_inf); child_inf->symfile_flags = SYMFILE_NO_READ; @@ -549,11 +549,11 @@ holding the child stopped. Try \"set detach-on-fork\" or \ struct inferior *parent_inf, *child_inf; struct program_space *parent_pspace; - if (info_verbose || debug_infrun) + if (print_inferior_events) { target_terminal::ours_for_output (); fprintf_filtered (gdb_stdlog, - _("Attaching after %s %s to child %s.\n"), + _("[Attaching after %s %s to child %s.]\n"), target_pid_to_str (parent_ptid), has_vforked ? "vfork" : "fork", target_pid_to_str (child_ptid)); @@ -594,15 +594,15 @@ holding the child stopped. Try \"set detach-on-fork\" or \ } else if (detach_fork) { - if (info_verbose || debug_infrun) + if (print_inferior_events) { /* Ensure that we have a process ptid. */ ptid_t process_ptid = pid_to_ptid (ptid_get_pid (child_ptid)); target_terminal::ours_for_output (); fprintf_filtered (gdb_stdlog, - _("Detaching after fork from " - "child %s.\n"), + _("[Detaching after fork from " + "child %s.]\n"), target_pid_to_str (process_ptid)); } @@ -616,7 +616,7 @@ holding the child stopped. Try \"set detach-on-fork\" or \ informing the solib layer about this new process. */ inferior_ptid = child_ptid; - add_thread (inferior_ptid); + add_thread_silent (inferior_ptid); set_current_inferior (child_inf); /* If this is a vfork child, then the address-space is shared @@ -956,22 +956,22 @@ handle_vfork_child_exec_or_exit (int exec) inf->aspace = NULL; inf->pspace = NULL; - if (debug_infrun || info_verbose) + if (print_inferior_events) { target_terminal::ours_for_output (); if (exec) { fprintf_filtered (gdb_stdlog, - _("Detaching vfork parent process " - "%d after child exec.\n"), + _("[Detaching vfork parent process " + "%d after child exec.]\n"), inf->vfork_parent->pid); } else { fprintf_filtered (gdb_stdlog, - _("Detaching vfork parent process " - "%d after child exit.\n"), + _("[Detaching vfork parent process " + "%d after child exit.]\n"), inf->vfork_parent->pid); } } diff --git a/gdb/testsuite/gdb.base/attach-non-pgrp-leader.exp b/gdb/testsuite/gdb.base/attach-non-pgrp-leader.exp index dbe554eff3..6da2751b45 100644 --- a/gdb/testsuite/gdb.base/attach-non-pgrp-leader.exp +++ b/gdb/testsuite/gdb.base/attach-non-pgrp-leader.exp @@ -30,6 +30,7 @@ if { [build_executable ${testfile}.exp ${testfile} $srcfile {debug}] == -1 } { proc do_test {} { global binfile + global decimal set test_spawn_id [spawn_wait_for_attach $binfile] set parent_pid [spawn_id_get_pid $test_spawn_id] @@ -52,7 +53,7 @@ proc do_test {} { } gdb_test "detach" \ - "Detaching from program: .*process $parent_pid" + "Detaching from program: .*process $parent_pid\r\n\\\[Inferior $decimal detached\\\]" } # Start over, and attach to the child this time. @@ -67,7 +68,7 @@ proc do_test {} { gdb_continue_to_breakpoint "marker" gdb_test "detach" \ - "Detaching from program: .*process $child_pid" + "Detaching from program: .*process $child_pid\r\n\\\[Inferior $decimal detached\\\]" } kill_wait_spawned_process $test_spawn_id diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp index d315c2792e..42cf6b8328 100644 --- a/gdb/testsuite/gdb.base/attach.exp +++ b/gdb/testsuite/gdb.base/attach.exp @@ -53,6 +53,7 @@ proc do_attach_tests {} { global testfile global subdir global timeout + global decimal # Figure out a regular expression that will match the sysroot, # noting that the default sysroot is "target:", and also noting @@ -194,7 +195,7 @@ proc do_attach_tests {} { # Detach the process. gdb_test "detach" \ - "Detaching from program: .*$escapedbinfile, process $testpid" \ + "Detaching from program: .*$escapedbinfile, process $testpid\r\n\\\[Inferior $decimal detached\\\]" \ "attach1 detach" # Wait a bit for gdb to finish detaching diff --git a/gdb/testsuite/gdb.base/catch-syscall.exp b/gdb/testsuite/gdb.base/catch-syscall.exp index 2a8bf27e5c..20fa041155 100644 --- a/gdb/testsuite/gdb.base/catch-syscall.exp +++ b/gdb/testsuite/gdb.base/catch-syscall.exp @@ -179,7 +179,7 @@ proc check_for_program_end {} { # Deleting the catchpoints delete_breakpoints - gdb_continue_to_end + gdb_continue_to_end "" continue 1 } proc test_catch_syscall_without_args {} { @@ -250,7 +250,7 @@ proc test_catch_syscall_with_wrong_args {} { # If it doesn't, everything is right (since we don't have # a syscall named "mlock" in it). Otherwise, this is a failure. set thistest "catch syscall with unused syscall ($syscall_name)" - gdb_continue_to_end $thistest + gdb_continue_to_end $thistest continue 1 } } diff --git a/gdb/testsuite/gdb.base/foll-fork.exp b/gdb/testsuite/gdb.base/foll-fork.exp index a715b7fa9d..9e8fe99542 100644 --- a/gdb/testsuite/gdb.base/foll-fork.exp +++ b/gdb/testsuite/gdb.base/foll-fork.exp @@ -110,13 +110,13 @@ proc test_follow_fork { who detach cmd } { # Set up the output we expect to see after we run. set expected_re "" if {$who == "child"} { - set expected_re "Attaching after.* fork to.*" + set expected_re "\\\[Attaching after.* fork to.*" if {$detach == "on"} { - append expected_re "Detaching after fork from .*" + append expected_re "\\\[Detaching after fork from .*" } append expected_re "set breakpoint here.*" } elseif {$who == "parent" && $detach == "on"} { - set expected_re "Detaching after fork from .*set breakpoint here.*" + set expected_re "\\\[Detaching after fork from .*set breakpoint here.*" } else { set expected_re ".*set breakpoint here.*" } @@ -217,7 +217,7 @@ proc catch_fork_child_follow {} { "Temporary breakpoint.*, line $bp_after_fork.*" \ "set follow-fork child, tbreak" - set expected_re "Attaching after.* fork to.*Detaching after fork from" + set expected_re "\\\[Attaching after.* fork to.*\\\[Detaching after fork from" append expected_re ".* at .*$bp_after_fork.*" gdb_test "continue" $expected_re "set follow-fork child, hit tbreak" @@ -305,7 +305,7 @@ proc tcatch_fork_parent_follow {} { "set follow-fork parent, tbreak" gdb_test "continue" \ - "Detaching after fork from.* at .*$bp_after_fork.*" \ + "\\\[Detaching after fork from.* at .*$bp_after_fork.*" \ "set follow-fork parent, hit tbreak" # The child has been detached; allow time for any output it might @@ -398,10 +398,6 @@ By default, the debugger will follow the parent process..*" \ if [runto_main] then { tcatch_fork_parent_follow } } -# The "Detaching..." and "Attaching..." messages may be hidden by -# default. -gdb_test_no_output "set verbose" - # This is a test of gdb's ability to follow the parent, child or both # parent and child of a Unix fork() system call. # diff --git a/gdb/testsuite/gdb.base/foll-vfork.exp b/gdb/testsuite/gdb.base/foll-vfork.exp index 6aa4edd9fe..ddda2d6143 100644 --- a/gdb/testsuite/gdb.base/foll-vfork.exp +++ b/gdb/testsuite/gdb.base/foll-vfork.exp @@ -55,10 +55,6 @@ proc setup_gdb {} { clean_restart $testfile - # The "Detaching..." and "Attaching..." messages may be hidden by - # default. - gdb_test_no_output "set verbose" - if ![runto_main] { return -code return } @@ -103,7 +99,7 @@ proc vfork_parent_follow_through_step {} { set test "step" gdb_test_multiple "next" $test { - -re "Detaching after vfork from.*if \\(pid == 0\\).*$gdb_prompt " { + -re "\\\[Detaching after vfork from.*if \\(pid == 0\\).*$gdb_prompt " { pass $test } } @@ -128,7 +124,7 @@ proc vfork_parent_follow_to_bp {} { set test "continue to bp" gdb_test_multiple "continue" $test { - -re ".*Detaching after vfork from child process.*Breakpoint.*${bp_location}.*$gdb_prompt " { + -re ".*\\\[Detaching after vfork from child process.*Breakpoint.*${bp_location}.*$gdb_prompt " { pass $test } } @@ -153,7 +149,7 @@ proc vfork_child_follow_to_exit {} { # PR gdb/14766 fail "$test" } - -re "Attaching after.* vfork to.*Detaching vfork parent .* after child exit.*$gdb_prompt " { + -re "\\\[Attaching after.* vfork to.*\\\[Detaching vfork parent .* after child exit.*$gdb_prompt " { pass $test } } @@ -177,7 +173,7 @@ proc vfork_and_exec_child_follow_to_main_bp {} { set test "continue to bp" gdb_test_multiple "continue" $test { - -re "Attaching after.* vfork to.*Detaching vfork parent.*xecuting new program.*Breakpoint.*vforked-prog.c:${linenum}.*$gdb_prompt " { + -re "\\\[Attaching after.* vfork to.*\\\[Detaching vfork parent.*xecuting new program.*Breakpoint.*vforked-prog.c:${linenum}.*$gdb_prompt " { pass $test } } @@ -203,7 +199,7 @@ proc vfork_and_exec_child_follow_through_step {} { # before it execs. Thus, "next" lands on the next line after # the vfork. gdb_test_multiple "next" $test { - -re "Attaching after .* vfork to child.*if \\(pid == 0\\).*$gdb_prompt " { + -re "\\\[Attaching after .* vfork to child.*if \\(pid == 0\\).*$gdb_prompt " { pass "$test" } } @@ -341,7 +337,7 @@ proc vfork_relations_in_info_inferiors { variant } { set test "step over vfork" gdb_test_multiple "next" $test { - -re "Attaching after .* vfork to child.*if \\(pid == 0\\).*$gdb_prompt " { + -re "\\\[Attaching after .* vfork to child.*if \\(pid == 0\\).*$gdb_prompt " { pass "$test" } } diff --git a/gdb/testsuite/gdb.base/fork-detach-info.c b/gdb/testsuite/gdb.base/fork-detach-info.c new file mode 100644 index 0000000000..182a363dcc --- /dev/null +++ b/gdb/testsuite/gdb.base/fork-detach-info.c @@ -0,0 +1,37 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2007-2018 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include +#include + +int +main (int argc, char *argv[]) +{ + pid_t child; + + child = fork (); + switch (child) + { + case -1: + abort (); + case 0: + default: + break; + } + + return 0; +} diff --git a/gdb/testsuite/gdb.base/fork-detach-info.exp b/gdb/testsuite/gdb.base/fork-detach-info.exp new file mode 100644 index 0000000000..aa9a85c0d5 --- /dev/null +++ b/gdb/testsuite/gdb.base/fork-detach-info.exp @@ -0,0 +1,68 @@ +# This testcase is part of GDB, the GNU debugger. + +# Copyright 2007-2018 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +if { [use_gdb_stub] || [target_info gdb_protocol] == "extended-remote" } { + untested "not supported on gdbserver" + return +} + +standard_testfile + +if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } { + return -1 +} + +# This is the expected output for each of the test combinations +# below. The order here is important: +# +# follow-fork: child; detach-on-fork: on; inferior-events: on +# follow-fork: child; detach-on-fork: on; inferior-events: off +# follow-fork: child; detach-on-fork: off; inferior-events: on +# follow-fork: child; detach-on-fork: off; inferior-events: off +# follow-fork: parent; detach-on-fork: on; inferior-events: on +# follow-fork: parent; detach-on-fork: on; inferior-events: off +# follow-fork: parent; detach-on-fork: off; inferior-events: on +# follow-fork: parent; detach-on-fork: off; inferior-events: off +set expected_output [list \ + "\\\[Attaching after process $decimal fork to child process $decimal\\.\\\]\r\n\\\[New inferior $decimal\\\]\r\n\\\[Detaching after fork from child process $decimal\\.\\\]\r\n\\\[Inferior $decimal detached\\\]\r\n\\\[Inferior $decimal \\(process $decimal\\) exited normally\\\]" \ + "\\\[Inferior $decimal \\(process $decimal\\) exited normally\\\]" \ + "\\\[Attaching after process $decimal fork to child process $decimal\\.\\\]\r\n\\\[New inferior $decimal\\\]\r\n\\\[Inferior $decimal \\(process $decimal\\) exited normally\\\]" \ + "\\\[Inferior $decimal \\(process $decimal\\) exited normally\\\]" \ + "\\\[Detaching after fork from child process $decimal\\.\\\]\r\n\\\[Inferior $decimal \\(process $decimal\\) exited normally\\\]" \ + "\\\[Inferior $decimal \\(process $decimal\\) exited normally\\\]" \ + "\\\[New inferior $decimal\\\]\r\n\\\[Inferior $decimal \\(process $decimal\\) exited normally\\\]" \ + "\\\[Inferior $decimal \\(process $decimal\\) exited normally\\\]"] + +set i 0 + +foreach_with_prefix follow_fork_mode { "child" "parent" } { + foreach_with_prefix detach_on_fork { "on" "off" } { + foreach_with_prefix print_inferior_events { "on" "off" } { + clean_restart $binfile + gdb_test_no_output "set follow-fork-mode $follow_fork_mode" + gdb_test_no_output "set detach-on-fork $detach_on_fork" + gdb_test_no_output "set print inferior-events $print_inferior_events" + + 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" + set i [expr $i + 1] + gdb_test "run" $output + } + } +} diff --git a/gdb/testsuite/gdb.threads/clone-attach-detach.exp b/gdb/testsuite/gdb.threads/clone-attach-detach.exp index 1fbdc95ffc..07b10f534b 100644 --- a/gdb/testsuite/gdb.threads/clone-attach-detach.exp +++ b/gdb/testsuite/gdb.threads/clone-attach-detach.exp @@ -56,7 +56,7 @@ for {set attempt 1} {$attempt <= $attempts} {incr attempt} { "1.*${thread_re}.*\r\n.*2.*${thread_re}.*" \ "info threads shows two LWPs" - gdb_test "detach" "Detaching from .*, process $testpid" + gdb_test "detach" "Detaching from .*, process $testpid\r\n\\\[Inferior $decimal detached\\\]" } } @@ -91,7 +91,7 @@ for {set attempt 1} {$attempt <= $attempts} {incr attempt} { "1.*${thread_re}.*\\(running\\)\r\n.*2.*${thread_re}.*\\(running\\)" \ "info threads shows two LWPs" - gdb_test "detach" "Detaching from .*, process $testpid" + gdb_test "detach" "Detaching from .*, process $testpid\r\n\\\[Inferior $decimal detached\\\]" } } diff --git a/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp b/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp index e05acb1711..515c25c341 100644 --- a/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp +++ b/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp @@ -82,7 +82,7 @@ proc detach_and_expect_exit {inf_output_re test} { global gdb_prompt return_if_fail [gdb_test_multiple "detach" $test { - -re "Detaching from .*, process $decimal" { + -re "Detaching from .*, process $decimal\r\n\\\[Inferior $decimal detached\\\]" { } }] @@ -169,7 +169,7 @@ proc do_detach {multi_process cmd child_exit} { && [target_info gdb_protocol] == "remote"}] if {$multi_process} { - gdb_test "detach" "Detaching from .*, process $decimal" \ + gdb_test "detach" "Detaching from .*, process $decimal\r\n\\\[Inferior $decimal detached\\\]" \ "detach child" gdb_test "inferior 1" "\[Switching to inferior $decimal\].*" \ @@ -193,7 +193,7 @@ proc do_detach {multi_process cmd child_exit} { set extra "" } if {$cmd == "detach"} { - gdb_test "detach" "Detaching from .*, process $decimal$extra" + gdb_test "detach" "Detaching from .*, process $decimal\r\n\\\[Inferior $decimal detached\\\]$extra" } elseif {$cmd == "continue"} { gdb_test "continue" $continue_re } else {