https://gcc.gnu.org/g:1ecdefb5ee9215153d9c74b0528ac88b9e05e7af
commit r15-8958-g1ecdefb5ee9215153d9c74b0528ac88b9e05e7af
Author: Sam James <s...@gentoo.org>
Date: Thu Mar 27 00:32:23 2025 +0000
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:
---
gcc/testsuite/g++.dg/cpp0x/udlit-namespace-ambiguous.C | 4 ++--
gcc/testsuite/g++.dg/cpp2a/constexpr-init21.C | 2 +-
gcc/testsuite/g++.dg/diagnostic/wrong-tag-1.C | 2 +-
gcc/testsuite/g++.dg/init/self1.C | 2 +-
gcc/testsuite/g++.dg/opt/pr98743.C | 2 +-
gcc/testsuite/g++.dg/parse/error8.C | 2 +-
gcc/testsuite/g++.dg/template/explicit-args6.C | 2 +-
gcc/testsuite/g++.dg/template/unify9.C | 2 +-
gcc/testsuite/g++.dg/tree-ssa/pr105820.C | 2 +-
gcc/testsuite/g++.dg/warn/Wmismatched-tags-8.C | 6 +++---
gcc/testsuite/gcc.dg/cpp/cmdlne-dM-M.c | 2 +-
gcc/testsuite/gcc.dg/tree-ssa/reassoc-32.c | 2 +-
gcc/testsuite/gcc.dg/tree-ssa/reassoc-33.c | 2 +-
gcc/testsuite/gcc.dg/tree-ssa/reassoc-34.c | 2 +-
gcc/testsuite/gcc.dg/tree-ssa/reassoc-35.c | 2 +-
gcc/testsuite/gcc.dg/tree-ssa/reassoc-36.c | 2 +-
gcc/testsuite/gcc.dg/tree-ssa/reassoc-39.c | 2 +-
gcc/testsuite/gcc.dg/tree-ssa/reassoc-41.c | 2 +-
18 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-namespace-ambiguous.C
b/gcc/testsuite/g++.dg/cpp0x/udlit-namespace-ambiguous.C
index c67be390f8b8..1ba4c8d74c79 100644
--- 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 f5e1b3e76da4..1014292c1f87 100644
--- 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 2cf75f8bd7a4..05ad326a4547 100644
--- 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 2fc5aa65ec8e..f9e995144517 100644
--- 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 41f476fbe8e9..9380ff26fc82 100644
--- 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 135f0784bcfe..14b2c865b3dd 100644
--- 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 311a76789236..6e8ec38d13f4 100644
--- 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 ee18b86eb1f0..e743762222b2 100644
--- 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 507950f42d3f..4d4c0556f55b 100644
--- 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 0ebca3db90f2..082564d2a510 100644
--- 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 0cd9011042a3..6a89c25bde28 100644
--- 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 093e7a57a27a..545f316bebd4 100644
--- 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 fa661d942679..a89e0689e7bf 100644
--- 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 a4da8f707835..1c4041b74841 100644
--- 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 dde5d84e0207..a81846c17222 100644
--- 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 ffea71424ba8..a0489b9c4f7c 100644
--- 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 9befe184a018..de755667c58c 100644
--- 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 8a18b8878439..9624c75ecb9f 100644
--- 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" } } */
