From patchwork Mon Nov 30 16:00:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Law X-Patchwork-Id: 1408384 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=RJy0UwXe; dkim-atps=neutral Received: from sourceware.org (server2.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 (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cl94b0GTlz9sRK for ; Tue, 1 Dec 2020 03:03:11 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E24283892008; Mon, 30 Nov 2020 16:03:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E24283892008 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1606752188; bh=DBkgZrU5YwBCvoKNqkhNw2lW03v1VLewKCYPbXrM3OQ=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=RJy0UwXetGZn1NgCTEM3w7pHQ6BV/504hdy8aY1ZVHM4HlbQqqPQV62Bpoa2Sw/NV apTNPOqrFY/1gOANJIgHnzTSmC69/d6chfIydIz2dzOp1LbkvlIdP39dyWlu5Q73ML jvD3aGGFZ43A6ozVSFm4Klpesm5pj5zhuhO/nAzY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id E96E8385802D for ; Mon, 30 Nov 2020 16:03:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E96E8385802D Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-211-X-igYO7DO7KiuZnWKrfM0A-1; Mon, 30 Nov 2020 11:02:43 -0500 X-MC-Unique: X-igYO7DO7KiuZnWKrfM0A-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8CCF482D395 for ; Mon, 30 Nov 2020 16:01:00 +0000 (UTC) Received: from localhost.localdomain (ovpn-112-145.phx2.redhat.com [10.3.112.145]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BE115D6A8 for ; Mon, 30 Nov 2020 16:00:59 +0000 (UTC) To: GCC Patches Subject: [committed] Fix non-unique testnames Message-ID: <265aef58-69d6-bfb9-c6b0-61c9d89b45b6@redhat.com> Date: Mon, 30 Nov 2020 09:00:59 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jeff Law via Gcc-patches From: Jeff Law Reply-To: Jeff Law Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" This patch fixes a handful of tests with non-unique names which confuse the living hell out of compare_tests, particularly if one of two tests [x]fail while the other is [x]pass which compare_tests will flag as a regression each and every run. No doubt there's a lot more of these lying around and I'm going to be watching for this much more closely going forward. Committing to the trunk, Jeff commit e40fece7c9b3731f4cff060f712c132ff100cab4 Author: Jeff Law Date: Mon Nov 30 08:59:23 2020 -0700 Fix non-unique testnames gcc/testsuite * g++.dg/warn/Wnonnull5.C: Fix non-unique testnames. * g++.dg/warn/Wplacement-new-size-8.C: Likewise. diff --git a/gcc/testsuite/g++.dg/warn/Wnonnull5.C b/gcc/testsuite/g++.dg/warn/Wnonnull5.C index 8b25d2d9f86..78862d48993 100644 --- a/gcc/testsuite/g++.dg/warn/Wnonnull5.C +++ b/gcc/testsuite/g++.dg/warn/Wnonnull5.C @@ -36,7 +36,7 @@ struct S void warn_nullptr_this () { ((S*)nullptr)->f0 (""); // { dg-warning "3:'this' pointer null" "pr86568" { xfail *-*-* } } - // { dg-warning "this' pointer null" "pr86568" { target *-*-* } .-1 } + // { dg-warning "this' pointer null" "pr86568 second variant" { target *-*-* } .-1 } } void warn_null_this_cst () @@ -49,15 +49,15 @@ void warn_null_this_var () { S* null = 0; null->f2 (&null); // { dg-warning "3:'this' pointer null" "pr86568" { xfail *-*-* } } - // { dg-warning "'this' pointer null" "pr86568" { target *-*-* } .-1 } + // { dg-warning "'this' pointer null" "pr86568 second variant" { target *-*-* } .-1 } } void warn_nullptr (S s) { s.f3 (nullptr, &s); // { dg-warning "9:argument 1 null where non-null expected" "pr86568" { xfail *-*-* } } - // { dg-warning "argument 1 null where non-null expected" "pr86568" { target *-*-* } .-1 } + // { dg-warning "argument 1 null where non-null expected" "pr86568 second variant" { target *-*-* } .-1 } s.f3 (&s, nullptr); // { dg-warning "13:argument 2 null where non-null expected" "pr86568" { xfail *-*-* } } - // { dg-warning "argument 2 null where non-null expected" "pr86568" { target *-*-* } .-1 } + // { dg-warning "argument 2 null where non-null expected" "pr86568 second variant" { target *-*-* } .-1 } } @@ -72,9 +72,9 @@ void warn_null_var (S s) { void* null = 0; s.f5 (null, &s); // { dg-warning "9:argument 1 null where non-null expected" "pr86568" { xfail *-*-* } } - // { dg-warning "argument 1 null where non-null expected" "pr86568" { target *-*-* } .-1 } + // { dg-warning "argument 1 null where non-null expected" "pr86568 second variant" { target *-*-* } .-1 } s.f5 (&s, null); // { dg-warning "16:argument 2 null where non-null expected" "pr86568" { xfail *-*-* } } - // { dg-warning "argument 2 null where non-null expected" "pr86568" { target *-*-* } .-1 } + // { dg-warning "argument 2 null where non-null expected" "pr86568 second variant" { target *-*-* } .-1 } } void warn_null_cond (S s, void *null) @@ -83,9 +83,9 @@ void warn_null_cond (S s, void *null) return; s.f6 (null, &s); // { dg-warning "9:argument 1 null where non-null expected" "pr86568" { xfail *-*-* } } - // { dg-warning "argument 1 null where non-null expected" "pr86568" { target *-*-* } .-1 } + // { dg-warning "argument 1 null where non-null expected" "pr86568 second variant" { target *-*-* } .-1 } s.f6 (&s, null); // { dg-warning "13:argument 2 null where non-null expected" "pr86568" { xfail *-*-* } } - // { dg-warning "argument 2 null where non-null expected" "pr86568" { target *-*-* } .-1 } + // { dg-warning "argument 2 null where non-null expected" "pr86568 second variant" { target *-*-* } .-1 } } diff --git a/gcc/testsuite/g++.dg/warn/Wplacement-new-size-8.C b/gcc/testsuite/g++.dg/warn/Wplacement-new-size-8.C index 77bd3314a19..12cd4cda89d 100644 --- a/gcc/testsuite/g++.dg/warn/Wplacement-new-size-8.C +++ b/gcc/testsuite/g++.dg/warn/Wplacement-new-size-8.C @@ -43,7 +43,7 @@ void test_cst_off () /* Offsets are treated as signed so SIZE_MAX is indistinguishable from -1. */ char ca1[1]; // { dg-message "at offset \\d+ from 'ca1' declared here" "note" { xfail *-*-* } } - // { dg-message "at offset -1 from 'ca1' declared here" "note" { target *-*-* } .-1 } + // { dg-message "at offset -1 from 'ca1' declared here" "note second variant" { target *-*-* } .-1 } new (ca1 + SIZE_MAX) S<1>; // { dg-warning "constructing an object of type 'S<1>' and size '1' in a region of type 'char \\\[1]' and size '0'" } } }