From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10245 invoked by alias); 17 Jul 2014 16:08:57 -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 10186 invoked by uid 89); 17 Jul 2014 16:08:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-we0-f172.google.com Received: from mail-we0-f172.google.com (HELO mail-we0-f172.google.com) (74.125.82.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Thu, 17 Jul 2014 16:08:54 +0000 Received: by mail-we0-f172.google.com with SMTP id x48so3259954wes.17 for ; Thu, 17 Jul 2014 09:08:50 -0700 (PDT) X-Received: by 10.180.89.34 with SMTP id bl2mr22956232wib.41.1405613330843; Thu, 17 Jul 2014 09:08:50 -0700 (PDT) Received: from [46.74.25.193] (046074025193.atmpu0001.highway.a1.net. [46.74.25.193]) by mx.google.com with ESMTPSA id 20sm7099923wjt.42.2014.07.17.09.08.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Jul 2014 09:08:50 -0700 (PDT) From: "Bernhard Reutner-Fischer" To: Ulrich Weigand , CC: Mike Stump Date: Thu, 17 Jul 2014 16:14:00 -0000 Message-ID: <14745151b88.2763.0f39ed3bcad52ef2c88c90062b7714dc@gmail.com> In-Reply-To: <201407170050.s6H0ouIa030202@d06av02.portsmouth.uk.ibm.com> References: <201407170050.s6H0ouIa030202@d06av02.portsmouth.uk.ibm.com> User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 AquaMail/1.4.0.30 (build: 2100451) Subject: Re: [PATCH, testsuite] Reliably prune GCC notes in C++ compat suite MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; format=flowed Content-Transfer-Encoding: 8bit X-IsSubscribed: yes X-SW-Source: 2014-07/txt/msg01232.txt.bz2 On 17 July 2014 02:51:14 "Ulrich Weigand" wrote: > 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)? Mike, On a related note: https://gcc.gnu.org/ml/fortran/2012-03/msg00094.html The libdirs was applied to dejagnu some time ago, so once we can require that version (anytime now) we could apply the patch referenced above. Also see BUG: in the URL above for another missing load_lib. Thanks, > > 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 > Sent with AquaMail for Android http://www.aqua-mail.com