Patchwork [testsuite] Fix g++.dg/debug/dwarf2/nested-2.C regex for Solaris 2

login
register
mail settings
Submitter Rainer Orth
Date Aug. 30, 2010, 4:04 p.m.
Message ID <yddy6bokry0.fsf@manam.CeBiTec.Uni-Bielefeld.DE>
Download mbox | patch
Permalink /patch/63066/
State New
Headers show

Comments

Rainer Orth - Aug. 30, 2010, 4:04 p.m.
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.

Patch

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\]*" } }
 
  */