From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 91B653858D28 for ; Wed, 21 Jun 2023 13:31:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 91B653858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id CC5191FE74 for ; Wed, 21 Jun 2023 13:31:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1687354318; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=elGu2DRZLdVlNqklm2IV22zISw/ceflNUeJ2OKBa5ls=; b=N7aFQBRNYpvm47lvajNMCSWaE6OnaTWVW214d34UT6ZVrs8zMtBDBsaHg8ygvtotDBtprS Kjf38lbHWkJlBRhRtoXwiuyKq9JH6umdwNp32Bnp1/JeoXKR9bjYFfOlIfYvE4cvv+lF1N fkT+t1e+86L59j0BwDaDGh/lsQctLMI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1687354318; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=elGu2DRZLdVlNqklm2IV22zISw/ceflNUeJ2OKBa5ls=; b=IuQf8LgukEaC7hQowHzILSZquKr/unuyf0awVoNU+b1FC5phXo1iusYEYFm+wzjr+MTgXj qbhl5jgxuILg54Ag== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id B8B71134B1 for ; Wed, 21 Jun 2023 13:31:58 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id JsEELM77kmRBagAAMHmgww (envelope-from ) for ; Wed, 21 Jun 2023 13:31:58 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed 1/2] [gdb/testsuite] Make Term::wait_for "" match only a prompt Date: Wed, 21 Jun 2023 15:31:59 +0200 Message-Id: <20230621133200.25576-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: The semantics of Term::wait_for is: ... # Accept some output from gdb and update the screen. WAIT_FOR is # a regexp matching the line to wait for. Return 0 on timeout, 1 # on success. proc wait_for {wait_for} { ... Note that besides the regexp, also a subsequent gdb prompt is matched. I recently used wait_for "" in a few test-cases, thinking that this would match just a prompt, but in fact that's not the case. Fix this in wait_for, and add a corresponding test in gdb.tui/tuiterm-2.exp. Tested on x86_64-linux. --- gdb/testsuite/gdb.tui/tuiterm-2.exp | 13 +++++++++++++ gdb/testsuite/lib/tuiterm.exp | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/gdb/testsuite/gdb.tui/tuiterm-2.exp b/gdb/testsuite/gdb.tui/tuiterm-2.exp index e7a0f03e4ba..8e838d31073 100644 --- a/gdb/testsuite/gdb.tui/tuiterm-2.exp +++ b/gdb/testsuite/gdb.tui/tuiterm-2.exp @@ -93,6 +93,19 @@ with_override Term::accept_gdb_output test_accept_gdb_output { } gdb_assert { ![Term::command "foo"] } } + + with_test_prefix Term::wait_for { + Term::_setup 4 20 + set send_cnt 0 + set expect_send {} + set action_cnt 0 + set actions { + { + Term::_insert "(gdb) " + } + } + gdb_assert { [Term::wait_for ""] } + } } } } diff --git a/gdb/testsuite/lib/tuiterm.exp b/gdb/testsuite/lib/tuiterm.exp index dc928ae5aff..41fa554aa09 100644 --- a/gdb/testsuite/lib/tuiterm.exp +++ b/gdb/testsuite/lib/tuiterm.exp @@ -789,6 +789,10 @@ namespace eval Term { set fn "wait_for" set prompt_wait_for "(^|\\|)$gdb_prompt \$" + if { $wait_for == "" } { + set wait_for $prompt_wait_for + } + debug_tui_matching "$fn: regexp: '$wait_for'" while 1 { base-commit: 340640f710e690b37c885166949595cde5f827b2 -- 2.35.3