From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id CIKiN1AM119FUQAAWB0awg (envelope-from ) for ; Mon, 14 Dec 2020 01:55:12 -0500 Received: by simark.ca (Postfix, from userid 112) id E0DCD1F0AA; Mon, 14 Dec 2020 01:55:12 -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 996961E590 for ; Mon, 14 Dec 2020 01:55:12 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3D9793858004; Mon, 14 Dec 2020 06:55:12 +0000 (GMT) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id AD1943858004 for ; Mon, 14 Dec 2020 06:55:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org AD1943858004 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 CB4FDADCD for ; Mon, 14 Dec 2020 06:55:08 +0000 (UTC) Date: Mon, 14 Dec 2020 07:55:07 +0100 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH][gdb/testsuite] Handle PS1 quirk in gdb.base/multi-line-starts-subshell.exp Message-ID: <20201214065505.GA3249@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) 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" Hi, On SLE-11, I run into: ... (gdb) if 1^M >shell HOME=/dev/null PS1="gdb-subshell$ " /bin/sh^M >end^M hostname:/dir> FAIL: gdb.base/multi-line-starts-subshell.exp: \ spawn subshell from multi-line (timeout) ... The problem is that the PS1 setting has no effect. Fix this by setting PS1 after spawning the subshell. Tested on x86_64-linux. Any comments? Thanks, - Tom [gdb/testsuite] Handle PS1 quirk in gdb.base/multi-line-starts-subshell.exp 2020-12-14 Tom de Vries PR testsuite/26952 * gdb.base/multi-line-starts-subshell.exp: Set PS1 after spawning shell. --- gdb/testsuite/gdb.base/multi-line-starts-subshell.exp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/gdb.base/multi-line-starts-subshell.exp b/gdb/testsuite/gdb.base/multi-line-starts-subshell.exp index 710c3916c6..dc6d70582a 100644 --- a/gdb/testsuite/gdb.base/multi-line-starts-subshell.exp +++ b/gdb/testsuite/gdb.base/multi-line-starts-subshell.exp @@ -27,11 +27,11 @@ set shell_prompt_re [string_to_regexp $shell_prompt] # Point HOME nowhere to avoid the shell sourcing the user's init # scripts. -set shell_cmd "HOME=/dev/null PS1=\"$shell_prompt\" /bin/sh" +set shell_cmd "HOME=/dev/null /bin/sh" set test "spawn subshell from multi-line" -gdb_test_multiple "if 1\nshell ${shell_cmd}\nend" $test { - -re "$shell_prompt_re$" { +gdb_test_multiple "if 1\nshell ${shell_cmd}\nend\nPS1=\"$shell_prompt\"" $test { + -re "PS1=\[^\r\n\]*\r\n$shell_prompt_re$" { pass $test # Now check that shell input works and that echo is enabled.