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  <domi...@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.

--- ../_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" } } */

Reply via email to