gdb/testsuite/

	* gdb.cp/ptype-cv-cp.exp (ptype v_volatile_const_my_int): Make
	PR gcc/45997 XFAIL conditional for gcc <= 4.5.
	* gdb.python/py-type.exp (python print ttype.template_argument(2)):
	Change PR gcc/41736 to the more specific PR gcc/46955.  Make it
	conditional for gcc <= 4.5.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f618349..bca2d34 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,13 @@
 2011-12-19  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
+       * gdb.cp/ptype-cv-cp.exp (ptype v_volatile_const_my_int): Make
+       PR gcc/45997 XFAIL conditional for gcc <= 4.5.
+       * gdb.python/py-type.exp (python print ttype.template_argument(2)):
+       Change PR gcc/41736 to the more specific PR gcc/46955.  Make it
+       conditional for gcc <= 4.5.
+
+2011-12-19  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
        * gdb.cp/ptype-cv-cp.exp (ptype v_volatile_const_my_int): Replace KFAIL
        by XFAIL.
        * gdb.cp/static-method.exp (info addr A::func())

diff --git a/gdb/testsuite/gdb.cp/ptype-cv-cp.exp b/gdb/testsuite/gdb.cp/ptype-cv-cp.exp
index 21b4365..5f2c495 100644 (file)
--- a/gdb/testsuite/gdb.cp/ptype-cv-cp.exp
+++ b/gdb/testsuite/gdb.cp/ptype-cv-cp.exp
@@ -37,5 +37,8 @@ gdb_test "whatis v_const_volatile_my_int" "type = const_volatile_my_int"
 gdb_test "ptype v_const_volatile_my_int" "type = const volatile int"
 
 gdb_test "whatis v_volatile_const_my_int" "type = volatile_const_my_int"
-setup_xfail "gcc/45997" "*-*-*"
+if {[test_compiler_info {gcc-[0-3]-*}]
+    || [test_compiler_info {gcc-4-[0-5]-*}]} {
+    setup_xfail "gcc/45997" "*-*-*"
+}
 gdb_test "ptype v_volatile_const_my_int" "type = const volatile int"

diff --git a/gdb/testsuite/gdb.python/py-type.exp b/gdb/testsuite/gdb.python/py-type.exp
index b5e6ff9..b62d1e2 100644 (file)
--- a/gdb/testsuite/gdb.python/py-type.exp
+++ b/gdb/testsuite/gdb.python/py-type.exp
@@ -193,7 +193,10 @@ proc test_template {} {
     gdb_test "python print isinstance(ttype.template_argument(1), gdb.Value)" \
        "True"
 
-    setup_xfail "gcc/41736" *-*-*
+    if {[test_compiler_info {gcc-[0-3]-*}]
+       || [test_compiler_info {gcc-4-[0-5]-*}]} {
+       setup_xfail "gcc/46955" *-*-*
+    }
     gdb_test "python print ttype.template_argument(2)" "&C::c"
 }