From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 3B1F83857340 for ; Tue, 11 Jun 2024 13:10:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3B1F83857340 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 3B1F83857340 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=1718111443; cv=none; b=ZtlV4gO2Argzr6803GbmbbYR6+/EccXQdtw3hAm5vRhhJNSh9AO8vN1NAri46umYr/e6uyr7REJUpbYrCdwD2B309zQwEuTwwY4QGY0DTaE28+UsvynJCwcaidyN1T/0zu3ahKZSQGCsVyJyRpwS4fwnJWgMPCzK+iS7ykeOO8o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718111443; c=relaxed/simple; bh=UvN/rZHnSUoL0xsE4WVKcmySwXDWmbStltBYpqYdE4U=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=mRQ4u6JS1vLV7bSvFlKn0+G321qygW1UDzenCht2ChY7plVTGeH+88WwDMyEBrTp1pZdsrq7z9g3sFTbli8Byqc8cx62Ds3LxP6v9o5t+PuiPSecWlQn3QbmCF6pEO0SGG8X64c49Q09th9Hrg8ky7h2xnS8F5hxHK3kASdl85g= 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 0535933784 for ; Tue, 11 Jun 2024 13:10:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718111440; 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=nqegBAY7+23GHbhTtAzibjESyAd5Y9DBEgrKO2T6YjM=; b=w3Z0TgIlOmSYvkbo1l1iBL4+alrc4fCyAYjSOTlHYSkheGx42yUBEr6QQ5rKqescJa03Ts zo3FNUKZXGVhp4b363RMMvgcUC6d5lEcfhzbEnfjmnTDb6Ebovk2/wQUPpeyaC2akz17jq rPD+16y60uAYKrclZweqGP3oMOQpKq4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718111440; 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=nqegBAY7+23GHbhTtAzibjESyAd5Y9DBEgrKO2T6YjM=; b=GzL6Yqmi9oYx/E+dOkz6IbNRIE5xNiprRYALJnakPUbmc3CIC5JV83SQv42aZMcEyQrREG OWBWRJdwljAtFSDA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=yAr6Rckh; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=nGGyMjuI DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718111439; 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=nqegBAY7+23GHbhTtAzibjESyAd5Y9DBEgrKO2T6YjM=; b=yAr6Rckhgmsb2U5GywXpVc/X+AgczQdmIasLLzmCmU9TsknitoTgx4Ckzqn+W3JSLTMEGo eI3db4OW7RBXZAMv8rW/YmzFXauBqCy0IbtuvAbSzn92CyoXJMW028y0aKS7FAJwPWEEwz VtWOJcicR/Q8RKAseJ7ub9o2YiesHL8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718111439; 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=nqegBAY7+23GHbhTtAzibjESyAd5Y9DBEgrKO2T6YjM=; b=nGGyMjuIE6kpnbXZluRXmMbAk9kAAUwGGfu4Nxtl68lrHa/HMHFFDc0SZ+8BNB2KF2rcXB WWUCNbdnhUH6fjDA== 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 E0FA7137DF for ; Tue, 11 Jun 2024 13:10:38 +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 yZpxNc5MaGYIOAAAD6G6ig (envelope-from ) for ; Tue, 11 Jun 2024 13:10:38 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 1/4] [gdb/testsuite] Fix duplicates in gdb.fortran/array-{indices,repeat}.exp Date: Tue, 11 Jun 2024 15:11:13 +0200 Message-Id: <20240611131116.24494-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; 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)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_NONE(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns] X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: 0535933784 X-Spam-Score: -3.01 X-Spam-Level: X-Spam-Status: No, score=-12.3 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: When running test-case gdb.fortran/array-indices.exp on a system without fortran compiler, I run into a duplicate: ... Running /home/vries/gdb/src/gdb/testsuite/gdb.fortran/array-indices.exp ... gdb compile failed, default_target_compile: Can't find gfortran. UNTESTED: gdb.fortran/array-indices.exp: array-indices.exp gdb compile failed, default_target_compile: Can't find gfortran. UNTESTED: gdb.fortran/array-indices.exp: array-indices.exp DUPLICATE: gdb.fortran/array-indices.exp: array-indices.exp ... Fix this by adding a with_test_prefix at the toplevel. Likewise in gdb.fortran/array-repeat.exp. Tested on x86_64-linux. --- gdb/testsuite/gdb.fortran/array-indices.exp | 37 ++++++++++++--------- gdb/testsuite/gdb.fortran/array-repeat.exp | 31 ++++++++++------- 2 files changed, 40 insertions(+), 28 deletions(-) diff --git a/gdb/testsuite/gdb.fortran/array-indices.exp b/gdb/testsuite/gdb.fortran/array-indices.exp index 5cfc10cb600..0fb0080639f 100644 --- a/gdb/testsuite/gdb.fortran/array-indices.exp +++ b/gdb/testsuite/gdb.fortran/array-indices.exp @@ -62,13 +62,13 @@ set r3p9 [string_to_regexp $a3p9] set rep5 "" set rep6 "" -proc array_repeat { variant } { +proc array_repeat_1 { variant } { global testfile srcfile - upvar n0 n0 n1 n1 n2 n2 n5 n5 - upvar r1p r1p r1p9 r1p9 r2po r2po r2p9o r2p9o r2p r2p r2p9 r2p9 - upvar r3po r3po r3p9o r3p9o r3p r3p r3p9 r3p9 - upvar a2po a2po a2p9o a2p9o a3po a3po a3p9o a3p9o - upvar rep5 rep5 rep6 rep6 + global n0 n0 n1 n1 n2 n2 n5 n5 + global r1p r1p r1p9 r1p9 r2po r2po r2p9o r2p9o r2p r2p r2p9 r2p9 + global r3po r3po r3p9o r3p9o r3p r3p r3p9 r3p9 + global a2po a2po a2p9o a2p9o a3po a3po a3p9o a3p9o + global rep5 rep5 rep6 rep6 standard_testfile "${variant}.f90" @@ -77,19 +77,18 @@ proc array_repeat { variant } { return -1 } - with_test_prefix "${variant}" { - gdb_test_no_output "set print array-indexes on" - } + gdb_test_no_output "set print array-indexes on" if {![fortran_runto_main]} { perror "Could not run to main." return } - gdb_breakpoint [gdb_get_line_number "Break here"] - gdb_continue_to_breakpoint "${variant}" + set line_marker "Break here" + gdb_breakpoint [gdb_get_line_number $line_marker] + gdb_continue_to_breakpoint $line_marker - with_test_prefix "${variant}: repeats=unlimited, elements=unlimited" { + with_test_prefix "repeats=unlimited, elements=unlimited" { # Check the arrays print as expected. gdb_test_no_output "set print repeats unlimited" gdb_test_no_output "set print elements unlimited" @@ -102,7 +101,7 @@ proc array_repeat { variant } { gdb_test "print array_3d9" "${r3p9}" } - with_test_prefix "${variant}: repeats=4, elements=unlimited" { + with_test_prefix "repeats=4, elements=unlimited" { # Now set the repeat limit. gdb_test_no_output "set print repeats 4" gdb_test_no_output "set print elements unlimited" @@ -126,7 +125,7 @@ proc array_repeat { variant } { $n5 = ($n0 = ($n0 = 9, ${rep6}) ${rep6}))"] } - with_test_prefix "${variant}: repeats=unlimited, elements=12" { + with_test_prefix "repeats=unlimited, elements=12" { # Now set the element limit. gdb_test_no_output "set print repeats unlimited" gdb_test_no_output "set print elements 12" @@ -147,7 +146,7 @@ proc array_repeat { variant } { ...)"] } - with_test_prefix "${variant}: repeats=4, elements=12" { + with_test_prefix "repeats=4, elements=12" { # Now set both limits. gdb_test_no_output "set print repeats 4" gdb_test_no_output "set print elements 12" @@ -173,7 +172,7 @@ proc array_repeat { variant } { ...) ...)"] } - with_test_prefix "${variant}: repeats=4, elements=30" { + with_test_prefix "repeats=4, elements=30" { # Now set both limits. gdb_test_no_output "set print repeats 4" gdb_test_no_output "set print elements 30" @@ -196,5 +195,11 @@ proc array_repeat { variant } { } } +proc array_repeat { variant } { + with_test_prefix $variant { + array_repeat_1 $variant + } +} + array_repeat "array-repeat" array_repeat "array-slices-repeat" diff --git a/gdb/testsuite/gdb.fortran/array-repeat.exp b/gdb/testsuite/gdb.fortran/array-repeat.exp index 34ea8fc19f5..1a7c013cc16 100644 --- a/gdb/testsuite/gdb.fortran/array-repeat.exp +++ b/gdb/testsuite/gdb.fortran/array-repeat.exp @@ -50,12 +50,12 @@ set r3p9 [string_to_regexp $a3p9] set rep5 "" set rep6 "" -proc array_repeat { variant } { +proc array_repeat_1 { variant } { global testfile srcfile binfile - upvar r1p r1p r1p9 r1p9 r2po r2po r2p9o r2p9o r2p r2p r2p9 r2p9 - upvar r3po r3po r3p9o r3p9o r3p r3p r3p9 r3p9 - upvar a2po a2po a2p9o a2p9o a3po a3po a3p9o a3p9o - upvar rep5 rep5 rep6 rep6 + global r1p r1p r1p9 r1p9 r2po r2po r2p9o r2p9o r2p r2p r2p9 r2p9 + global r3po r3po r3p9o r3p9o r3p r3p r3p9 r3p9 + global a2po a2po a2p9o a2p9o a3po a3po a3p9o a3p9o + global rep5 rep5 rep6 rep6 standard_testfile "${variant}.f90" @@ -69,10 +69,11 @@ proc array_repeat { variant } { return } - gdb_breakpoint [gdb_get_line_number "Break here"] - gdb_continue_to_breakpoint "${variant}" + set line_marker "Break here" + gdb_breakpoint [gdb_get_line_number $line_marker] + gdb_continue_to_breakpoint $line_marker - with_test_prefix "${variant}: repeats=unlimited, elements=unlimited" { + with_test_prefix "repeats=unlimited, elements=unlimited" { # Check the arrays print as expected. gdb_test_no_output "set print repeats unlimited" gdb_test_no_output "set print elements unlimited" @@ -85,7 +86,7 @@ proc array_repeat { variant } { gdb_test "print array_3d9" "${r3p9}" } - with_test_prefix "${variant}: repeats=4, elements=unlimited" { + with_test_prefix "repeats=4, elements=unlimited" { # Now set the repeat limit. gdb_test_no_output "set print repeats 4" gdb_test_no_output "set print elements unlimited" @@ -105,7 +106,7 @@ proc array_repeat { variant } { ((9, ${rep6}) ${rep6}))"] } - with_test_prefix "${variant}: repeats=unlimited, elements=12" { + with_test_prefix "repeats=unlimited, elements=12" { # Now set the element limit. gdb_test_no_output "set print repeats unlimited" gdb_test_no_output "set print elements 12" @@ -122,7 +123,7 @@ proc array_repeat { variant } { [string_to_regexp "((${a3p9o} ${a3p9o} ...) ...)"] } - with_test_prefix "${variant}: repeats=4, elements=12" { + with_test_prefix "repeats=4, elements=12" { # Now set both limits. gdb_test_no_output "set print repeats 4" gdb_test_no_output "set print elements 12" @@ -142,7 +143,7 @@ proc array_repeat { variant } { [string_to_regexp "(((3, ${rep5}, 9) (3, ${rep5}, 9) ...) ...)"] } - with_test_prefix "${variant}: repeats=4, elements=30" { + with_test_prefix "repeats=4, elements=30" { # Now set both limits. gdb_test_no_output "set print repeats 4" gdb_test_no_output "set print elements 30" @@ -163,5 +164,11 @@ proc array_repeat { variant } { } } +proc array_repeat { variant } { + with_test_prefix $variant { + array_repeat_1 $variant + } +} + array_repeat "array-repeat" array_repeat "array-slices-repeat" base-commit: 9dc9a56ebc902df4b34cda404da3f3062e9af616 -- 2.35.3