From patchwork Wed Sep 25 20:11:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 1989521 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XDSZv1Nv2z1xt0 for ; Thu, 26 Sep 2024 06:12:55 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4BD0A385B508 for ; Wed, 25 Sep 2024 20:12:53 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 4A8953858D35 for ; Wed, 25 Sep 2024 20:12:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4A8953858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4A8953858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727295147; cv=none; b=XdFz9RuElnYoFNkueRmbpWBcuakrdjDRsoSZo/ZLRQhzArooZw6Q7Y1SghxxzZ28cVQVubbwbtza96qYcimExsYOKHzoqZ0oLsq0b36lbjYVBiGd98py+rEbO1OfSn4Kf+SLR3KYY09zhQQh6fRC3EkZC6V3kY7Oqv6+8ZIqJ5s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727295147; c=relaxed/simple; bh=IKdFtSfzsWRWGz02ktXOvOSzwHCli/mbIPt4YJkdLCs=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=RYvZWkXZ5bOaZn6quhBlQoUxf18TaftersEapVCUc21IcsE67FHUkpSjErfqradTEZ7G5JiaPxClrYRW8J6tPbcluaj+FCWGPfhjs2IA47/JDn7PoavL6/nboKOJbQC3f+nW1A+DOY9YB4zeyV2Ez1AxtFO3HEiVyx+A6tq5tWQ= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: gcc-patches@gcc.gnu.org Cc: Sam James Subject: [COMMITTED 1/2] testsuite: fix dejagnu typos with underscores Date: Wed, 25 Sep 2024 21:11:57 +0100 Message-ID: X-Mailer: git-send-email 2.46.1 MIME-Version: 1.0 X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org 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. --- Committed as obvious. .../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, // printf, printf 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.0\"\[^\n\]*DW_AT_name" 1 } } -// { dg-final {scan-assembler-times "\"printf.0\"\[^\n\]*DW_AT_name" 1 } } -// { dg-final {scan-assembler-times "\"printf.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.0\"\[^\n\]*DW_AT_name" 1 } } +// { dg-final { scan-assembler-times "\"printf.0\"\[^\n\]*DW_AT_name" 1 } } +// { dg-final { scan-assembler-times "\"printf.0\"\[^\n\]*DW_AT_name" 1 } } +// { dg-final { scan-assembler-times "\"printf.0\"\[^\n\]*DW_AT_name" 1 } } // printf and printf 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 } } */ From patchwork Wed Sep 25 20:11:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 1989520 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XDSZt6Mkpz1xsn for ; Thu, 26 Sep 2024 06:12:54 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E0BFE385C6C7 for ; Wed, 25 Sep 2024 20:12:52 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 2DEBA3858D39 for ; Wed, 25 Sep 2024 20:12:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2DEBA3858D39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2DEBA3858D39 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727295146; cv=none; b=dLEFsrfHFIS0ooeWsXPiRSF8EDx8tlDUE9PvTUajRnEUoZKcq4qkr6SnHtbKYLUeBJA0CyCkOUBNY3FhNMGvRY+6T8kaMDtWEJU1s63CEo8vhm73gwPqgTF83CUhk43tBYnno4Zc+j7G75u4IPN9I0qOnEaxu0PffmpBv+CxcaY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727295146; c=relaxed/simple; bh=mIl/tVFO266atwlVngW4TmsDGX65ogwot4wx/FbuqyU=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=hl8Z/KW4Jm2Hg76cGzquuj/DFgRmsMithdDRDF4nwMSiQqO3K7a5UfYt88b4bn43sBENd+KafSsyiIKMXPp0H9SugXEItcUgZW4FI9hF4V44u4MsIYlPxnk+dQ3SGbVnqXJxYvSC7XhqXa6UlcTGxYWwKHLJfmLI7ElsyFmVCwI= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: gcc-patches@gcc.gnu.org Cc: Sam James Subject: [COMMITTED 2/2] testsuite: XFAIL g++.dg/modules/indirect-1_b.C Date: Wed, 25 Sep 2024 21:11:58 +0100 Message-ID: <6fee826bc1bbd4016d5b79e16e642d68c4007b09.1727295118.git.sam@gentoo.org> X-Mailer: git-send-email 2.46.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Mark the newly typo-fixed dg-final bits as XFAIL until investigated. gcc/testsuite/ChangeLog: PR c++/116846 * g++.dg/modules/indirect-1_b.C: Add XFAIL. --- Committed as obvious. gcc/testsuite/g++.dg/modules/indirect-1_b.C | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/g++.dg/modules/indirect-1_b.C b/gcc/testsuite/g++.dg/modules/indirect-1_b.C index 7621e05c86b9..dee8a00ef15e 100644 --- a/gcc/testsuite/g++.dg/modules/indirect-1_b.C +++ b/gcc/testsuite/g++.dg/modules/indirect-1_b.C @@ -48,7 +48,8 @@ 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 } } +// XFAIL is for PR116846 +// { dg-final { scan-lang-dump {Wrote named import:-[0-9]* const_decl:'::foo::Plain@\(foo\)::C'@foo} module { xfail *-*-* } } } +// { dg-final { scan-lang-dump {Wrote named import:-[0-9]* const_decl:'::foo::Plain@\(foo\)::B'@foo} module { xfail *-*-* } } } +// { dg-final { scan-lang-dump {Wrote named import:-[0-9]* const_decl:'::foo::Scoped@\(foo\)::C'@foo} module { xfail *-*-* } } } +// { dg-final { scan-lang-dump {Wrote named import:-[0-9]* const_decl:'::foo::Scoped@\(foo\)::B'@foo} module { xfail *-*-* } } }