From patchwork Mon Aug 30 16:04:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [testsuite] Fix g++.dg/debug/dwarf2/nested-2.C regex for Solaris 2 From: Rainer Orth X-Patchwork-Id: 63066 Message-Id: To: gcc-patches@gcc.gnu.org Date: Mon, 30 Aug 2010 18:04:23 +0200 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 * 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\\\\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\\\\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\]*" } } */