From patchwork Fri Dec 2 07:57:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 61345 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 81BFD3858421 for ; Fri, 2 Dec 2022 07:57:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 81BFD3858421 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669967847; bh=nrWMt1zEXwTeeWJ7ht5Fpu+ompwb03gmJQ/IV93fBlA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=i42hPJxHZk+NMmsnlCAP7r/A3jlMwfAaMlZ9KrathnZEQcCMRd0ON58KefKzaUlZs 36XcuzSEkZuEp8D6EZkbc0fZCP6hrgvp5BzwfEfVx05GHL6o0K/B0jUDeH6+bZu1GT AW/CS4T9QEK1HozSAm2YxsXGBCbG7isx+Et5aI/g= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 77ECD3858D20 for ; Fri, 2 Dec 2022 07:57:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 77ECD3858D20 Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (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 B1A191FD6E for ; Fri, 2 Dec 2022 07:57:02 +0000 (UTC) Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (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 imap1.suse-dmz.suse.de (Postfix) with ESMTPS id 9D67C13644 for ; Fri, 2 Dec 2022 07:57:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap1.suse-dmz.suse.de with ESMTPSA id cZY9Jc6viWPzFQAAGKfGzw (envelope-from ) for ; Fri, 02 Dec 2022 07:57:02 +0000 To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Prevent timeout in gdb.ada/float-bits.exp Date: Fri, 2 Dec 2022 08:57:02 +0100 Message-Id: <20221202075702.5969-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 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 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom de Vries via Gdb-patches From: Tom de Vries Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Recent commit 32a5aa26256 ("[gdb/testsuite] Fix gdb.ada/float-bits.exp for powerpc64le") started using command "maint print architecture", which produces ~275 lines. Rewrite the corresponding gdb_test_multiple to read line-by-line, to prevent timeouts on slower test setups. Note that this doesn't fix a timeout in the test-case on aarch64 due to: ... gdbarch_dump: read_core_file_mappings = <0x817438> (gdb) aarch64_dump_tdep: Lowest pc = 0x0x8000 ... Tested on x86_64-linux. --- gdb/testsuite/gdb.ada/float-bits.exp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) base-commit: aaa8dbc1b31233f66131476e03ab8635805e515d diff --git a/gdb/testsuite/gdb.ada/float-bits.exp b/gdb/testsuite/gdb.ada/float-bits.exp index 921fe36a4bd..dab16a60286 100644 --- a/gdb/testsuite/gdb.ada/float-bits.exp +++ b/gdb/testsuite/gdb.ada/float-bits.exp @@ -75,14 +75,21 @@ set gdb_long_double_size [float_size "16llf#0#" ] # Get the used long double format. set long_double_format "" -gdb_test_multiple "maint print architecture" "" { - -re "\r\ngdbarch_dump: long_double_format = (\[^\r\n\]*)" { +set cmd "maint print architecture" +gdb_test_multiple $cmd "" { + -re "^[string_to_regexp $cmd](?=\r\n)" { + exp_continue + } + -re "^\r\ngdbarch_dump: long_double_format = (\[^\r\n\]*)(?=\r\n)" { set long_double_format $expect_out(1,string) exp_continue } - -re -wrap "" { + -re "^\r\n$gdb_prompt $" { pass $gdb_test_name } + -re "^\r\n(\[^\r\n\]*)(?=\r\n)" { + exp_continue + } } # Set default values for 128-bit IEEE quad long doubles.