From patchwork Wed Apr 17 16:57:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 88592 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 029063858C41 for ; Wed, 17 Apr 2024 16:58:40 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id CF8633858D3C for ; Wed, 17 Apr 2024 16:57:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CF8633858D3C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CF8633858D3C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713373066; cv=none; b=ofcIcYS6GAg7G+ybpKneZNzhmNBuYyi5qnZOxXJf9NEKldxdPog8kXiW+YSAkZd9+YssLzbelqKgkc/Z9CmFPMQxKHBtYFk+BFpUexI6GhoMrA13fou5a8axKmuWGpCPXrijHHppxUrhv4+P/We1cd4MWTvAP6DHH00hKfRfra0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713373066; c=relaxed/simple; bh=W5YpCQ5P7K/NdJjPUmwkzNZmfNFeCibqI79BIFuH+CY=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=iPtIuYWm2uvUN+T8Pw//A3EtBx+tfJ3PIdHwWIjAJDtpd/khAuD9fUZi1DdfTFFnT6LhRhRxM1y0yTZ53UQNpp/nviSmIhjriGYvpX8ILehSpnnTo9pL/hsyWvGENGtoizA4dhJENeSK1FjU9eFrTWQOfOKCih6iHU2DVAgKL14= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id D1B3C22251 for ; Wed, 17 Apr 2024 16:57:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1713373062; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TbGiYbYFFXBGaPtvnk9VN+6/AduigFN5DAxmLLMUoqg=; b=nQj0Fuw5mfy+BBJo9ccQHUmdt71jfk5tbE+iy1fvdZSCGKtMoF3Kth16cf5WCtHW3HSxXp C2nQfLvbzzieyeAqZT9/7Mi7sopmB6OsebTn8aMVW4ENTPIMHdh8adyjO3r2UjCb3Y9mx3 yYzzjjIWXfnz4wMpDIZfCY+5+7KvXf4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1713373062; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TbGiYbYFFXBGaPtvnk9VN+6/AduigFN5DAxmLLMUoqg=; b=HMY44SzX3Cep2NdAxMItgsyH9QDRdk0w6j38+r+EqNnXnWcQ5jWpjwtODwWxgwQepPg2dH ztvmycFXIzHgjjAQ== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=uYOfuT1R; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=ZSpOSVzG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1713373061; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TbGiYbYFFXBGaPtvnk9VN+6/AduigFN5DAxmLLMUoqg=; b=uYOfuT1RxnTeaF5x3DbvL+KLdOCOvzgxiQkfEFbqSnyDsexH4VM6vbZX0l16lSk2MW1Hh+ HG8HrPlerr9QpBNntn2LbiCaUTaquh513zZudzA8R2bYcEUsKH+V+Gv6JQJ71cUnBeSat9 4VvDC7pQ2WkXKnNyTLd0cAG1ZyYag9c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1713373061; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TbGiYbYFFXBGaPtvnk9VN+6/AduigFN5DAxmLLMUoqg=; b=ZSpOSVzGWZlicMVunBx7brZozmyzldLGADa7IrYlYvHgnds4ESp1QNIrBjNgL9WEOsy29o UKg8ECm32aUTIaCg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id BAC0413976 for ; Wed, 17 Apr 2024 16:57:41 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id UHoTLIX/H2bjAwAAD6G6ig (envelope-from ) for ; Wed, 17 Apr 2024 16:57:41 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 2/3] [gdb/testsuite] Remove superfluous -quiet and -ex set width/height 0 Date: Wed, 17 Apr 2024 18:57:59 +0200 Message-Id: <20240417165800.23467-2-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240417165800.23467-1-tdevries@suse.de> References: <20240417165800.23467-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Action: no action X-Rspamd-Queue-Id: D1B3C22251 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Score: -3.01 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org INTERNAL_GDBFLAGS contains: - -quiet - -iex "set width 0" - -iex "set height 0" There are test-cases that add these once more. Clean this up. Tested on x86_64-linux. PR testsuite/31649 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31649 --- gdb/testsuite/gdb.base/attach.exp | 3 +-- gdb/testsuite/gdb.base/batch-preserve-term-settings.exp | 1 - gdb/testsuite/gdb.base/bp-cmds-execution-x-script.exp | 1 - gdb/testsuite/gdb.base/dprintf-execution-x-script.exp | 1 - gdb/testsuite/gdb.base/new-ui-pending-input.exp | 2 -- gdb/testsuite/gdb.base/paginate-execution-startup.exp | 1 - gdb/testsuite/gdb.python/py-prompt.exp | 2 -- gdb/testsuite/gdb.server/server-kill-python.exp | 6 ++---- gdb/testsuite/lib/debuginfod-support.exp | 4 ++-- 9 files changed, 5 insertions(+), 16 deletions(-) diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp index 7907441054b..83412fd5f14 100644 --- a/gdb/testsuite/gdb.base/attach.exp +++ b/gdb/testsuite/gdb.base/attach.exp @@ -496,8 +496,7 @@ proc_with_prefix test_command_line_attach_run {} { set test "run to prompt" gdb_exit - set res [gdb_spawn_with_cmdline_opts \ - "-quiet -iex \"set height 0\" -iex \"set width 0\" --pid=$testpid -ex \"start\""] + set res [gdb_spawn_with_cmdline_opts "--pid=$testpid -ex \"start\""] if { $res != 0} { fail $test kill_wait_spawned_process $test_spawn_id diff --git a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp index fbaba634e20..dc2b1ce617e 100644 --- a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp +++ b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp @@ -139,7 +139,6 @@ proc test_terminal_settings_preserved {} { set test "gdb -batch -ex run" append EXTRA_GDBFLAGS "-batch" - append EXTRA_GDBFLAGS " -ex \"set height unlimited\"" append EXTRA_GDBFLAGS " -ex \"start\"" append EXTRA_GDBFLAGS " --args \"$file_arg\"" send_gdb "$GDB $INTERNAL_GDBFLAGS $GDBFLAGS $EXTRA_GDBFLAGS [host_info gdb_opts]\n" diff --git a/gdb/testsuite/gdb.base/bp-cmds-execution-x-script.exp b/gdb/testsuite/gdb.base/bp-cmds-execution-x-script.exp index 02719b1a7af..25adf015b7f 100644 --- a/gdb/testsuite/gdb.base/bp-cmds-execution-x-script.exp +++ b/gdb/testsuite/gdb.base/bp-cmds-execution-x-script.exp @@ -42,7 +42,6 @@ proc test {} { set GDBFLAGS "$GDBFLAGS -x $x_file $binfile" set GDBFLAGS $saved_gdbflags - append GDBFLAGS " -ex \"set height unlimited\"" append GDBFLAGS " -x \"$x_file\"" append GDBFLAGS " --args \"$binfile\"" diff --git a/gdb/testsuite/gdb.base/dprintf-execution-x-script.exp b/gdb/testsuite/gdb.base/dprintf-execution-x-script.exp index af6dd3f9003..12de3aec494 100644 --- a/gdb/testsuite/gdb.base/dprintf-execution-x-script.exp +++ b/gdb/testsuite/gdb.base/dprintf-execution-x-script.exp @@ -37,7 +37,6 @@ set x_file ${srcdir}/${subdir}/$testfile.gdb # outside of the save_vars block.) save_vars { GDBFLAGS } { # Set flags with which to start GDB. - append GDBFLAGS " -ex \"set height unlimited\"" append GDBFLAGS " -x \"$x_file\"" append GDBFLAGS " --args \"$binfile\"" diff --git a/gdb/testsuite/gdb.base/new-ui-pending-input.exp b/gdb/testsuite/gdb.base/new-ui-pending-input.exp index dc19055264b..cfb7ca09434 100644 --- a/gdb/testsuite/gdb.base/new-ui-pending-input.exp +++ b/gdb/testsuite/gdb.base/new-ui-pending-input.exp @@ -60,8 +60,6 @@ proc test_command_line_new_ui_pending_input {} { set bpline [gdb_get_line_number "set breakpoint here"] set options "" - append options " -iex \"set height 0\"" - append options " -iex \"set width 0\"" append options " -iex \"new-ui console $extra_tty_name\"" append options " -ex \"b $bpline\"" append options " -ex \"run\"" diff --git a/gdb/testsuite/gdb.base/paginate-execution-startup.exp b/gdb/testsuite/gdb.base/paginate-execution-startup.exp index 3f0e74e5efa..f0f7db5932c 100644 --- a/gdb/testsuite/gdb.base/paginate-execution-startup.exp +++ b/gdb/testsuite/gdb.base/paginate-execution-startup.exp @@ -38,7 +38,6 @@ proc probe_can_run_cmdline {} { global gdb_prompt set GDBFLAGS $saved_gdbflags - append GDBFLAGS " -ex \"set height 0\"" append GDBFLAGS " -ex \"start\"" append GDBFLAGS " --args \"$file_arg\"" diff --git a/gdb/testsuite/gdb.python/py-prompt.exp b/gdb/testsuite/gdb.python/py-prompt.exp index b37d2fbd3eb..f1f93bff572 100644 --- a/gdb/testsuite/gdb.python/py-prompt.exp +++ b/gdb/testsuite/gdb.python/py-prompt.exp @@ -32,8 +32,6 @@ save_vars { INTERNAL_GDBFLAGS } { global GDBFLAGS set saved_gdbflags $GDBFLAGS - set GDBFLAGS [concat $GDBFLAGS " -ex \"set height 0\""] - set GDBFLAGS [concat $GDBFLAGS " -ex \"set width 0\""] set GDBFLAGS [concat $GDBFLAGS " -ex \"python p = list()\""] set prompt_func "python def foo(x): global p; p.append(x); return \'(Foo) \'" set GDBFLAGS [concat $GDBFLAGS " -ex \"$prompt_func\""] diff --git a/gdb/testsuite/gdb.server/server-kill-python.exp b/gdb/testsuite/gdb.server/server-kill-python.exp index f02c69c502f..e9066caa6cb 100644 --- a/gdb/testsuite/gdb.server/server-kill-python.exp +++ b/gdb/testsuite/gdb.server/server-kill-python.exp @@ -55,10 +55,8 @@ close $fd set host_file1 [gdb_remote_download host $file1] -# Now start GDB, sourcing the python command file we generated above. -# Set the height and width so we don't end up at a paging prompt. -if {[gdb_spawn_with_cmdline_opts \ - "-quiet -iex \"set height 0\" -iex \"set width 0\""] != 0} { +# Now start GDB. +if {[gdb_spawn]} { fail "spawn" return } diff --git a/gdb/testsuite/lib/debuginfod-support.exp b/gdb/testsuite/lib/debuginfod-support.exp index bd70a1dfcab..0096448567e 100644 --- a/gdb/testsuite/lib/debuginfod-support.exp +++ b/gdb/testsuite/lib/debuginfod-support.exp @@ -35,9 +35,9 @@ proc allow_debuginfod_tests {} { # # If GDB is built with ASan, it warns that some signal handlers # (installed by ASan) exist on startup. That makes TCL's exec throw an - # error. Disable that by passing --quiet. + # error. This is dealt with by the --quiet in INTERNAL_GDBFLAGS. if { [string first "with-debuginfod" \ - [eval exec $::GDB --quiet $::INTERNAL_GDBFLAGS \ + [eval exec $::GDB $::INTERNAL_GDBFLAGS \ --configuration]] == -1 } { return false }