From: Richard Sandiford Date: Wed, 29 Apr 2020 09:40:30 +0000 (+0100) Subject: testsuite: Save dg-do-what-default in mve.exp X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b5620fadc53be38da9f4b8107348759afb2c29df;p=gcc.git testsuite: Save dg-do-what-default in mve.exp mve.exp changed the default dg-do action to "assemble", but then left it like that for later exp files. This meant that in a two-multilib test run, the first arm.exp run would have a default of "dg-do compile" and the second would have a default of "dg-do assemble". 2020-04-29 Richard Sandiford gcc/testsuite/ * g++.target/arm/mve.exp: Restore the original dg-do-what-default before finishing. --- diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a8b69a15ccb..c304ddcf2c7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-04-29 Richard Sandiford + + * g++.target/arm/mve.exp: Restore the original dg-do-what-default + before finishing. + 2020-04-29 Jakub Jelinek PR target/94707 diff --git a/gcc/testsuite/g++.target/arm/mve.exp b/gcc/testsuite/g++.target/arm/mve.exp index 08f8d4d87f6..e5b4b65eb57 100644 --- a/gcc/testsuite/g++.target/arm/mve.exp +++ b/gcc/testsuite/g++.target/arm/mve.exp @@ -35,6 +35,7 @@ global dg_runtest_extra_prunes set dg_runtest_extra_prunes "" lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch" +set save-dg-do-what-default ${dg-do-what-default} set dg-do-what-default "assemble" # Initialize `dg'. @@ -45,5 +46,6 @@ dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/../../gcc.target/arm/mve/int "" $DEFAULT_CXXFLAGS # All done. +set dg-do-what-default ${save-dg-do-what-default} set dg_runtest_extra_prunes "" dg-finish