testsuite: fix more dg-* whitespace issues

A handful of cosmetic ones in here but most meant the directive wasn't
doing anything.

gcc/testsuite/ChangeLog:
	PR target/98743
	PR tree-optimization/105820

	* g++.dg/cpp0x/udlit-namespace-ambiguous.C: Fix whitespace.
	* g++.dg/cpp2a/constexpr-init21.C: Ditto.
	* g++.dg/diagnostic/wrong-tag-1.C: Ditto.
	* g++.dg/init/self1.C: Ditto.
	* g++.dg/opt/pr98743.C: Add missing '}' to terminate dg directive.
	* g++.dg/parse/error8.C: Fix whitespace.
	* g++.dg/template/explicit-args6.C: Add missing '{' to begin dg directive.
	* g++.dg/template/unify9.C: Fix whitespace.
	* g++.dg/tree-ssa/pr105820.C: Ditto.
	* g++.dg/warn/Wmismatched-tags-8.C: Add missing braces.
	* gcc.dg/cpp/cmdlne-dM-M.c: Ditto.
	* gcc.dg/tree-ssa/reassoc-32.c: Ditto.
	* gcc.dg/tree-ssa/reassoc-33.c: Ditto.
	* gcc.dg/tree-ssa/reassoc-34.c: Ditto.
	* gcc.dg/tree-ssa/reassoc-35.c: Ditto.
	* gcc.dg/tree-ssa/reassoc-36.c: Ditto.
	* gcc.dg/tree-ssa/reassoc-39.c: Ditto.
	* gcc.dg/tree-ssa/reassoc-41.c: Ditto.

diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-namespace-ambiguous.C b/gcc/testsuite/g++.dg/cpp0x/udlit-namespace-ambiguous.C
index c67be390f8b8662ccaade6b9e91cc6bd2d88f7f3..1ba4c8d74c798c8a972564e3c67dcbd9f1ea3b16 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-namespace-ambiguous.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-namespace-ambiguous.C
@@ -1,9 +1,9 @@
 // { dg-do compile { target c++11 } }
 
-int operator""_t (long long unsigned); // { dg-message "note: candidate"}
+int operator""_t (long long unsigned); // { dg-message "note: candidate" }
 
 namespace foo {
-  int operator""_t (long long unsigned);  // { dg-message "note: candidate"}
+  int operator""_t (long long unsigned);  // { dg-message "note: candidate" }
 }
 
 using namespace foo;

diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-init21.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-init21.C
index f5e1b3e76da4dae1392ac88288246faf7b469dc4..1014292c1f87d9a1e8dd7a68c629d1a035404af6 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp2a/constexpr-init21.C
+++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-init21.C
@@ -20,7 +20,7 @@ constexpr A<int> a4(4); // { dg-error "not a constant expression|incompletely in
 
 struct s { int n; };
 constexpr A<s> b;
-constexpr A<s> b0(0); // {  dg-error "not a constant expression|incompletely initialized" }
+constexpr A<s> b0(0); // { dg-error "not a constant expression|incompletely initialized" }
 
 struct empty {};
 constexpr A<empty> c;

diff --git a/gcc/testsuite/g++.dg/diagnostic/wrong-tag-1.C b/gcc/testsuite/g++.dg/diagnostic/wrong-tag-1.C
index 2cf75f8bd7a4ab23d486a306f25accb0cce2be1e..05ad326a4547108871dce8ec30e0124b1486b0d4 100644 (file)
--- a/gcc/testsuite/g++.dg/diagnostic/wrong-tag-1.C
+++ b/gcc/testsuite/g++.dg/diagnostic/wrong-tag-1.C
@@ -1,4 +1,4 @@
 // Origin PR c++/51427
 
-typedef struct _GMutex GMutex; // { dg-message "previously declared here"}
+typedef struct _GMutex GMutex; // { dg-message "previously declared here" }
 typedef union _GMutex GMutex; // { dg-error "tag used in naming" }

diff --git a/gcc/testsuite/g++.dg/init/self1.C b/gcc/testsuite/g++.dg/init/self1.C
index 2fc5aa65ec8e299c39cab071b642d64f90765f7f..f9e995144517b3021e54a0fb5849cca15be2da2b 100644 (file)
--- a/gcc/testsuite/g++.dg/init/self1.C
+++ b/gcc/testsuite/g++.dg/init/self1.C
@@ -9,7 +9,7 @@ void f(__SIZE_TYPE__) {
 
 int main()
 {
-  int* const savepos = sizeof(*savepos) ? 0 : 0;  /* { dg-error "invalid conversion" "convert" { target c++11 }  } */
+  int* const savepos = sizeof(*savepos) ? 0 : 0;  /* { dg-error "invalid conversion" "convert" { target c++11 } } */
 
   f (sizeof (*savepos));
 

diff --git a/gcc/testsuite/g++.dg/opt/pr98743.C b/gcc/testsuite/g++.dg/opt/pr98743.C
index 41f476fbe8e93609f8c895d435353919c286d9a8..9380ff26fc829480009196f44a70443794d8ea46 100644 (file)
--- a/gcc/testsuite/g++.dg/opt/pr98743.C
+++ b/gcc/testsuite/g++.dg/opt/pr98743.C
@@ -1,6 +1,6 @@
 // Test for value-initialization via {}
 // { dg-do run { target c++11 } }
-/* { dg-options "-Og -fno-early-inlining -finline-small-functions -fpack-struct" */
+/* { dg-options "-Og -fno-early-inlining -finline-small-functions -fpack-struct" } */
 void * operator new (__SIZE_TYPE__, void *p) { return p; }
 void * operator new[] (__SIZE_TYPE__, void *p) { return p; }
 

diff --git a/gcc/testsuite/g++.dg/parse/error8.C b/gcc/testsuite/g++.dg/parse/error8.C
index 135f0784bcfed294ac206a0203ac567190b4c9e4..14b2c865b3dd89d02e990fae83f38f1da9a30e0d 100644 (file)
--- a/gcc/testsuite/g++.dg/parse/error8.C
+++ b/gcc/testsuite/g++.dg/parse/error8.C
@@ -1,5 +1,5 @@
 // PR c++/13438
-// {  dg-options "-fshow-column" }
+// { dg-options "-fshow-column" }
 
 struct A { friend typename struct B; };
 

diff --git a/gcc/testsuite/g++.dg/template/explicit-args6.C b/gcc/testsuite/g++.dg/template/explicit-args6.C
index 311a7678923611f1e00f6168aa1ad7360d7ba1dd..6e8ec38d13f4246e03be61969027176e59c6103f 100644 (file)
--- a/gcc/testsuite/g++.dg/template/explicit-args6.C
+++ b/gcc/testsuite/g++.dg/template/explicit-args6.C
@@ -20,7 +20,7 @@ constexpr unsigned
 frob()
 {
   static_assert(N == 1, "user-friendly diagnostic"); // { dg-error "user-friendly" }
-  // dg-message { "-1 == 1" "" { target *-*-* } .-1 }
+  // { dg-message { "-1 == 1" "" { target *-*-* } .-1 } }
 
   // narrowing check, reject negative values
   return unsigned{N};          // { dg-prune-output "narrowing" }

diff --git a/gcc/testsuite/g++.dg/template/unify9.C b/gcc/testsuite/g++.dg/template/unify9.C
index ee18b86eb1f0508c8e31b4ee1e4333d8a96d68ef..e743762222b2e6c99d29f6873bcefcd61718c0a1 100644 (file)
--- a/gcc/testsuite/g++.dg/template/unify9.C
+++ b/gcc/testsuite/g++.dg/template/unify9.C
@@ -13,6 +13,6 @@ struct X {
 const X *x; 
  
 int main () { 
-  f (*x, &X::g);  // {  dg-error "no matching function" }
+  f (*x, &X::g);  // { dg-error "no matching function" }
   // { dg-message "(candidate|incompatible cv-qualifiers)" "candidate note" { target *-*-* } .-1 }
 } 

diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr105820.C b/gcc/testsuite/g++.dg/tree-ssa/pr105820.C
index 507950f42d3f4e8edc841e7e4cb48d10398d4fc7..4d4c0556f55b8c8bff18740c3dc42cc8c314bc5a 100644 (file)
--- a/gcc/testsuite/g++.dg/tree-ssa/pr105820.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr105820.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-O2 -fstrict-enums --param case-values-threshold=1"}
+// { dg-options "-O2 -fstrict-enums --param case-values-threshold=1" }
 
 typedef int basic_block;
 

diff --git a/gcc/testsuite/g++.dg/warn/Wmismatched-tags-8.C b/gcc/testsuite/g++.dg/warn/Wmismatched-tags-8.C
index 0ebca3db90f268fbcfeb888b06424c0e758281cd..082564d2a510d1309daeddf297e167c669d59a34 100644 (file)
--- a/gcc/testsuite/g++.dg/warn/Wmismatched-tags-8.C
+++ b/gcc/testsuite/g++.dg/warn/Wmismatched-tags-8.C
@@ -4,7 +4,7 @@
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic error "-Wmismatched-tags"
-class A;            // { dg-message "first declared"
+class A;            // { dg-message "first declared" }
 struct A;           // { dg-error "\\\[-Werror=mismatched-tags" }
 
 #pragma GCC diagnostic ignored "-Wmismatched-tags"
@@ -12,11 +12,11 @@ class B;            // { dg-bogus "first declared" }
 struct B;
 
 #pragma GCC diagnostic warning "-Wmismatched-tags"
-class C;            // { dg-message "first declared"
+class C;            // { dg-message "first declared" }
 struct C;           // { dg-warning "\\\[-Wmismatched-tags" }
 #pragma GCC diagnostic pop
 
-class D;            // { dg-message "first declared"
+class D;            // { dg-message "first declared" }
 struct D;           // { dg-warning "\\\[-Wmismatched-tags" }
 
 // { dg-prune-output "some warnings being treated as errors" }

diff --git a/gcc/testsuite/gcc.dg/cpp/cmdlne-dM-M.c b/gcc/testsuite/gcc.dg/cpp/cmdlne-dM-M.c
index 0cd9011042a3f1827c8f91e436a8c39b0b95d9d7..6a89c25bde287b8f205e31fe166553eb56e97c69 100644 (file)
--- a/gcc/testsuite/gcc.dg/cpp/cmdlne-dM-M.c
+++ b/gcc/testsuite/gcc.dg/cpp/cmdlne-dM-M.c
@@ -12,4 +12,4 @@ int variable;
 
 /* { dg-final { scan-file cmdlne-dM-M.i "(^|\\n)#define foo bar($|\\n)" } }
    { dg-final { scan-file-not cmdlne-dM-M.i "variable" } }
-   { dg-final { scan-file cmdlne-dM-M.i "(^|\\n)cmdlne-dM-M\[^\\n\]*:( *\\\\\\n)?\[^\\n\]*cmdlne-dM-M.c"} } */
+   { dg-final { scan-file cmdlne-dM-M.i "(^|\\n)cmdlne-dM-M\[^\\n\]*:( *\\\\\\n)?\[^\\n\]*cmdlne-dM-M.c" } } */

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-32.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-32.c
index 093e7a57a27a354518e77e68062d76ced58d564c..545f316bebd4f14141ec62b8663cf44ecc73548f 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-32.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-32.c
@@ -25,4 +25,4 @@ int main ()
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "Optimizing range tests .* 26" 1 "reassoc1"} }*/
+/* { dg-final { scan-tree-dump-times "Optimizing range tests .* 26" 1 "reassoc1" } } */

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-33.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-33.c
index fa661d942679d2ea7ba681727f8f170228b266ef..a89e0689e7bf3bf0f7714f3d4fc974f0b6a6bffe 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-33.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-33.c
@@ -23,4 +23,4 @@ main ()
       __builtin_abort ();
   return 0;
 }
-/* { dg-final { scan-tree-dump-times "Optimizing range tests" 3 "reassoc1"} }*/
+/* { dg-final { scan-tree-dump-times "Optimizing range tests" 3 "reassoc1" } } */

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-34.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-34.c
index a4da8f7078355870132aca4c26de11eb835f1800..1c4041b7484115fe6e50895ae320a5be46cdf71e 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-34.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-34.c
@@ -20,4 +20,4 @@ int main ()
     __builtin_abort ();
   return 0;
 }
-/* { dg-final { scan-tree-dump-times "Optimizing range tests" 1 "reassoc1"} }*/
+/* { dg-final { scan-tree-dump-times "Optimizing range tests" 1 "reassoc1" } } */

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-35.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-35.c
index dde5d84e02075c49469b6391f99f1f813862ad32..a81846c17222816eec5da6a08dce1ac9a0dc1225 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-35.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-35.c
@@ -22,4 +22,4 @@ main ()
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "Optimizing range tests" 1 "reassoc1"} }*/
+/* { dg-final { scan-tree-dump-times "Optimizing range tests" 1 "reassoc1" } } */

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-36.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-36.c
index ffea71424ba8090f78c68b2f07469067f0ebeed3..a0489b9c4f7c45b04576fa3cc883733608a8ca50 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-36.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-36.c
@@ -21,4 +21,4 @@ int main ()
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "Optimizing range tests" 1 "reassoc1"} }*/
+/* { dg-final { scan-tree-dump-times "Optimizing range tests" 1 "reassoc1" } } */

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-39.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-39.c
index 9befe184a018515da50a4dd14782d79482fd07d9..de755667c58c900b8dcca1a2d3851a65778087fa 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-39.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-39.c
@@ -104,4 +104,4 @@ f13 (double x)
   /* Can't reassoc here.  */
   return bar (tmp1 * tmp2, tmp2);
 }
-/* { dg-final { scan-tree-dump-times "Optimizing copysign" 12 "reassoc1"} }*/
+/* { dg-final { scan-tree-dump-times "Optimizing copysign" 12 "reassoc1" } } */

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-41.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-41.c
index 8a18b8878439d99f96d6d1242820ff234fcc98dd..9624c75ecb9f674511c2f82b76eebf8f8ab406d5 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-41.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-41.c
@@ -18,4 +18,4 @@ f2 (double y)
   return (-1.2 * __builtin_copysign (1.1, y));
 }
 
-/* { dg-final { scan-tree-dump-times "Optimizing copysign" 2 "reassoc1"} }*/
+/* { dg-final { scan-tree-dump-times "Optimizing copysign" 2 "reassoc1" } } */