From patchwork Tue Apr 21 18:08:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 6367 Received: (qmail 97204 invoked by alias); 21 Apr 2015 18:09:07 -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 95981 invoked by uid 89); 21 Apr 2015 18:08:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 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 (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 21 Apr 2015 18:08:55 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3LI8sr7009237 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 21 Apr 2015 14:08:54 -0400 Received: from brno.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3LI8WL9028722 for ; Tue, 21 Apr 2015 14:08:53 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 20/24] Adjust MI to $inferior_spawn_id Date: Tue, 21 Apr 2015 19:08:27 +0100 Message-Id: <1429639711-16459-21-git-send-email-palves@redhat.com> In-Reply-To: <1429639711-16459-1-git-send-email-palves@redhat.com> References: <1429639711-16459-1-git-send-email-palves@redhat.com> Rather than trying to determine where (which spawn id) the inferior output comes out from, which depends on e.g., remote that supports file i/o remote protocol extension, vs remote that sends inferior output through a separate $inferior_spawn_id, vs native debugging, which sends output through $gdb_spawn_id, vs native debugging with a test that uses "separate-inferior-tty" (like mi-console.exp does), always expect inferior output from both $inferior_spawn_id and $gdb_spawn_id. mi-console.exp itself already copes with different possible outputs in a similar way: # Combine both outputs in a single pattern. set output "($semihosted_output|$native_output)" Fixes: FAIL: gdb.mi/mi-console.exp: Testing console output inferior output (timeout) when testing against local gdbserver with gdb,noinferiorio removed from the board file. gdb/testsuite/ChangeLog: 2015-04-21 Pedro Alves * lib/mi-support.exp (mi_inferior_spawn_id): Delete. (default_mi_gdb_start): Set inferior_spawn_id instead of mi_inferior_spawn_id. If $inferior_spawn_id is not set, set it to gdb_spawn_id. (mi_gdb_test): Always expect inferior output from both $inferior_spawn_id and $gdb_spawn_id. --- gdb/testsuite/lib/mi-support.exp | 56 +++++++++++++++------------------------- 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index 6827ef9..27b2ebc 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -26,7 +26,6 @@ if ![info exists mi_gdb_prompt] then { set mi_gdb_prompt "\[(\]gdb\[)\] \r\n" } -global mi_inferior_spawn_id global mi_inferior_tty_name set MIFLAGS "-i=mi" @@ -104,7 +103,7 @@ proc default_mi_gdb_start { args } { global gdb_prompt global mi_gdb_prompt global timeout - global gdb_spawn_id + global gdb_spawn_id inferior_spawn_id global MIFLAGS gdb_stop_suppressing_tests @@ -138,15 +137,6 @@ proc default_mi_gdb_start { args } { } } - # Create the new PTY for the inferior process. - if { $separate_inferior_pty } { - spawn -pty - global mi_inferior_spawn_id - global mi_inferior_tty_name - set mi_inferior_spawn_id $spawn_id - set mi_inferior_tty_name $spawn_out(slave,name) - } - set res [remote_spawn host "$GDB $INTERNAL_GDBFLAGS $GDBFLAGS $MIFLAGS [host_info gdb_opts]"] if { $res < 0 || $res == "" } { perror "Spawning $GDB failed." @@ -214,9 +204,14 @@ proc default_mi_gdb_start { args } { warning "Couldn't set the width to 0." } } - # If allowing the inferior to have its own PTY then assign the inferior - # its own terminal device here. + + # Create the new PTY for the inferior process. if { $separate_inferior_pty } { + spawn -pty + global mi_inferior_tty_name + set inferior_spawn_id $spawn_id + set mi_inferior_tty_name $spawn_out(slave,name) + send_gdb "102-inferior-tty-set $mi_inferior_tty_name\n" gdb_expect 10 { -re ".*102\\\^done\r\n$mi_gdb_prompt$" { @@ -228,6 +223,10 @@ proc default_mi_gdb_start { args } { } } + if {![info exists inferior_spawn_id]} { + set inferior_spawn_id $gdb_spawn_id + } + mi_detect_async return 0 @@ -770,29 +769,16 @@ proc mi_gdb_test { args } { if { $result == 0 } { if [ info exists ipattern ] { if { ![target_info exists gdb,noinferiorio] } { - if { [target_info gdb_protocol] == "remote" - || [target_info gdb_protocol] == "extended-remote" - || [target_info protocol] == "sim"} { - - gdb_expect { - -re "$ipattern" { - pass "$message inferior output" - } - timeout { - fail "$message inferior output (timeout)" - set result 1 - } + global gdb_spawn_id inferior_spawn_id + + set sid "$inferior_spawn_id $gdb_spawn_id" + gdb_expect { + -i "$sid" -re "$ipattern" { + pass "$message inferior output" } - } else { - global mi_inferior_spawn_id - expect { - -i $mi_inferior_spawn_id -re "$ipattern" { - pass "$message inferior output" - } - timeout { - fail "$message inferior output (timeout)" - set result 1 - } + timeout { + fail "$message inferior output (timeout)" + set result 1 } } } else {