From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 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 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1669967822; 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=nrWMt1zEXwTeeWJ7ht5Fpu+ompwb03gmJQ/IV93fBlA=; b=FBme6WxCUFYHG6w8tFJ3rpldXuMWv+RUnkaZTQ/kjEF9Eapi3vhonqRK7ncchBcScXOQPH KA/+kjsZ6rkydInTgXq3Kv9tBCnmRz1ApjQKBGLawxPJj8O/v9FoNDSrdSr6H0pEWlFnEq uTHog8qxnKcGQWXvfChJqJNtp2YBu64= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1669967822; 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=nrWMt1zEXwTeeWJ7ht5Fpu+ompwb03gmJQ/IV93fBlA=; b=GmkBM0ifkzU8MSLQndID/AKw2i9O4qx89uJKDVC4luU5SaRyY+ei11HnTTL9VtSvvi82/7 jEGtiAaemTkzsYAQ== 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 From: Tom de Vries 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 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 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: 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(-) 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. base-commit: aaa8dbc1b31233f66131476e03ab8635805e515d -- 2.35.3