From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24358 invoked by alias); 17 Jul 2014 00:51:07 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 24334 invoked by uid 89); 17 Jul 2014 00:51:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 X-HELO: e06smtp15.uk.ibm.com Received: from e06smtp15.uk.ibm.com (HELO e06smtp15.uk.ibm.com) (195.75.94.111) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Thu, 17 Jul 2014 00:51:04 +0000 Received: from /spool/local by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 17 Jul 2014 01:51:00 +0100 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 17 Jul 2014 01:50:58 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 88EF21B08040 for ; Thu, 17 Jul 2014 01:51:38 +0100 (BST) Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by b06cxnps4076.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s6H0ov8g30277634 for ; Thu, 17 Jul 2014 00:50:57 GMT Received: from d06av02.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s6H0ovRA030209 for ; Wed, 16 Jul 2014 18:50:57 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with SMTP id s6H0ouIa030202 for ; Wed, 16 Jul 2014 18:50:56 -0600 Message-Id: <201407170050.s6H0ouIa030202@d06av02.portsmouth.uk.ibm.com> Received: by tuxmaker.boeblingen.de.ibm.com (sSMTP sendmail emulation); Thu, 17 Jul 2014 02:50:56 +0200 Subject: [PATCH, testsuite] Reliably prune GCC notes in C++ compat suite To: gcc-patches@gcc.gnu.org Date: Thu, 17 Jul 2014 02:25:00 -0000 From: "Ulrich Weigand" MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14071700-0342-0000-0000-00000077F1B3 X-SW-Source: 2014-07/txt/msg01179.txt.bz2 Hello, in testing the rs6000 ABI patches I noted a weird effect: usually, the -Wpsabi warning notes are ignored in the compat test suites, so we get a clean test run anyway. However, when running the C++ version of the struct-layout-1.exp case *alone* (using RUNTESTFLAGS=struct-layout-1.exp), suddenly tests are failing because of those extra notes. This does *not* happen with the C version of that suite ... It turns out that that pruning those notes is supposed to happen from within gcc-defs.exp:${tool}_check_compile: if { [info proc ${tool}-dg-prune] != "" } { global target_triplet set gcc_output [${tool}-dg-prune $target_triplet $gcc_output] } However, the g++-dg-prune routine is defined in g++-dg.exp, which is never included from g++.dg/compat/struct-layout-1.exp (directly or indirectly). Now, when running the full suite, that file would have been loaded by some earlier g++.dg .exp file, so everything works out. But when running struct-layout-1.exp stand-alone, the g++-dg-prune routine is never defined and thus silently no pruning takes place. To fix this, the following patch simply loads g++-dg.exp directly from g++.dg/compat/struct-layout-1.exp. Tested on powerpc64-linux and powerpc64le-linux. OK for mainline (and 4.8/4.9 once the rs6000 ABI patches are backported there)? Bye, Ulrich gcc/testsuite/ChangeLog: * g++.dg/compat/struct-layout-1.exp: Load g++-dg.exp Index: gcc-4_9-branch/gcc/testsuite/g++.dg/compat/struct-layout-1.exp =================================================================== --- gcc-4_9-branch.orig/gcc/testsuite/g++.dg/compat/struct-layout-1.exp +++ gcc-4_9-branch/gcc/testsuite/g++.dg/compat/struct-layout-1.exp @@ -89,6 +89,9 @@ proc compat-use-tst-compiler { } { # This must be done after the compat-use-*-compiler definitions. load_lib compat.exp +# Provide the g++-dg-prune routine (gcc-dp.exp is loaded by compat.exp) +load_lib g++-dg.exp + g++_init # Save variables for the C++ compiler under test, which each test will -- Dr. Ulrich Weigand GNU/Linux compilers and toolchain Ulrich.Weigand@de.ibm.com