* [testsuite] Fix g++.dg/debug/dwarf2/nested-2.C regex for Solaris 2
@ 2010-08-30 16:32 Rainer Orth
2010-09-02 14:38 ` Eric Botcazou
0 siblings, 1 reply; 3+ messages in thread
From: Rainer Orth @ 2010-08-30 16:32 UTC (permalink / raw)
To: gcc-patches
g++.dg/debug/dwarf2/nested-2.C is currently FAILing on Solaris 2, both
SPARC and x86. Some investigation revealed that this happens because it
uses a single / for ASM_COMMENT_START, not # or //. The following patch
accounts for that. Tested with the appropriate runtest invocation on
i386-pc-solaris2.11, installed as obvious.
Rainer
2010-08-28 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* g++.dg/debug/dwarf2/nested-2.C: Allow for single / as comment
delimiter.
diff -r cbddb097ff03 gcc/testsuite/g++.dg/debug/dwarf2/nested-2.C
--- a/gcc/testsuite/g++.dg/debug/dwarf2/nested-2.C Fri Aug 27 19:08:50 2010 +0200
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/nested-2.C Sun Aug 29 23:59:55 2010 +0200
@@ -32,6 +32,6 @@
Hence the slightly odd regexp:
- { dg-final { scan-assembler "\[^\n\r\]*\\(DIE\[^\n\r\]*DW_TAG_structure_type\\)\[\n\r\]+\[^\n\r\]*\"S\\\\0\"\[ \t\]+\(#|//\)\[ \t\]+DW_AT_name\[\n\r\]+\(.*\)?\\(DIE\[^\n\r\]*DW_TAG_structure_type\\)\[\n\r\]+\[^\n\r\]*\"T<int>\\\\0\"\[ \t\]+\(.*\)?\\(DIE\[^\n\r\]*DW_TAG_template_type_param\\)\[\n\r\]+\[^\n\r\]*\[\n\r\]+\[^\n\r\]*\[\n\r\]+\[^\n\r\]*\(#|//\)\[ \t\]+end of children of DIE\[^\n\r\]*\[\n\r\]+\[^\n\r\]*end of children of DIE\[^\n\r\]*" } }
+ { dg-final { scan-assembler "\[^\n\r\]*\\(DIE\[^\n\r\]*DW_TAG_structure_type\\)\[\n\r\]+\[^\n\r\]*\"S\\\\0\"\[ \t\]+\(#|//?\)\[ \t\]+DW_AT_name\[\n\r\]+\(.*\)?\\(DIE\[^\n\r\]*DW_TAG_structure_type\\)\[\n\r\]+\[^\n\r\]*\"T<int>\\\\0\"\[ \t\]+\(.*\)?\\(DIE\[^\n\r\]*DW_TAG_template_type_param\\)\[\n\r\]+\[^\n\r\]*\[\n\r\]+\[^\n\r\]*\[\n\r\]+\[^\n\r\]*\(#|//?\)\[ \t\]+end of children of DIE\[^\n\r\]*\[\n\r\]+\[^\n\r\]*end of children of DIE\[^\n\r\]*" } }
*/
--
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [testsuite] Fix g++.dg/debug/dwarf2/nested-2.C regex for Solaris 2
2010-08-30 16:32 [testsuite] Fix g++.dg/debug/dwarf2/nested-2.C regex for Solaris 2 Rainer Orth
@ 2010-09-02 14:38 ` Eric Botcazou
2010-09-03 15:23 ` Rainer Orth
0 siblings, 1 reply; 3+ messages in thread
From: Eric Botcazou @ 2010-09-02 14:38 UTC (permalink / raw)
To: Rainer Orth; +Cc: gcc-patches
[-- Attachment #1: Type: text/plain, Size: 512 bytes --]
> g++.dg/debug/dwarf2/nested-2.C is currently FAILing on Solaris 2, both
> SPARC and x86. Some investigation revealed that this happens because it
> uses a single / for ASM_COMMENT_START, not # or //. The following patch
> accounts for that.
It doesn't work on the SPARC though because the delimiter is different:
sparc.h:#define ASM_COMMENT_START "!"
Tested on sparc-sun-solaris2.10 and x86_64-suse-linux, applied.
* g++.dg/debug/dwarf2/nested-2.C: Allow for ! as comment delimiter.
--
Eric Botcazou
[-- Attachment #2: p.diff --]
[-- Type: text/x-diff, Size: 1233 bytes --]
Index: g++.dg/debug/dwarf2/nested-2.C
===================================================================
--- g++.dg/debug/dwarf2/nested-2.C (revision 163745)
+++ g++.dg/debug/dwarf2/nested-2.C (working copy)
@@ -32,6 +32,6 @@ We want to express that the DIE of S::T<
Hence the slightly odd regexp:
- { dg-final { scan-assembler "\[^\n\r\]*\\(DIE\[^\n\r\]*DW_TAG_structure_type\\)\[\n\r\]+\[^\n\r\]*\"S\\\\0\"\[ \t\]+\(#|//?\)\[ \t\]+DW_AT_name\[\n\r\]+\(.*\)?\\(DIE\[^\n\r\]*DW_TAG_structure_type\\)\[\n\r\]+\[^\n\r\]*\"T<int>\\\\0\"\[ \t\]+\(.*\)?\\(DIE\[^\n\r\]*DW_TAG_template_type_param\\)\[\n\r\]+\[^\n\r\]*\[\n\r\]+\[^\n\r\]*\[\n\r\]+\[^\n\r\]*\(#|//?\)\[ \t\]+end of children of DIE\[^\n\r\]*\[\n\r\]+\[^\n\r\]*end of children of DIE\[^\n\r\]*" } }
+ { dg-final { scan-assembler "\[^\n\r\]*\\(DIE\[^\n\r\]*DW_TAG_structure_type\\)\[\n\r\]+\[^\n\r\]*\"S\\\\0\"\[ \t\]+\(#|!|//?\)\[ \t\]+DW_AT_name\[\n\r\]+\(.*\)?\\(DIE\[^\n\r\]*DW_TAG_structure_type\\)\[\n\r\]+\[^\n\r\]*\"T<int>\\\\0\"\[ \t\]+\(.*\)?\\(DIE\[^\n\r\]*DW_TAG_template_type_param\\)\[\n\r\]+\[^\n\r\]*\[\n\r\]+\[^\n\r\]*\[\n\r\]+\[^\n\r\]*\(#|!|//?\)\[ \t\]+end of children of DIE\[^\n\r\]*\[\n\r\]+\[^\n\r\]*end of children of DIE\[^\n\r\]*" } }
*/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [testsuite] Fix g++.dg/debug/dwarf2/nested-2.C regex for Solaris 2
2010-09-02 14:38 ` Eric Botcazou
@ 2010-09-03 15:23 ` Rainer Orth
0 siblings, 0 replies; 3+ messages in thread
From: Rainer Orth @ 2010-09-03 15:23 UTC (permalink / raw)
To: Eric Botcazou; +Cc: gcc-patches
Eric Botcazou <ebotcazou@adacore.com> writes:
>> g++.dg/debug/dwarf2/nested-2.C is currently FAILing on Solaris 2, both
>> SPARC and x86. Some investigation revealed that this happens because it
>> uses a single / for ASM_COMMENT_START, not # or //. The following patch
>> accounts for that.
>
> It doesn't work on the SPARC though because the delimiter is different:
>
> sparc.h:#define ASM_COMMENT_START "!"
>
> Tested on sparc-sun-solaris2.10 and x86_64-suse-linux, applied.
>
>
> * g++.dg/debug/dwarf2/nested-2.C: Allow for ! as comment delimiter.
I admit not having tested on Solaris/SPARC, but could have sworn to have
checked for ASM_COMMENT_START in sparc headers. Oh well...
Thanks for fixing this.
Rainer
--
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-09-03 15:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-30 16:32 [testsuite] Fix g++.dg/debug/dwarf2/nested-2.C regex for Solaris 2 Rainer Orth
2010-09-02 14:38 ` Eric Botcazou
2010-09-03 15:23 ` Rainer Orth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).