diff mbox

[pph] Version 2: Clear test commit conflicts (issue4844060)

Message ID 20110810171752.81F6A1C0F8B@gchare.mtv.corp.google.com
State New
Headers show

Commit Message

Gab Charette Aug. 10, 2011, 5:17 p.m. UTC 
Here is what it takes, on top of Lawrence's first patch, to clear new test errors on my end.

Not sure what fixed the common removal of
// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 }
// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 }
maybe the trunk merge??

Seems like x6dynarray6 now has the same errors x6dynarray5 already had, don't know why this only shows up now...?

Also, since the trunk merge, `make check-c++ RUNTESTFLAGS=pph.exp` ran from bld/ now also runs c++0x tests it seems.
Diego said we don't care about those yet, so I changed my test run to be `make check-g++ RUNTESTFLAGS=pph.exp` ran from bld/gcc/

Gab

2011-08-10  Gabriel Charette  <gchare@google.com>

	* g++.dg/pph/x5dynarray7.h: Remove 2 bogus errors.
	* g++.dg/pph/x6dynarray6.h: Remove 2 bogus errors.
	Add 2 bogus errors.
	* g++.dg/pph/x7dynarray5.cc: Remove 2 bogus errors.
	* g++.dg/pph/x7dynarray6.cc: Remove 2 bogus errors.
	* g++.dg/pph/x7dynarray7.cc: Remove 2 bogus errors.


--
This patch is available for review at http://codereview.appspot.com/4844060

Comments

Diego Novillo Aug. 10, 2011, 5:24 p.m. UTC | #1 
On Wed, Aug 10, 2011 at 13:17, Gabriel Charette <gchare@google.com> wrote:

> 2011-08-10  Gabriel Charette  <gchare@google.com>
>
>        * g++.dg/pph/x5dynarray7.h: Remove 2 bogus errors.
>        * g++.dg/pph/x6dynarray6.h: Remove 2 bogus errors.
>        Add 2 bogus errors.
>        * g++.dg/pph/x7dynarray5.cc: Remove 2 bogus errors.
>        * g++.dg/pph/x7dynarray6.cc: Remove 2 bogus errors.
>        * g++.dg/pph/x7dynarray7.cc: Remove 2 bogus errors.

OK.


Diego.
diff mbox

Patch

diff --git a/gcc/testsuite/g++.dg/pph/x5dynarray7.h b/gcc/testsuite/g++.dg/pph/x5dynarray7.h
index 7aae396..5ee5d8c 100644
--- a/gcc/testsuite/g++.dg/pph/x5dynarray7.h
+++ b/gcc/testsuite/g++.dg/pph/x5dynarray7.h
@@ -1,7 +1,5 @@ 
 // { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } }
 // { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 }
-// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 }
-// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 }
 
 #ifndef X5DYNARRAY7_H
 #define X5DYNARRAY7_H
diff --git a/gcc/testsuite/g++.dg/pph/x6dynarray6.h b/gcc/testsuite/g++.dg/pph/x6dynarray6.h
index a8e48c1..497eb46 100644
--- a/gcc/testsuite/g++.dg/pph/x6dynarray6.h
+++ b/gcc/testsuite/g++.dg/pph/x6dynarray6.h
@@ -1,7 +1,7 @@ 
 // { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } }
 // { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 }
-// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 }
-// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 }
+// { 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-dfn3c.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 X6DYNARRAY6_H
 #define X6DYNARRAY6_H
diff --git a/gcc/testsuite/g++.dg/pph/x7dynarray5.cc b/gcc/testsuite/g++.dg/pph/x7dynarray5.cc
index f512bad..d7b17a3 100644
--- a/gcc/testsuite/g++.dg/pph/x7dynarray5.cc
+++ b/gcc/testsuite/g++.dg/pph/x7dynarray5.cc
@@ -1,7 +1,5 @@ 
 // { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } }
 // { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 }
-// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 }
-// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 }
 
 #include "x0dynarray4.h"
 #include "x6dynarray5.h"
diff --git a/gcc/testsuite/g++.dg/pph/x7dynarray6.cc b/gcc/testsuite/g++.dg/pph/x7dynarray6.cc
index 1585be0..0292890 100644
--- a/gcc/testsuite/g++.dg/pph/x7dynarray6.cc
+++ b/gcc/testsuite/g++.dg/pph/x7dynarray6.cc
@@ -1,7 +1,5 @@ 
 // { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } }
 // { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 }
-// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 }
-// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 }
 
 #include <algorithm>
 #include <iostream>
diff --git a/gcc/testsuite/g++.dg/pph/x7dynarray7.cc b/gcc/testsuite/g++.dg/pph/x7dynarray7.cc
index bf0a047..08398be 100644
--- a/gcc/testsuite/g++.dg/pph/x7dynarray7.cc
+++ b/gcc/testsuite/g++.dg/pph/x7dynarray7.cc
@@ -1,7 +1,5 @@ 
 // { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } }
 // { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 }
-// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 }
-// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 }
 
 #include <algorithm>
 #include <iostream>