From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id BFC263858289; Tue, 11 Oct 2022 08:14:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BFC263858289 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665476083; bh=M465uz3/AevWVWCmHahzMrfEQgFI46HKONmu6i4Y2jI=; h=From:To:Subject:Date:From; b=Lm/SeRLSb/O4fb8VA2T0J2shsVHgcsjg7bnKB2nkWfF3Kp1jQay88+csEiiwhsofv zmp4lVRetVhOVu7N9E4hlOheiNnGQTQzr4S7WLlAeIBVj0IPmYiUAN+XsDkzoJ5YDw IUIdDtfe+Li6dVMtQ59P6U44x+akb50Fz1kkoaKA= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Fix prompt parsing in capture_command_output X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: 3f2ef5ba4278e7a436208b4aa48e7cb599392a92 X-Git-Newrev: 86b4a00fa329a4df7ec2cb404c2b52152560aa0f Message-Id: <20221011081443.BFC263858289@sourceware.org> Date: Tue, 11 Oct 2022 08:14:43 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D86b4a00fa329= a4df7ec2cb404c2b52152560aa0f commit 86b4a00fa329a4df7ec2cb404c2b52152560aa0f Author: Tom de Vries Date: Tue Oct 11 10:14:38 2022 +0200 [gdb/testsuite] Fix prompt parsing in capture_command_output =20 I noticed in capture_command_output that the output of a single command= is matched using two gdb_test_multiples: - the first one matching the echoed command and skipping an optional pr= efix, - the second one matching the output and the prompt. =20 This is error-prone, because the first gdb_test_multiple has implicit clauses which may consume the prompt. =20 The problem is easy to spot with an example. First consider: ... set output [capture_command_output "print 1" "\\\$1 =3D "] gdb_assert { [string equal $output "1"] } ... for which we get: ... PASS: [string equal $output "1"] ... =20 If we change the prefix string to a no-match, say "1 =3D ", and update = the output string match accordingly, we get instead: ... FAIL: capture_command_output for print 1 FAIL: [string equal $output "\$1 =3D 1"] ... =20 The first FAIL is produced by the first gdb_test_multiple, consuming th= e prompt. =20 The second gdb_test_multiple then silently times out waiting for anothe= r prompt, after which the second FAIL is produced. Note that the timeout is sile= nt because the gdb_test_multiple is called with an empty message argument. =20 The second FAIL is because capture_command_output returns "", given tha= t all the command output was consumed by the first gdb_test_multiple. =20 Fix this by rewriting capture_command_output to use only a single gdb_test_multiple. =20 Tested on x86_64-linux. Diff: --- .../gdb.testsuite/capture-command-output.exp | 38 ++++++++++++++++++= ++++ gdb/testsuite/lib/gdb.exp | 32 ++++++++---------- 2 files changed, 51 insertions(+), 19 deletions(-) diff --git a/gdb/testsuite/gdb.testsuite/capture-command-output.exp b/gdb/t= estsuite/gdb.testsuite/capture-command-output.exp new file mode 100644 index 00000000000..a48ceb0d65c --- /dev/null +++ b/gdb/testsuite/gdb.testsuite/capture-command-output.exp @@ -0,0 +1,38 @@ +# Copyright 2022 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 . + +# The purpose of this test-case is to test the capture_command_output proc. + +clean_restart + +# Check output with no prefix. + +with_test_prefix no-prefix { + set output [capture_command_output "print 1" ""] + gdb_assert { [string equal $output "\$1 =3D 1"] } +} + +# Check output with matching prefix. + +with_test_prefix matching-prefix { + set output [capture_command_output "print 1" "\\\$2 =3D "] + gdb_assert { [string equal $output "1"] } +} + +# Check output with non-matching prefix. + +with_test_prefix non-matching-prefix { + set output [capture_command_output "print 1" "3 =3D "] + gdb_assert { [string equal $output "\$3 =3D 1"] } +} diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index f53d90edd00..61bc060b2f7 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -7888,27 +7888,10 @@ proc capture_command_output { command prefix } { global gdb_prompt global expect_out =20 - set code { - -re "^[string_to_regexp ${command}]\r\n" { - if { $prefix !=3D "" } { - exp_continue - } - } - } - - if { $prefix !=3D "" } { - append code { - -re "^${prefix}" { - # Nothing, we just move onto the next gdb_test_multiple - # call, which actually collects the command output. - } - } - } - - gdb_test_multiple "$command" "capture_command_output for $command" $co= de + set test "capture_command_output for $command" =20 set output_string "" - gdb_test_multiple "" "" { + gdb_test_multiple $command $test { -re "^(\[^\r\n\]+\r\n)" { if { ![string equal $output_string ""] } { set output_string [join [list $output_string $expect_out(1,string)] ""] @@ -7922,7 +7905,18 @@ proc capture_command_output { command prefix } { } } =20 + # Strip the command. + set command_re [string_to_regexp ${command}] + set output_string [regsub ^$command_re\r\n $output_string ""] + + # Strip the prefix. + if { $prefix !=3D "" } { + set output_string [regsub ^$prefix $output_string ""] + } + + # Strip a trailing newline. set output_string [regsub "\r\n$" $output_string ""] + return $output_string }