From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id OHaYHYZm1GD3GAAAWB0awg (envelope-from ) for ; Thu, 24 Jun 2021 07:03:34 -0400 Received: by simark.ca (Postfix, from userid 112) id 73A5F1F1F2; Thu, 24 Jun 2021 07:03:34 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id A7F471E939 for ; Thu, 24 Jun 2021 07:03:33 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4B1493AA9920 for ; Thu, 24 Jun 2021 11:03:33 +0000 (GMT) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id AEDF43AA9912 for ; Thu, 24 Jun 2021 11:03:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AEDF43AA9912 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap.suse.de (imap-alt.suse-dmz.suse.de [192.168.254.47]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id BB34321910 for ; Thu, 24 Jun 2021 11:03:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1624532600; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=2ryMuXE6jyUcgJCEsGca534VIL6GjspjroWBZNDaubg=; b=JH6LLVIWO9CHVH+Cj7qJfIBREyJJtqciTH0kseEoXp6gKtPjLI1oQ/WI0W4+vAvI9RJhZa PZk8kKeRqrYF/6ySDMAhOaf8LlYaHcV6KddwDizBBj3lRYnjW3O7p1MaYg4JDhvKT3EECU j+nf3JMQ21+8vYovf57uODq3zq1TYlA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1624532600; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=2ryMuXE6jyUcgJCEsGca534VIL6GjspjroWBZNDaubg=; b=6TO3zYKXmP1L8WB+bf2Tc8InrBBQYTdb/ja0vt1AkBwBKfLRnMfR5WfQVQgzcEBURWANcA t46M41Dugh3+WzBA== Received: from imap3-int (imap-alt.suse-dmz.suse.de [192.168.254.47]) by imap.suse.de (Postfix) with ESMTP id 9FE8C11A97 for ; Thu, 24 Jun 2021 11:03:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1624532600; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=2ryMuXE6jyUcgJCEsGca534VIL6GjspjroWBZNDaubg=; b=JH6LLVIWO9CHVH+Cj7qJfIBREyJJtqciTH0kseEoXp6gKtPjLI1oQ/WI0W4+vAvI9RJhZa PZk8kKeRqrYF/6ySDMAhOaf8LlYaHcV6KddwDizBBj3lRYnjW3O7p1MaYg4JDhvKT3EECU j+nf3JMQ21+8vYovf57uODq3zq1TYlA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1624532600; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=2ryMuXE6jyUcgJCEsGca534VIL6GjspjroWBZNDaubg=; b=6TO3zYKXmP1L8WB+bf2Tc8InrBBQYTdb/ja0vt1AkBwBKfLRnMfR5WfQVQgzcEBURWANcA t46M41Dugh3+WzBA== Received: from director2.suse.de ([192.168.254.72]) by imap3-int with ESMTPSA id dzMIJnhm1GDbdQAALh3uQQ (envelope-from ) for ; Thu, 24 Jun 2021 11:03:20 +0000 Date: Thu, 24 Jun 2021 13:03:19 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix duplicate in gdb.base/info-macros.exp Message-ID: <20210624110318.GA22285@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) 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: , Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Hi, When running test-case gdb.base/info-macros.exp, I run into: ... PASS: gdb.base/info-macros.exp: info macro -- PASS: gdb.base/info-macros.exp: info macro -- DUPLICATE: gdb.base/info-macros.exp: info macro -- PASS: gdb.base/info-macros.exp: info macro -- ... These messages come from gdb_test calls using the following commands: - "info macro --" - "info macro -- " - "info macro -- ". Apparantly the test names get stripped of trailing whitespace, and the first two end up identical. Fix this by explicitly specifying an after the trailing whitespace in the test name, such that we have: ... PASS: gdb.base/info-macros.exp: info macro -- PASS: gdb.base/info-macros.exp: info macro -- PASS: gdb.base/info-macros.exp: info macro -- ... Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix duplicate in gdb.base/info-macros.exp gdb/testsuite/ChangeLog: 2021-06-24 Tom de Vries * gdb.base/info-macros.exp: Add after trailing whitespace in test names. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/info-macros.exp | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 73035a906da..d12aba9f8ac 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2021-06-24 Tom de Vries + + * gdb.base/info-macros.exp: Add after trailing whitespace in + test names. + 2021-06-24 Tom de Vries * gdb.base/argv0-symlink.exp: Use with_test_prefix. diff --git a/gdb/testsuite/gdb.base/info-macros.exp b/gdb/testsuite/gdb.base/info-macros.exp index 44b0b45988d..19f16814374 100644 --- a/gdb/testsuite/gdb.base/info-macros.exp +++ b/gdb/testsuite/gdb.base/info-macros.exp @@ -61,9 +61,11 @@ gdb_test "info macro --" \ "You must follow.*with the name.*you want to see.*\[^\r\n\]*\[\r\n\]" gdb_test "info macro -- " \ - "You must follow.*with the name.*you want to see.*\[^\r\n\]*\[\r\n\]" + "You must follow.*with the name.*you want to see.*\[^\r\n\]*\[\r\n\]" \ + "info macro -- " gdb_test "info macro -- " \ - "You must follow.*with the name.*you want to see.*\[^\r\n\]*\[\r\n\]" + "You must follow.*with the name.*you want to see.*\[^\r\n\]*\[\r\n\]" \ + "info macro -- " gdb_test "info macro -invalid-option" \ "Unrecognized option.*Try \"help info macro\"\."