[pph] Clear test commit conflict. (issue4815093)
Lawrence Crowl
crowl@google.com
Tue Aug 9 03:32:00 GMT 2011
This patch updates tests to clear conflicting commits.
The change needed for x6rtti.cc does not make sense to me.
Tested on x64.
Index: gcc/testsuite/ChangeLog.pph
2011-08-08 Lawrence Crowl <crowl@google.com>
* (g++.dg/pph/x6dynarray4.cc): Remove dg-prune-output.
* (g++.dg/pph/x4keyed.cc): Adjust line numbers to conflicting commit.
Remove 'previously defined' match.
* (g++.dg/pph/c3rawstruct.s): Remove inadvertently committed temporary
file.
* (g++.dg/pph/x6dynarray5.h): Add bogus error.
* (g++.dg/pph/x6rtti.cc): Remove dg-bogus lines. (The errors are
present and bogus, but matching is not working.)
* (g++.dg/pph/x7rtti.cc): Adjust line numbers to conflicting commit.
Index: gcc/testsuite/g++.dg/pph/x6dynarray4.cc
===================================================================
--- gcc/testsuite/g++.dg/pph/x6dynarray4.cc (revision 177575)
+++ gcc/testsuite/g++.dg/pph/x6dynarray4.cc (working copy)
@@ -1,6 +1,5 @@
// { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } }
// { dg-bogus "error: Cannot open PPH file for reading: x6dynarray5.pph: No such file or directory" "" { xfail *-*-* } 0 }
-// { dg-prune-output "In file included from" }
#include "x6dynarray5.h"
Index: gcc/testsuite/g++.dg/pph/x4keyed.cc
===================================================================
--- gcc/testsuite/g++.dg/pph/x4keyed.cc (revision 177575)
+++ gcc/testsuite/g++.dg/pph/x4keyed.cc (working copy)
@@ -1,6 +1,5 @@
// { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } }
-// { dg-bogus "a0keyed.h:14:1: error: redefinition of .const char _ZTS5keyed []." "" { xfail *-*-* } 0 }
-// { dg-bogus "a0keyed.h:14:1: error: .const char _ZTS5keyed .7.. previously defined here" "" { xfail *-*-* } 0 }
+// { dg-bogus "x0keyed2.h:11:1: error: redefinition of 'const char _ZTS5keyed ..'" "" { xfail *-*-* } 0 }
#include "x0keyed1.h"
#include "x0keyed2.h"
Index: gcc/testsuite/g++.dg/pph/c3rawstruct.s
===================================================================
--- gcc/testsuite/g++.dg/pph/c3rawstruct.s (revision 177575)
+++ gcc/testsuite/g++.dg/pph/c3rawstruct.s (working copy)
@@ -1,80 +0,0 @@
- .file "c3rawstruct.cc"
- .text
-.globl _Z1gv
- .type _Z1gv, @function
-_Z1gv:
-.LFB0:
- .cfi_startproc
- .cfi_personality 0x3,__gxx_personality_v0
- pushq %rbp
- .cfi_def_cfa_offset 16
- movq %rsp, %rbp
- .cfi_offset 6, -16
- .cfi_def_cfa_register 6
- movl $1, -16(%rbp)
- movl $2, -12(%rbp)
- movl -16(%rbp), %eax
- leave
- ret
- .cfi_endproc
-.LFE0:
- .size _Z1gv, .-_Z1gv
-.globl _Z1hv
- .type _Z1hv, @function
-_Z1hv:
-.LFB1:
- .cfi_startproc
- .cfi_personality 0x3,__gxx_personality_v0
- pushq %rbp
- .cfi_def_cfa_offset 16
- movq %rsp, %rbp
- .cfi_offset 6, -16
- .cfi_def_cfa_register 6
- movl $3, -16(%rbp)
- movl $4, -12(%rbp)
- movl -12(%rbp), %eax
- leave
- ret
- .cfi_endproc
-.LFE1:
- .size _Z1hv, .-_Z1hv
-.globl s
- .data
- .align 4
- .type s, @object
- .size s, 8
-s:
- .long 5
- .long 6
- .text
-.globl main
- .type main, @function
-main:
-.LFB2:
- .cfi_startproc
- .cfi_personality 0x3,__gxx_personality_v0
- pushq %rbp
- .cfi_def_cfa_offset 16
- movq %rsp, %rbp
- .cfi_offset 6, -16
- .cfi_def_cfa_register 6
- pushq %rbx
- subq $8, %rsp
- .cfi_offset 3, -24
- call _Z1gv
- movl %eax, %ebx
- call _Z1hv
- leal (%rbx,%rax), %edx
- movl s(%rip), %eax
- addl %eax, %edx
- movl s+4(%rip), %eax
- leal (%rdx,%rax), %eax
- addq $8, %rsp
- popq %rbx
- leave
- ret
- .cfi_endproc
-.LFE2:
- .size main, .-main
- .ident "GCC: (Ubuntu 4.4.3-4ubuntu5) 4.4.3"
- .section .note.GNU-stack,"",@progbits
Index: gcc/testsuite/g++.dg/pph/x6dynarray5.h
===================================================================
--- gcc/testsuite/g++.dg/pph/x6dynarray5.h (revision 177575)
+++ gcc/testsuite/g++.dg/pph/x6dynarray5.h (working copy)
@@ -1,5 +1,6 @@
// { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } }
// { dg-bogus "a0dynarray-dfn1b.hi:3:19: error: there are no arguments to 'alloc' that depend on a template parameter, so a declaration of 'alloc' must be available" "" { xfail *-*-* } 0 }
+// { dg-bogus "a0dynarray-dfn3b.hi:2:36: error: no 'void tst::dynarray<T>::check.tst::dynarray<T>::size_type.' member function declared in class 'tst::dynarray<T>'" "" { xfail *-*-* } 0 }
#ifndef X6DYNARRAY5_H
#define X6DYNARRAY5_H
Index: gcc/testsuite/g++.dg/pph/x7rtti.cc
===================================================================
--- gcc/testsuite/g++.dg/pph/x7rtti.cc (revision 177575)
+++ gcc/testsuite/g++.dg/pph/x7rtti.cc (working copy)
@@ -1,19 +1,17 @@
// { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } }
-// { dg-bogus "x5rtti1.h:11:0: warning: .__STDC_IEC_559_COMPLEX__. redefined .enabled by default." "" { xfail *-*-* } 0 }
-// { dg-bogus "x5rtti1.h:11:0: warning: .__STDC_ISO_10646__. redefined .enabled by default." "" { xfail *-*-* } 0 }
-// { dg-bogus "x5rtti1.h:11:0: warning: .__STDC_IEC_559__. redefined .enabled by default." "" { xfail *-*-* } 0 }
-// { dg-bogus "x5rtti2.h:13:32: error: no match for .operator" "" { xfail *-*-* } 0 }
-// { dg-bogus "x5rtti2.h:13:54: error: no match for .operator" "" { xfail *-*-* } 0 }
-// { dg-bogus "x5rtti2.h:14:32: error: no match for .operator" "" { xfail *-*-* } 0 }
-// { dg-bogus "x5rtti2.h:14:54: error: no match for .operator" "" { xfail *-*-* } 0 }
+// { dg-bogus "x5rtti1.h:13:0: warning: .__STDC_IEC_559_COMPLEX__. redefined .enabled by default." "" { xfail *-*-* } 0 }
+// { dg-bogus "x5rtti1.h:13:0: warning: .__STDC_ISO_10646__. redefined .enabled by default." "" { xfail *-*-* } 0 }
+// { dg-bogus "x5rtti1.h:13:0: warning: .__STDC_IEC_559__. redefined .enabled by default." "" { xfail *-*-* } 0 }
// { dg-bogus "x5rtti2.h:15:32: error: no match for .operator" "" { xfail *-*-* } 0 }
// { dg-bogus "x5rtti2.h:15:54: error: no match for .operator" "" { xfail *-*-* } 0 }
// { dg-bogus "x5rtti2.h:16:32: error: no match for .operator" "" { xfail *-*-* } 0 }
// { dg-bogus "x5rtti2.h:16:54: error: no match for .operator" "" { xfail *-*-* } 0 }
-// { dg-bogus "x5rtti2.h:17:1: error: redefinition of .const char _ZTS15non_polymorphic ..." "" { xfail *-*-* } 0 }
-// { dg-bogus "x5rtti2.h:17:1: error: .const char _ZTS15non_polymorphic .18.. previously defined here" "" { xfail *-*-* } 0 }
-// { dg-bogus "x5rtti2.h:17:1: error: redefinition of .const char _ZTS11polymorphic ..." "" { xfail *-*-* } 0 }
-// { dg-bogus "x5rtti2.h:17:1: error: .const char _ZTS11polymorphic .14.. previously defined here" "" { xfail *-*-* } 0 }
+// { dg-bogus "x5rtti2.h:17:32: error: no match for .operator" "" { xfail *-*-* } 0 }
+// { dg-bogus "x5rtti2.h:17:54: error: no match for .operator" "" { xfail *-*-* } 0 }
+// { dg-bogus "x5rtti2.h:18:32: error: no match for .operator" "" { xfail *-*-* } 0 }
+// { dg-bogus "x5rtti2.h:18:54: error: no match for .operator" "" { xfail *-*-* } 0 }
+// { dg-bogus "x5rtti2.h:19:1: error: redefinition of .const char _ZTS15non_polymorphic ..." "" { xfail *-*-* } 0 }
+// { dg-bogus "x5rtti2.h:19:1: error: redefinition of .const char _ZTS11polymorphic ..." "" { xfail *-*-* } 0 }
//FIXME We should make this a run test.
Index: gcc/testsuite/g++.dg/pph/x6rtti.cc
===================================================================
--- gcc/testsuite/g++.dg/pph/x6rtti.cc (revision 177575)
+++ gcc/testsuite/g++.dg/pph/x6rtti.cc (working copy)
@@ -1,7 +1,4 @@
// { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } }
-// { dg-bogus "x5rtti1.h:13:29: error: no match for .operator" "" { xfail *-*-* } 0 }
-// { dg-bogus "x5rtti1.h:13:51: error: no match for .operator" "" { xfail *-*-* } 0 }
-
//FIXME We should make this a run test.
--
This patch is available for review at http://codereview.appspot.com/4815093
More information about the Gcc-patches
mailing list