From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id OgzAD9rmUWC5ewAAWB0awg (envelope-from ) for ; Wed, 17 Mar 2021 07:24:10 -0400 Received: by simark.ca (Postfix, from userid 112) id 2AA1A1EF78; Wed, 17 Mar 2021 07:24:10 -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.4 required=5.0 tests=DKIM_SIGNED,MAILING_LIST_MULTI, RDNS_NONE,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [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 4676E1EF64 for ; Wed, 17 Mar 2021 07:24:09 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 13220384B13C; Wed, 17 Mar 2021 11:24:09 +0000 (GMT) Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id 95E38385781A for ; Wed, 17 Mar 2021 11:24:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 95E38385781A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wm1-x32c.google.com with SMTP id d191so1254542wmd.2 for ; Wed, 17 Mar 2021 04:24:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uXY5u3/PI2Cqc3RTm8TOd8c+/d1Or7OdgN2UJHWuvnw=; b=CgKVX2X+GC1Tjlfebyuqh61jZuzbBtG/kZ3buIrtXv04ECHYspgIAQmeQIbJNFMkcF UGCXiDJieFbNQUlBML0yOZXqeMBt6qY3E5jDNNWjXflhdm2Hh2dQ6rmpZaa2l7f39wSM jdKgUCAwWkNLki83bFZsgogcq8TFCSSZy2B9wP9poVcD84M9UgFRlsn2rxF8C9J8aanM FGjii/8hePbPnCnBjI0MJhpmQ0kI8M7AidI2bWXuaLQbvKlSUwpaiO2+ag7bWYyUHzuX 7RJoaV9XRooNeIJ6/Tj+c+rJIi1zXcQWgo136/CwmSCS4JbjJwkQGmSbOnY5bVlkNjgk PoRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uXY5u3/PI2Cqc3RTm8TOd8c+/d1Or7OdgN2UJHWuvnw=; b=gbPX6xzhHuq9cAvNllk4BxSIftUosPA6UISJW1s/7HP1W46EMMBRFmijtNqPYMs/qh DZLnA7vq9vcrEo8/rvjXkhdNYX+Zi68pZl/xtfLrQy5odoS7E7zvUH1o5VmDMhmfvcd3 gOomTPymTrvh33xMeANW3V4RDkfQbxPYClurUSqbLhiXIUdxsEG14EtHCvzeVoFjg0z7 wUP0U5UFiw2uIGHXStOLMpkY+Ij8F1QYwxkErDNzL81gMWsQUyrBC6RscJjxQ6yKUNii WDk2UR2GOc3TqCRM2vEjM6D0uWaOCfD5LwXhfLPI5gZ17h+3i9q0H4PHu22/LzII9EdY brng== X-Gm-Message-State: AOAM533ZQBR8Ws8OyX0seS8hdhnrmfZlLFsarM+ZmUV5b8H6xaqYcoGp yiT4l4iLjqPYEedYOFOXERtp+bOIbTJeYA== X-Google-Smtp-Source: ABdhPJwl4VUt4KIUFzEFmdrcDLhMEjSB2YWCTIg0xoRr8cF0nzgpQqw7rzknMLa3driHxfsBL4yPfQ== X-Received: by 2002:a05:600c:9:: with SMTP id g9mr3291484wmc.134.1615980245524; Wed, 17 Mar 2021 04:24:05 -0700 (PDT) Received: from localhost (host86-134-238-232.range86-134.btcentralplus.com. [86.134.238.232]) by smtp.gmail.com with ESMTPSA id h20sm2086389wmp.38.2021.03.17.04.24.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 04:24:05 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Subject: [PATCH 2/5] gdb/testsuite: remove duplicate test names from gdb.cp/gdb2384.exp Date: Wed, 17 Mar 2021 11:23:58 +0000 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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@sourceware.org Sender: "Gdb-patches" The test gdb.cp/gdb2384.exp contains some duplicate test names, and also some test names with a string inside parentheses at the end. In order to resolve the duplicates the obvious choice would be to add yet more strings inside parentheses at the end of names, however, this is discouraged in our test naming scheme. The string in parentheses originates from a comment in the test source code, which naturally leads to including this comment in the test name. In this commit I have changed the comment in the test source to remove the string in parentheses, I then rename the tests in the .exp script to match, making sure that all test names are unique. There should be no change in test coverage after this commit. gdb/testsuite/ChangeLog: * gdb.cp/gdb2384.cc (main): Change comments used for breakpoints. * gdb.cp/gdb2384.exp: Change and extend test names to avoid duplicates, and also to avoid having a string inside parentheses at the end of test names. --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/gdb.cp/gdb2384.cc | 4 ++-- gdb/testsuite/gdb.cp/gdb2384.exp | 20 ++++++++++---------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/gdb/testsuite/gdb.cp/gdb2384.cc b/gdb/testsuite/gdb.cp/gdb2384.cc index 7c734bd158a..07967b07a01 100644 --- a/gdb/testsuite/gdb.cp/gdb2384.cc +++ b/gdb/testsuite/gdb.cp/gdb2384.cc @@ -46,7 +46,7 @@ main () { derived1 d1 (42); derived2 d2 (24); - g = d1.meth (); // set breakpoint here - g = d2.meth (); // set breakpoint here (second) + g = d1.meth (); // First breakpoint + g = d2.meth (); // Second breakpoint return 0; } diff --git a/gdb/testsuite/gdb.cp/gdb2384.exp b/gdb/testsuite/gdb.cp/gdb2384.exp index 69f9709f7a4..db032065186 100644 --- a/gdb/testsuite/gdb.cp/gdb2384.exp +++ b/gdb/testsuite/gdb.cp/gdb2384.exp @@ -49,8 +49,8 @@ if ![runto_main] then { return -1 } -gdb_breakpoint [gdb_get_line_number "set breakpoint here"] -gdb_continue_to_breakpoint "set breakpoint here" +gdb_breakpoint [gdb_get_line_number "First breakpoint"] +gdb_continue_to_breakpoint "run to 'First breakpoint', first time" gdb_test "print d1.meth ()" \ ".*42.*" @@ -58,25 +58,25 @@ gdb_test "print d1.meth ()" \ # Now try again. gdb's without the fix will hopefully segv here runto_main -gdb_breakpoint [gdb_get_line_number "set breakpoint here"] -gdb_continue_to_breakpoint "set breakpoint here" +gdb_breakpoint [gdb_get_line_number "First breakpoint"] +gdb_continue_to_breakpoint "run to 'First breakpoint', second time" gdb_test "print d1.meth ()" \ ".*42.*" \ - "gdb2384" + "gdb2384 at 'First breakpoint'" # second case runto_main -gdb_breakpoint [gdb_get_line_number "set breakpoint here (second)"] -gdb_continue_to_breakpoint "set breakpoint here (second)" +gdb_breakpoint [gdb_get_line_number "Second breakpoint"] +gdb_continue_to_breakpoint "run to 'Second breakpoint', first time" gdb_test "print d2.meth ()" \ ".*24.*" \ "print d2.meth()" runto_main -gdb_breakpoint [gdb_get_line_number "set breakpoint here (second)"] -gdb_continue_to_breakpoint "set breakpoint here (second)" +gdb_breakpoint [gdb_get_line_number "Second breakpoint"] +gdb_continue_to_breakpoint "run to 'Second breakpoint', second time" gdb_test "print d2.meth ()" \ ".*24.*" \ - "gdb2384 (second)" + "gdb2384 at 'Second breakpoint'" -- 2.25.4