aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Sandiford <richard.sandiford@arm.com>2020-04-29 10:40:30 +0100
committerRichard Sandiford <richard.sandiford@arm.com>2020-04-29 10:40:30 +0100
commitb5620fadc53be38da9f4b8107348759afb2c29df (patch)
tree4888daf36d8160e4c8409dedf9c90895bbaeaa6a
parent5916f2f6735bf739a66fbebffba50bd975c22ecb (diff)
downloadgcc-b5620fadc53be38da9f4b8107348759afb2c29df.zip
gcc-b5620fadc53be38da9f4b8107348759afb2c29df.tar.gz
gcc-b5620fadc53be38da9f4b8107348759afb2c29df.tar.bz2
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 <richard.sandiford@arm.com> gcc/testsuite/ * g++.target/arm/mve.exp: Restore the original dg-do-what-default before finishing.
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.target/arm/mve.exp2
2 files changed, 7 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a8b69a1..c304ddc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-04-29 Richard Sandiford <richard.sandiford@arm.com>
+
+ * g++.target/arm/mve.exp: Restore the original dg-do-what-default
+ before finishing.
+
2020-04-29 Jakub Jelinek <jakub@redhat.com>
PR target/94707
diff --git a/gcc/testsuite/g++.target/arm/mve.exp b/gcc/testsuite/g++.target/arm/mve.exp
index 08f8d4d..e5b4b65 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