r199457 - in /branches/google/gcc-4_8: contrib/...

[dnovillo@gcc.gnu.org]

Author: dnovillo
Date: Thu May 30 19:30:31 2013
New Revision: 199457

URL: http://gcc.gnu.org/viewcvs?rev=199457&root=gcc&view=rev
Log:

Fix merge problems for testsuite/g++.dg/warn/Wconversion-null-2.C.
Use the original version from gcc-4_8-branch.

Remove the expected failure.


Modified:
    branches/google/gcc-4_8/contrib/testsuite-management/x86_64-grtev3-linux-gnu.xfail
    branches/google/gcc-4_8/gcc/testsuite/g++.dg/warn/Wconversion-null-2.C