diff mbox

pr59043

Message ID 20131118174850.B0D04104@mailhost.lps.ens.fr
State New
Headers show

Commit Message

Dominique d'Humières Nov. 18, 2013, 5:48 p.m. UTC 
Adjust the following tests to take into account the change of
"Length of Public Names Info" to "Pub Info Length"
in revision 203936. Tested on x86_64-apple-darwin13. OK?

Dominique

2013-11-18  Dominique d'Humieres  <dominiq@lps.ens.fr>

	PR testsuite/59043
	* g++.dg/pubtypes.C: Adjust the regular expression.
	* gcc.dg/pubtypes-1.c: Likewise.
	* gcc.dg/pubtypes-2.c: Likewise.
	* gcc.dg/pubtypes-3.c: Likewise.
	* gcc.dg/pubtypes-4.c: Likewise.

Comments

Mike Stump Dec. 6, 2013, 5:42 p.m. UTC | #1 
On Nov 18, 2013, at 9:48 AM, Dominique Dhumieres <dominiq@lps.ens.fr> wrote:
> Adjust the following tests to take into account the change of
> "Length of Public Names Info" to "Pub Info Length"
> in revision 203936. Tested on x86_64-apple-darwin13. OK?

Ok.  [ also, this is trivial ]

I think I blew by it the first time with the OK?  at the end of the line…  maybe I thought you thought it was trivial and checked it in.  Sorry.
Dominique d'Humières Dec. 6, 2013, 7:03 p.m. UTC | #2 
> I think I blew by it the first time with the OK?  at the end of the line?
> maybe I thought you thought it was trivial and checked it in

The patch is indeed trivial, but I don't have write access to CVS, so
someone else has to commit it.

Dominique
Mike Stump Dec. 6, 2013, 7:28 p.m. UTC | #3 
On Nov 18, 2013, at 9:48 AM, Dominique Dhumieres <dominiq@lps.ens.fr> wrote:
> Adjust the following tests to take into account the change of
> "Length of Public Names Info" to "Pub Info Length"
> in revision 203936. Tested on x86_64-apple-darwin13.

Applied:

Committed revision 205758.

Be sure to attach patches to be applied instead of cut-n-paste if you use Mail, it destroys the text cut and pasted.
Mike Stump Dec. 6, 2013, 7:28 p.m. UTC | #4 
On Dec 6, 2013, at 11:03 AM, Dominique Dhumieres <dominiq@lps.ens.fr> wrote:
>> I think I blew by it the first time with the OK?  at the end of the line?
>> maybe I thought you thought it was trivial and checked it in
> 
> The patch is indeed trivial, but I don't have write access to CVS,

:-)  We stop using cvs a long time ago.
Dominique d'Humières Dec. 6, 2013, 8:02 p.m. UTC | #5 
> :-)  We stop using cvs a long time ago.

I meant SVN, just showing my age!-)

> Be sure to attach patches to be applied instead of cut-n-paste if you use Mail, it destroys the text cut and pasted.

I did not use Mail. Did you have troubles with Tabs? Apparently the post on the list has them right.

Thanks for the commit,

Dominique
Mike Stump Dec. 6, 2013, 8:09 p.m. UTC | #6 
On Dec 6, 2013, at 12:02 PM, Dominique Dhumieres <dominiq@lps.ens.fr> wrote:
>> Be sure to attach patches to be applied instead of cut-n-paste if you use Mail, it destroys the text cut and pasted.
> 
> I did not use Mail. Did you have troubles with Tabs? Apparently the post on the list has them right.

Curious indeed.  Usually I can cut-n-paste those just fine…  I wonder why yours I could not.  I checked the raw version, and indeed I see the spaces.  Thanks for letting me know.
diff mbox

Patch

--- ../_clean/gcc/testsuite/g++.dg/pubtypes.C	2009-11-25 18:16:31.000000000 +0100
+++ gcc/testsuite/g++.dg/pubtypes.C	2013-10-24 13:54:59.000000000 +0200
@@ -2,7 +2,7 @@ 
 /* { dg-do compile { target *-*-darwin* } } */
 /* { dg-options "-O0 -gdwarf-2 -dA -fno-eliminate-unused-debug-types" } */
 /* { dg-final { scan-assembler "__debug_pubtypes" } } */
-/* { dg-final { scan-assembler "long+\[ \t\]+\(0x\)?\[0-9a-f]+\[ \t\n\]+\[#;@]+\[ \t\]+Length of Public Type Names Info" } } */
+/* { dg-final { scan-assembler "long+\[ \t\]+\(0x\)?\[0-9a-f]+\[ \t\n\]+\[#;@]+\[ \t\]+Pub Info Length" } } */
 /* { dg-final { scan-assembler "\"empty\\\\0\"+\[ \t\]+\[#;@]+\[ \t\]+external name" } } */
 /* { dg-final { scan-assembler "\"A\\\\0\"+\[ \t\]+\[#;@]+\[ \t\]+external name" } } */
 /* { dg-final { scan-assembler "\"B\\\\0\"+\[ \t\]+\[#;@]+\[ \t\]+external name" } } */

--- ../_clean/gcc/testsuite/gcc.dg/pubtypes-1.c	2009-11-25 18:15:40.000000000 +0100
+++ gcc/testsuite/gcc.dg/pubtypes-1.c	2013-10-24 13:52:37.000000000 +0200
@@ -2,7 +2,7 @@ 
 /* { dg-options "-O0 -gdwarf-2 -dA -fno-eliminate-unused-debug-types" } */
 /* { dg-skip-if "Unmatchable assembly" { mmix-*-* } { "*" } { "" } } */
 /* { dg-final { scan-assembler "__debug_pubtypes" } } */
-/* { dg-final { scan-assembler "long+\[ \t\]+0x\[0-9a-f]+\[ \t\]+\[#;]+\[ \t\]+Length of Public Type Names Info" } } */
+/* { dg-final { scan-assembler "long+\[ \t\]+0x\[0-9a-f]+\[ \t\]+\[#;]+\[ \t\]+Pub Info Length" } } */
 /* { dg-final { scan-assembler "used_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */
 /* { dg-final { scan-assembler "unused_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */
 
--- ../_clean/gcc/testsuite/gcc.dg/pubtypes-2.c	2012-06-26 20:42:19.000000000 +0200
+++ gcc/testsuite/gcc.dg/pubtypes-2.c	2013-10-24 13:53:05.000000000 +0200
@@ -2,7 +2,7 @@ 
 /* { dg-options "-O0 -gdwarf-2 -dA" } */
 /* { dg-skip-if "Unmatchable assembly" { mmix-*-* } { "*" } { "" } } */
 /* { dg-final { scan-assembler "__debug_pubtypes" } } */
-/* { dg-final { scan-assembler "long+\[ \t\]+0x13b+\[ \t\]+\[#;]+\[ \t\]+Length of Public Type Names Info" } } */
+/* { dg-final { scan-assembler "long+\[ \t\]+0x13b+\[ \t\]+\[#;]+\[ \t\]+Pub Info Length" } } */
 /* { dg-final { scan-assembler "used_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */
 /* { dg-final { scan-assembler-not "unused_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */
 
--- ../_clean/gcc/testsuite/gcc.dg/pubtypes-3.c	2012-06-26 20:42:19.000000000 +0200
+++ gcc/testsuite/gcc.dg/pubtypes-3.c	2013-10-24 13:53:33.000000000 +0200
@@ -2,7 +2,7 @@ 
 /* { dg-options "-O0 -gdwarf-2 -dA" } */
 /* { dg-skip-if "Unmatchable assembly" { mmix-*-* } { "*" } { "" } } */
 /* { dg-final { scan-assembler "__debug_pubtypes" } } */
-/* { dg-final { scan-assembler "long+\[ \t\]+0x13b+\[ \t\]+\[#;]+\[ \t\]+Length of Public Type Names Info" } } */
+/* { dg-final { scan-assembler "long+\[ \t\]+0x13b+\[ \t\]+\[#;]+\[ \t\]+Pub Info Length" } } */
 /* { dg-final { scan-assembler "used_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */
 /* { dg-final { scan-assembler-not "unused_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */
 /* { dg-final { scan-assembler-not "\"list_name_type\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */
--- ../_clean/gcc/testsuite/gcc.dg/pubtypes-4.c	2012-06-26 20:42:19.000000000 +0200
+++ gcc/testsuite/gcc.dg/pubtypes-4.c	2013-10-24 13:53:53.000000000 +0200
@@ -2,7 +2,7 @@ 
 /* { dg-options "-O0 -gdwarf-2 -dA" } */
 /* { dg-skip-if "Unmatchable assembly" { mmix-*-* } { "*" } { "" } } */
 /* { dg-final { scan-assembler "__debug_pubtypes" } } */
-/* { dg-final { scan-assembler "long+\[ \t\]+0x172+\[ \t\]+\[#;]+\[ \t\]+Length of Public Type Names Info" } } */
+/* { dg-final { scan-assembler "long+\[ \t\]+0x172+\[ \t\]+\[#;]+\[ \t\]+Pub Info Length" } } */
 /* { dg-final { scan-assembler "used_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */
 /* { dg-final { scan-assembler-not "unused_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */
 /* { dg-final { scan-assembler "\"list_name_type\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */