Re: [PATCH][testsuite] Fix TORTURE_OPTIONS overriding

[Richard Biener <rguenther@suse.de>]

On Tue, 23 Jun 2015, James Greenhalgh wrote:

> 
> On Thu, Jun 18, 2015 at 11:10:01AM +0100, Richard Biener wrote:
> >
> > Currently when doing
> >
> > make check-gcc RUNTESTFLAGS="TORTURE_OPTIONS=\\\"{ -O3 } { -O2 }\\\"
> > dg-torture.exp"
> >
> > you get -O3 and -O2 but also the two LTO torture option combinations.
> > That's undesired (those are the most expensive anyway).  The following
> > patch avoids this by setting LTO_TORTURE_OPTIONS only when
> > TORTURE_OPTIONS isn't specified.
> >
> > Tested with and without TORTURE_OPTIONS for C and fortran tortures.
> >
> > Seems the instruction in c-torture.exp how to override TORTURE_OPTIONS
> > is off, RUNTESTFLAGS="TORTURE_OPTIONS=\\\"{ { -O3 } { -O2 } }\\\"
> > certainly doesn't do what it should.
> 
> This patch causes issues for ARM and AArch64 cross multilib
> testing. There are two issues, one is that we now clobber
> gcc_force_conventional_output after setting it in the conditional this patch
> moved (hits all targets, see the new x86-64 failures like pr61848.c).
> 
> The other is that we no longer protect environment settings before calling
> check_effective_target_lto, which results in our cross --specs files no
> longer being on the path.
> 
> I've fixed these issues by rearranging the file again, but I'm not
> sure if what I've done is sensible and does not cause other issues. This
> seems to bring back the tests I'd lost overnight, and doesn't cause
> issues elsewhere.
> 
> I've run some cross-tests to ensure this brings back the missing tests,
> and a full x86-64 testrun to make sure I haven't dropped any from there.
> 
> OK for trunk?

Ok.

Thanks,
Richard.

> Thanks,
> James
> 
> ---
> 2015-06-23  James Greenhalgh  <james.greenhalgh@arm.com>
> 
>         * lib/c-torture.exp: Don't call check_effective_target_lto
> 	before setting up environment correctly.
>         * lib/gcc-dg.exp: Likewise, and protect
> 	gcc_force_conventional_output.
> 
> 

-- 
Richard Biener <rguenther@suse.de>
SUSE LINUX GmbH, GF: Felix Imendoerffer, Jane Smithard, Dilip Upmanyu, Graham Norton, HRB 21284 (AG Nuernberg)