From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=nz/g=AU=suse.de=tdevries@sourceware.org>
Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28])
	by sourceware.org (Postfix) with ESMTPS id E3D4B3858C50
	for <gdb-patches@sourceware.org>; Sat, 29 Apr 2023 08:47:46 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E3D4B3858C50
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-out1.suse.de (Postfix) with ESMTPS id F174C21DA8
	for <gdb-patches@sourceware.org>; Sat, 29 Apr 2023 08:47:45 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa;
	t=1682758065; 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=Y2JgZoPwYxvu8qlK57F6brmfZpkT/2/ZsEdmI6d4jpI=;
	b=nyfbEfbLlp+jV+dxm3tBgKWTN6Al/sTt/qfwomIup3EkxCkqlwDKQgYyJpjkQyE1mqHf3X
	guw1vbTXs7UNWfTtX6v0su0PaSfONk3OwuFI1vCSIoI5tLiro3or/AY75F4C8LRliE2oIx
	KI8U8IjPTbxaTRX9U/7cW8g4AFt8pPs=
DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;
	s=susede2_ed25519; t=1682758065;
	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=Y2JgZoPwYxvu8qlK57F6brmfZpkT/2/ZsEdmI6d4jpI=;
	b=Oq3U9rVa372+luqvLjwuHog8YW33NAzV3xeKb2k5/GpMxcguO5nAou9/WRVpnLwEAWDSLT
	lyPdo5vW9HJYuIAg==
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 D625113587
	for <gdb-patches@sourceware.org>; Sat, 29 Apr 2023 08:47:45 +0000 (UTC)
Received: from dovecot-director2.suse.de ([192.168.254.65])
	by imap2.suse-dmz.suse.de with ESMTPSA
	id 8ldRMrHZTGR+eQAAMHmgww
	(envelope-from <tdevries@suse.de>)
	for <gdb-patches@sourceware.org>; Sat, 29 Apr 2023 08:47:45 +0000
From: Tom de Vries <tdevries@suse.de>
To: gdb-patches@sourceware.org
Subject: [pushed] [gdb/testsuite] Fix gdb.base/readline.exp with stub-termcap
Date: Sat, 29 Apr 2023 10:48:00 +0200
Message-Id: <20230429084800.25207-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.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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: <gdb-patches.sourceware.org>

When doing a build which uses stub-termcap, we run into:
...
(gdb) set width 7
<b) FAIL: gdb.base/readline.exp: set width 7 (timeout)
...

Since readline can't detect very basic terminal support, it falls back on
horizontal scrolling.

Fix this by detecting the horizontal scrolling case, and skipping the
subsequent test.

Tested on x86_64-linux.

PR testsuite/30400
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30400
---
 gdb/testsuite/gdb.base/readline.exp | 57 ++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 22 deletions(-)

diff --git a/gdb/testsuite/gdb.base/readline.exp b/gdb/testsuite/gdb.base/readline.exp
index 87225273c25..e00ed088282 100644
--- a/gdb/testsuite/gdb.base/readline.exp
+++ b/gdb/testsuite/gdb.base/readline.exp
@@ -219,31 +219,44 @@ save_vars { env(TERM) } {
 	set char_total 4500
 	set char_sent 0
 
-	# Adjust the terminal width.
-	gdb_test_no_output "set width 7"
-
-	# Send the command prefix, then lots of additional characters
-	# that create a really long command that wraps over multiple
-	# lines.
-	send_gdb "help X"
-	gdb_test_multiple "" "send long command to GDB" {
-	    -re "X" {
-		incr char_sent
-		if {$char_sent <= $char_total} {
-		    send_gdb "X"
-		    exp_continue
-		}
+	# Adjust the terminal width.  Detect horizontal scrolling, which
+	# happens with stub-termcap.c.
+	set horizontal_scrolling 0
+	set cmd "set width 7"
+	gdb_test_multiple $cmd "" {
+	    -re "^$cmd\r\n$gdb_prompt $" {
+		pass $gdb_test_name
 	    }
-	    -re "\[ \b\r\n\]" {
-		exp_continue
+	    -re "^$cmd\r\n<b\\) $" {
+		set horizontal_scrolling 1
+		pass $gdb_test_name
 	    }
 	}
 
-	# Send the final newline so that GDB will process the command.
-	# Check GDB returns a suitable error.
-	send_gdb "\n"
-	gdb_test "" \
-	    "Undefined command: \"X+\"\\.  Try \"help\"\\." \
-	    "All the characters transferred"
+	if { !$horizontal_scrolling } {
+	    # Send the command prefix, then lots of additional characters
+	    # that create a really long command that wraps over multiple
+	    # lines.
+	    send_gdb "help X"
+	    gdb_test_multiple "" "send long command to GDB" {
+		-re "X" {
+		    incr char_sent
+		    if {$char_sent <= $char_total} {
+			send_gdb "X"
+			exp_continue
+		    }
+		}
+		-re "\[ \b\r\n\]" {
+		    exp_continue
+		}
+	    }
+
+	    # Send the final newline so that GDB will process the command.
+	    # Check GDB returns a suitable error.
+	    send_gdb "\n"
+	    gdb_test "" \
+		"Undefined command: \"X+\"\\.  Try \"help\"\\." \
+		"All the characters transferred"
+	}
     }
 }

base-commit: e0f4b3ec5f36ff90dbea21aab2190fb4565ca67b
-- 
2.35.3