r177580 - in /branches/pph/gcc/testsuite: Chang...

[crowl@gcc.gnu.org]

Author: crowl
Date: Tue Aug  9 01:04:24 2011
New Revision: 177580

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=177580
Log:
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.



Removed:
    branches/pph/gcc/testsuite/g++.dg/pph/c3rawstruct.s
Modified:
    branches/pph/gcc/testsuite/ChangeLog.pph
    branches/pph/gcc/testsuite/g++.dg/pph/x4keyed.cc
    branches/pph/gcc/testsuite/g++.dg/pph/x6dynarray4.cc
    branches/pph/gcc/testsuite/g++.dg/pph/x6dynarray5.h
    branches/pph/gcc/testsuite/g++.dg/pph/x6rtti.cc
    branches/pph/gcc/testsuite/g++.dg/pph/x7rtti.cc