From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id EUxpCElv2l8TMwAAWB0awg (envelope-from ) for ; Wed, 16 Dec 2020 15:34:17 -0500 Received: by simark.ca (Postfix, from userid 112) id 08C781F0AA; Wed, 16 Dec 2020 15:34:17 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.3 required=5.0 tests=MAILING_LIST_MULTI,RDNS_NONE, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id B44741E552 for ; Wed, 16 Dec 2020 15:34:15 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2E41E385703A; Wed, 16 Dec 2020 20:34:15 +0000 (GMT) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id 2FD93385703A for ; Wed, 16 Dec 2020 20:34:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2FD93385703A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 46AB7AC7F; Wed, 16 Dec 2020 20:34:10 +0000 (UTC) Subject: Re: [PATCH][gdb/testsuite] Handle shell prompt in batch-preserve-term-settings.exp To: Luis Machado , gdb-patches@sourceware.org References: <20201214065337.GA3067@delia> <2fe4a7c6-1965-2184-6583-023f8699dcac@linaro.org> From: Tom de Vries Message-ID: Date: Wed, 16 Dec 2020 21:34:09 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 In-Reply-To: <2fe4a7c6-1965-2184-6583-023f8699dcac@linaro.org> Content-Type: multipart/mixed; boundary="------------1FACFA9F49D93F720AD55575" Content-Language: en-US X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" This is a multi-part message in MIME format. --------------1FACFA9F49D93F720AD55575 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 12/15/20 4:21 PM, Luis Machado wrote: > Ubuntu 18.04 on aarch64 isn't happy about this change. > > I'm getting a number of timeouts now. > > FAIL: gdb.base/batch-preserve-term-settings.exp: batch run: spawn shell > (timeout) I could reproduce this on Ubuntu 18.04 x86_64 as well. > FAIL: gdb.base/batch-preserve-term-settings.exp: cli exit: spawn shell > (timeout) > FAIL: gdb.base/batch-preserve-term-settings.exp: cli exit after start > cmd: spawn shell (timeout) > FAIL: gdb.base/batch-preserve-term-settings.exp: cli exit after run cmd: > spawn shell (timeout) > FAIL: gdb.base/batch-preserve-term-settings.exp: cli exit after SIGTERM: > spawn shell (timeout) > > All look like this: > > spawn /bin/sh^M > $ gdb-subshell$ > > Fixed in patch below, committed. Thanks, - Tom --------------1FACFA9F49D93F720AD55575 Content-Type: text/x-patch; charset=UTF-8; name="0001-gdb-testsuite-Fix-prompt-regexp-in-batch-preserve-term-settings.exp.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename*0="0001-gdb-testsuite-Fix-prompt-regexp-in-batch-preserve-term-"; filename*1="settings.exp.patch" [gdb/testsuite] Fix prompt regexp in batch-preserve-term-settings.exp On openSUSE Leap 15.2, when running test-case gdb.base/batch-preserve-term-settings.exp I get: ... spawn /bin/sh^M PS1="gdb-subshell$ "^M sh-4.4$ PS1="gdb-subshell$ "^M gdb-subshell$ PASS: gdb.base/batch-preserve-term-settings.exp: batch run: \ spawn shell ... but on Ubuntu 18.04.5, I get instead: ... spawn /bin/sh^M PS1="gdb-subshell$ "^M $ gdb-subshell$ FAIL: gdb.base/batch-preserve-term-settings.exp: batch run: \ spawn shell (timeout) ... Fix this by making the regexp recognize the second pattern as well. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-12-16 Tom de Vries * gdb.base/batch-preserve-term-settings.exp: --- gdb/testsuite/gdb.base/batch-preserve-term-settings.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp index c39d638aeb..3e35d20dd7 100644 --- a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp +++ b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp @@ -47,7 +47,7 @@ proc spawn_shell {} { set gotit 0 set test "spawn shell" gdb_expect { - -re "PS1=\[^\r\n\]*\r\n$shell_prompt_re$" { + -re "PS1=\[^\r\n\]*\r\n.*$shell_prompt_re$" { pass $test set gotit 1 } --------------1FACFA9F49D93F720AD55575--