From d5864b95ce94d9d480a70ffd6e2e4a5f45dc75ed Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Wed, 31 Jul 2024 17:26:05 +0100
Subject: [PATCH] testsuite: fix dejagnu typos with underscores
Fix typos in dejagnu 'dg-*' directives with erroneous underscores like
'dg_'.
gcc/testsuite/ChangeLog:
PR debug/30161
PR c++/91826
PR c++/116846
* g++.dg/debug/dwarf2/template-func-params-7.C: Fix errant underscore.
Cleanup whitespace in directives too.
* g++.dg/lookup/pr91826.C: Fix errant underscore.
* g++.dg/modules/indirect-1_b.C: Ditto.
* gcc.target/powerpc/vsx-builtin-msum.c: Ditto.
---
.../debug/dwarf2/template-func-params-7.C | 18 +++++++++---------
gcc/testsuite/g++.dg/lookup/pr91826.C | 2 +-
gcc/testsuite/g++.dg/modules/indirect-1_b.C | 8 ++++----
.../gcc.target/powerpc/vsx-builtin-msum.c | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/template-func-params-7.C b/gcc/testsuite/g++.dg/debug/dwarf2/template-func-params-7.C
index 9ce58a436af4..22b0e4f984da 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/template-func-params-7.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/template-func-params-7.C
@@ -6,23 +6,23 @@
// There must be 5 subprograms generated:
// printf(const char*), printf<int, char, int>,
// printf<char, int>, printf<int> and foo().
-// { dg-final {scan-assembler-times "DIE \\(0x\[^\n\]*\\) DW_TAG_subprogram" 5 } }
+// { dg-final { scan-assembler-times "DIE \\(0x\[^\n\]*\\) DW_TAG_subprogram" 5 } }
// That makes 6 template type parameters.
-// { dg-final {scan-assembler-times "DIE \\(0x\[^\n\]*\\) DW_TAG_template_type_param" 6 } }
-// { dg-final {scan-assembler-times "\"printf<int, char, int>.0\"\[^\n\]*DW_AT_name" 1 } }
-// { dg-final {scan-assembler-times "\"printf<char, int>.0\"\[^\n\]*DW_AT_name" 1 } }
-// { dg-final {scan-assembler-times "\"printf<int>.0\"\[^\n\]*DW_AT_name" 1 } }
-// { dg-final {scan-assembler-times "\"printf.0\"\[^\n\]*DW_AT_name" 1 } }
+// { dg-final { scan-assembler-times "DIE \\(0x\[^\n\]*\\) DW_TAG_template_type_param" 6 } }
+// { dg-final { scan-assembler-times "\"printf<int, char, int>.0\"\[^\n\]*DW_AT_name" 1 } }
+// { dg-final { scan-assembler-times "\"printf<char, int>.0\"\[^\n\]*DW_AT_name" 1 } }
+// { dg-final { scan-assembler-times "\"printf<int>.0\"\[^\n\]*DW_AT_name" 1 } }
+// { dg-final { scan-assembler-times "\"printf.0\"\[^\n\]*DW_AT_name" 1 } }
// printf<int, char, int> and printf<char, int> have a pack expansion as
// function parameters. There should then be 3
// DW_TAG_GNU_template_parameter_pack and 3 DW_TAG_GNU_formal_parameter_pack DIEs
-// { dg-final {scan-assembler-times "DIE \\(0x\[^\n\]*\\) DW_TAG_GNU_template_parameter_pack" 3 } }
-// { dg-final {scan-assembler-times "DIE \\(0x\[^\n\]*\\) DW_TAG_GNU_formal_parameter_pack" 3 } }
+// { dg-final { scan-assembler-times "DIE \\(0x\[^\n\]*\\) DW_TAG_GNU_template_parameter_pack" 3 } }
+// { dg-final { scan-assembler-times "DIE \\(0x\[^\n\]*\\) DW_TAG_GNU_formal_parameter_pack" 3 } }
// These 3 function template instantiations has a total of 3 template
// parameters named T.
-// { dg_final {scan-assembler-times "\.ascii \"T.0\"\[\t \]+\[^\n\]*DW_AT_name" 3 } }
+// { dg-final { scan-assembler-times "\.ascii \"T.0\"\[\t \]+\[^\n\]*DW_AT_name" 3 } }
void
diff --git a/gcc/testsuite/g++.dg/lookup/pr91826.C b/gcc/testsuite/g++.dg/lookup/pr91826.C
index 2b313ece8a74..7954a0f68e1a 100644
--- a/gcc/testsuite/g++.dg/lookup/pr91826.C
+++ b/gcc/testsuite/g++.dg/lookup/pr91826.C
@@ -8,7 +8,7 @@ namespace N2
{
namespace N { class C2; }
namespace A2 = N;
- class A2::C2 {}; // { dg_bogus "does not enclose" }
+ class A2::C2 {}; // { dg-bogus "does not enclose" }
}
namespace N3 { namespace N { class C3; } }
diff --git a/gcc/testsuite/g++.dg/modules/indirect-1_b.C b/gcc/testsuite/g++.dg/modules/indirect-1_b.C
index 39e9d21ab76f..7621e05c86b9 100644
--- a/gcc/testsuite/g++.dg/modules/indirect-1_b.C
+++ b/gcc/testsuite/g++.dg/modules/indirect-1_b.C
@@ -48,7 +48,7 @@ namespace bar
// { dg-final { scan-lang-dump {Lazily binding '::foo::Scoped'@'foo' section:} module } }
// { dg-final { scan-lang-dump-not {Lazily binding '::foo::Scoped@foo:.::[ABCD]'@'foo' section:} module } }
-// { dg_final { scan-lang-dump {Wrote named import:-[0-9]* const_decl:'::foo::Plain@\(foo\)::C'@foo} module } }
-// { dg_final { scan-lang-dump {Wrote named import:-[0-9]* const_decl:'::foo::Plain@\(foo\)::B'@foo} module } }
-// { dg_final { scan-lang-dump {Wrote named import:-[0-9]* const_decl:'::foo::Scoped@\(foo\)::C'@foo} module } }
-// { dg_final { scan-lang-dump {Wrote named import:-[0-9]* const_decl:'::foo::Scoped@\(foo\)::B'@foo} module } }
+// { dg-final { scan-lang-dump {Wrote named import:-[0-9]* const_decl:'::foo::Plain@\(foo\)::C'@foo} module } }
+// { dg-final { scan-lang-dump {Wrote named import:-[0-9]* const_decl:'::foo::Plain@\(foo\)::B'@foo} module } }
+// { dg-final { scan-lang-dump {Wrote named import:-[0-9]* const_decl:'::foo::Scoped@\(foo\)::C'@foo} module } }
+// { dg-final { scan-lang-dump {Wrote named import:-[0-9]* const_decl:'::foo::Scoped@\(foo\)::B'@foo} module } }
diff --git a/gcc/testsuite/gcc.target/powerpc/vsx-builtin-msum.c b/gcc/testsuite/gcc.target/powerpc/vsx-builtin-msum.c
index 6128141624e4..739cdc0529b1 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsx-builtin-msum.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsx-builtin-msum.c
@@ -22,5 +22,5 @@ test_msum_ui (vector unsigned long long vull_1, vector unsigned long long vull_2
return vec_msum (vull_1, vull_2, vui128);
}
-/* { dg_final { scan_assembler_times "vmsumudm" 2 } } */
+/* { dg-final { scan-assembler-times "vmsumudm" 2 } } */
--
GitLab