From patchwork Sun Jul 31 19:21:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 654401 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3s2XR833rgz9sD5 for ; Mon, 1 Aug 2016 05:22:26 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=tcxWA+KM; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:references:mime-version:content-type :in-reply-to; q=dns; s=default; b=xPh+qFsfEHvd0fcJWXzCGWQ9Rn6SqW WafL0bCHtxIniTUs9VO0hql5HI8WQzkNJe9nAPqSE906G6AqsW/nvXl3XJx4GChv tRybrf2ASxE/7j4bj7DDdw19mPW/JLpbuLUU96CFCF0rdC2NckQqp5ZPOmkwsQ7u Ok51+3ORLba2Y= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:references:mime-version:content-type :in-reply-to; s=default; bh=+7znw2FXwMTk3G8kVXepG08QQvc=; b=tcxW A+KMmMWn9lkK/K6TJNai3gSvRxpO5olCoPILcCv8TBZ3EyTK2VC3JszyrCqQ7hTE o7xE0vblUZG+00h1S6P2Lm6hr8yS8ksvWsJtNsVMkNOBWiPY8UDQoXjhvntcJpHi JqlPkEH/7kZlHziKXhBxi/6ImHxOcreqmlILWiM= Received: (qmail 85686 invoked by alias); 31 Jul 2016 19:22:12 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 85668 invoked by uid 89); 31 Jul 2016 19:22:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Sun, 31 Jul 2016 19:22:01 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DD1D061E4B; Sun, 31 Jul 2016 19:21:59 +0000 (UTC) Received: from localhost (ovpn-116-24.ams2.redhat.com [10.36.116.24]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6VJLwcL001286; Sun, 31 Jul 2016 15:21:59 -0400 Date: Sun, 31 Jul 2016 20:21:58 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: Re: [patch] Some testsuite cleanup Message-ID: <20160731192158.GT4264@redhat.com> References: <20160728210635.GD4264@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20160728210635.GD4264@redhat.com> X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.6.2 (2016-07-01) On 28/07/16 22:06 +0100, Jonathan Wakely wrote: >The dg-prune-output directives in these tests are needed to prune some >additional errors that are only issued in C++98 mode, but the line >numbers had got out of date. I've replaced the hardcoded numbers with >strings that will stay valid. > > Fix DR 438 container tests to pass in C++98 mode > * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: > Adjust dg-prune-output pattern for error in C++98 mode. > * testsuite/23_containers/deque/requirements/dr438/ > constructor_1_neg.cc: Likewise. > * testsuite/23_containers/deque/requirements/dr438/ > constructor_2_neg.cc: Likewise. > * testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: > Likewise. > * testsuite/23_containers/list/requirements/dr438/assign_neg.cc: > Likewise. > * testsuite/23_containers/list/requirements/dr438/ > constructor_1_neg.cc: Likewise. > * testsuite/23_containers/list/requirements/dr438/insert_neg.cc: > Likewise. > * testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: > Likewise. > * testsuite/23_containers/vector/requirements/dr438/ > constructor_1_neg.cc: Likewise. > * testsuite/23_containers/vector/requirements/dr438/ > constructor_2_neg.cc: Likewise. > * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: > Likewise. I missed one test in the change above. For that test the extra error in C++98 mode comes from location 1698:29 which doesn't match the 1682 lineno in the test, but instead matches the dg-error on line 29 of the file. That means it fails if it's run with --target_board=unix/-fno-show-column/-std=gnu++98 (I'm getting really annoyed with line numbers matching columns!) Tested x86_64-linux, committed to trunk. commit c9949d54ba1ff875802947e7e7bba63a9a2e1164 Author: Jonathan Wakely Date: Sun Jul 31 19:58:46 2016 +0100 Fix DR 438 std::list test to pass in C++98 mode * testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Adjust dg-prune-output pattern for error in C++98 mode. diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc index 313c54a..769d615 100644 --- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc @@ -18,7 +18,7 @@ // . // { dg-do compile } -// { dg-prune-output 1682 } +// { dg-prune-output "no matching function .*_M_fill_initialize" } #include #include