Clean up tests where a later dg-do completely overrides another.

The attached patch cleans up some (mostly unnecessary) dg-do
directives in the gcc.dg and gcc.target test cases.

gcc/testsuite/ChangeLog:

2016-04-29  Dominik Vogt  <vogt@linux.vnet.ibm.com>

	* gcc/testsuite/gcc.dg/cpp/mac-dir-2.c: Remove pointless duplicate
	dg-do.
	* gcc/testsuite/gcc.dg/pr27003.c: Likewise.
	* gcc/testsuite/gcc.dg/tree-ssa/cswtch.c: Likewise.
	* gcc/testsuite/gcc.dg/tree-ssa/predcom-2.c: Likewise.
	* gcc/testsuite/gcc.dg/tree-ssa/predcom-4.c: Likewise.
	* gcc/testsuite/gcc.dg/tree-ssa/predcom-5.c: Likewise.
	* gcc.target/arc/mxy.c: Likewise.
	* gcc.target/arc/mswape.c: Likewise.
	* gcc.target/arc/mrtsc.c: Likewise.
	* gcc.target/arc/mcrc.c: Likewise.
	* gcc.target/arc/mdsp-packa.c: Likewise.
	* gcc.target/arc/mdvbf.c: Likewise.
	* gcc.target/arc/mlock.c: Likewise.
	* gcc.target/arc/mmac-24.c: Likewise.
	* gcc.dg/spec-options.c: Switch order of the two "dg-do run".

From-SVN: r235628

14 files changed, 20 insertions, 14 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e6850db..020b08e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,22 @@
+2016-04-29  Dominik Vogt  <vogt@linux.vnet.ibm.com>
+
+	* gcc/testsuite/gcc.dg/cpp/mac-dir-2.c: Remove pointless duplicate
+	dg-do.
+	* gcc/testsuite/gcc.dg/pr27003.c: Likewise.
+	* gcc/testsuite/gcc.dg/tree-ssa/cswtch.c: Likewise.
+	* gcc/testsuite/gcc.dg/tree-ssa/predcom-2.c: Likewise.
+	* gcc/testsuite/gcc.dg/tree-ssa/predcom-4.c: Likewise.
+	* gcc/testsuite/gcc.dg/tree-ssa/predcom-5.c: Likewise.
+	* gcc.target/arc/mxy.c: Likewise.
+	* gcc.target/arc/mswape.c: Likewise.
+	* gcc.target/arc/mrtsc.c: Likewise.
+	* gcc.target/arc/mcrc.c: Likewise.
+	* gcc.target/arc/mdsp-packa.c: Likewise.
+	* gcc.target/arc/mdvbf.c: Likewise.
+	* gcc.target/arc/mlock.c: Likewise.
+	* gcc.target/arc/mmac-24.c: Likewise.
+	* gcc.dg/spec-options.c: Switch order of the two "dg-do run".
+
 2016-04-29  Sebastian Huber  <sebastian.huber@embedded-brains.de>
 	    Matthijs Kooijman  <matthijs@stdin.nl>
 	    Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>
diff --git a/gcc/testsuite/gcc.dg/cpp/mac-dir-2.c b/gcc/testsuite/gcc.dg/cpp/mac-dir-2.c
index b31ab3b..4c45d14 100644
--- a/gcc/testsuite/gcc.dg/cpp/mac-dir-2.c
+++ b/gcc/testsuite/gcc.dg/cpp/mac-dir-2.c
@@ -1,7 +1,5 @@
 /* Copyright (C) 2002 Free Software Foundation, Inc.  */
 
-/* { dg-do preprocess } */
-
 /* Source: Neil Booth, 26 Feb 2002.
 
    Test that we allow directives in macro arguments.  */
diff --git a/gcc/testsuite/gcc.dg/pr27003.c b/gcc/testsuite/gcc.dg/pr27003.c
index 5e416f4..7d886a0 100644
--- a/gcc/testsuite/gcc.dg/pr27003.c
+++ b/gcc/testsuite/gcc.dg/pr27003.c
@@ -1,4 +1,3 @@
-/* { dg-do compile } */
 /* { dg-do run } */
 /* { dg-options "-Os" } */
 
diff --git a/gcc/testsuite/gcc.dg/spec-options.c b/gcc/testsuite/gcc.dg/spec-options.c
index 1f9d8c1..e3ab23a 100644
--- a/gcc/testsuite/gcc.dg/spec-options.c
+++ b/gcc/testsuite/gcc.dg/spec-options.c
@@ -1,8 +1,8 @@
 /* Check that -mfoo is accepted if defined in a user spec
    and that it is not passed on the command line.  */
 /* Must be processed in EXTRA_SPECS to run.  */
-/* { dg-do run { target sh*-*-* } } */
 /* { dg-do compile } */
+/* { dg-do run { target sh*-*-* } } */
 /* { dg-options "-B${srcdir}/gcc.dg --specs=foo.specs -tfoo" } */
 
 extern void abort(void);
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/cswtch.c b/gcc/testsuite/gcc.dg/tree-ssa/cswtch.c
index 80f92f7..5737a0e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/cswtch.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/cswtch.c
@@ -1,4 +1,3 @@
-/* { dg-do compile } */
 /* { dg-options "-O2 -fdump-tree-switchconv" } */
 /* { dg-do run } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/predcom-2.c b/gcc/testsuite/gcc.dg/tree-ssa/predcom-2.c
index 7253921..0d92f8e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/predcom-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/predcom-2.c
@@ -1,4 +1,3 @@
-/* { dg-do compile } */
 /* { dg-do run } */
 /* { dg-options "-O2 -funroll-loops --param max-unroll-times=8 -fpredictive-commoning -fdump-tree-pcom-details" } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/predcom-4.c b/gcc/testsuite/gcc.dg/tree-ssa/predcom-4.c
index 3244c1d..382a464 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/predcom-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/predcom-4.c
@@ -1,4 +1,3 @@
-/* { dg-do compile } */
 /* { dg-do run } */
 /* { dg-options "-O2 -funroll-loops --param max-unroll-times=8 -fpredictive-commoning -fdump-tree-pcom-details" } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/predcom-5.c b/gcc/testsuite/gcc.dg/tree-ssa/predcom-5.c
index 7ad0d79..a3ee1d9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/predcom-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/predcom-5.c
@@ -1,4 +1,3 @@
-/* { dg-do compile } */
 /* { dg-do run } */
 /* { dg-options "-O2 -funroll-loops --param max-unroll-times=8 -fpredictive-commoning -fdump-tree-pcom-details" } */
 
diff --git a/gcc/testsuite/gcc.target/arc/mcrc.c b/gcc/testsuite/gcc.target/arc/mcrc.c
index d3780bb..a449bdd 100644
--- a/gcc/testsuite/gcc.target/arc/mcrc.c
+++ b/gcc/testsuite/gcc.target/arc/mcrc.c
@@ -1,4 +1,3 @@
-/* { dg-do compile } */
 /* { dg-options "-mcrc" } */
 /* { dg-do assemble } */
 
diff --git a/gcc/testsuite/gcc.target/arc/mlock.c b/gcc/testsuite/gcc.target/arc/mlock.c
index 3a8b050..e207f91 100644
--- a/gcc/testsuite/gcc.target/arc/mlock.c
+++ b/gcc/testsuite/gcc.target/arc/mlock.c
@@ -1,4 +1,3 @@
-/* { dg-do compile } */
 /* { dg-options "-mlock" } */
 /* { dg-do assemble } */
 
diff --git a/gcc/testsuite/gcc.target/arc/mmac-24.c b/gcc/testsuite/gcc.target/arc/mmac-24.c
index 30cb698..89da0b1 100644
--- a/gcc/testsuite/gcc.target/arc/mmac-24.c
+++ b/gcc/testsuite/gcc.target/arc/mmac-24.c
@@ -1,4 +1,3 @@
-/* { dg-do compile } */
 /* { dg-options "-mmac-24" } */
 /* { dg-do assemble } */
 
diff --git a/gcc/testsuite/gcc.target/arc/mrtsc.c b/gcc/testsuite/gcc.target/arc/mrtsc.c
index 31852a5..15cb939 100644
--- a/gcc/testsuite/gcc.target/arc/mrtsc.c
+++ b/gcc/testsuite/gcc.target/arc/mrtsc.c
@@ -1,4 +1,3 @@
-/* { dg-do compile } */
 /* { dg-options "-mrtsc" } */
 /* { dg-do assemble } */
 
diff --git a/gcc/testsuite/gcc.target/arc/mswape.c b/gcc/testsuite/gcc.target/arc/mswape.c
index 692e6a2..6d23bde 100644
--- a/gcc/testsuite/gcc.target/arc/mswape.c
+++ b/gcc/testsuite/gcc.target/arc/mswape.c
@@ -1,4 +1,3 @@
-/* { dg-do compile } */
 /* { dg-options "-mswape" } */
 /* { dg-do assemble } */
 
diff --git a/gcc/testsuite/gcc.target/arc/mxy.c b/gcc/testsuite/gcc.target/arc/mxy.c
index 1ecc34d..283daf0 100644
--- a/gcc/testsuite/gcc.target/arc/mxy.c
+++ b/gcc/testsuite/gcc.target/arc/mxy.c
@@ -1,4 +1,3 @@
-/* { dg-do compile } */
 /* { dg-options "-mxy" } */
 /* { dg-do assemble } */