This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[obv] testsuite: Code cleanup
- From: Jan Kratochvil <jan dot kratochvil at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Fri, 15 Jul 2011 20:46:55 +0200
- Subject: [obv] testsuite: Code cleanup
Hi,
checked in, nothing interesting.
Thanks,
Jan
http://sourceware.org/ml/gdb-cvs/2011-07/msg00148.html
--- src/gdb/testsuite/ChangeLog 2011/07/15 14:13:00 1.2796
+++ src/gdb/testsuite/ChangeLog 2011/07/15 18:46:10 1.2797
@@ -1,3 +1,9 @@
+2011-07-15 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ Code cleanup.
+ * gdb.cp/namespace.exp (xfail_class_types): New variable. Initialize
+ it. Substitute it instead of test_compiler_info everywhere.
+
2011-07-15 Ulrich Weigand <ulrich.weigand@linaro.org>
* gdb.base/type-opaque.exp: Use gdb_load_shlibs. Run test on
--- src/gdb/testsuite/gdb.cp/namespace.exp 2011/01/01 15:33:43 1.25
+++ src/gdb/testsuite/gdb.cp/namespace.exp 2011/07/15 18:46:10 1.26
@@ -43,6 +43,13 @@
return -1;
}
+set xfail_class_types 0
+if {[test_compiler_info {gcc-[0-3]-*}]
+ || [test_compiler_info {gcc-4-[0-4]-*}]} {
+ # The type in class is missing in older GCCs.
+ set xfail_class_types 1
+}
+
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {debug c++}] != "" } {
untested namespace.exp
return -1
@@ -174,17 +181,9 @@
gdb_test "print C::cOtherFileVar" "\\$\[0-9\].* = 319"
gdb_test "print ::C::cOtherFileVar" "\\$\[0-9\].* = 319"
-if {[test_compiler_info {gcc-[0-3]-*}]
- || [test_compiler_info {gcc-4-[0-4]-*}]} {
- # The type in class is missing in older GCCs.
- setup_xfail *-*-*
-}
+if $xfail_class_types { setup_xfail *-*-* }
gdb_test "whatis C::OtherFileClass::cOtherFileClassType" "type = short"
-if {[test_compiler_info {gcc-[0-3]-*}]
- || [test_compiler_info {gcc-4-[0-4]-*}]} {
- # The type in class is missing in older GCCs.
- setup_xfail *-*-*
-}
+if $xfail_class_types { setup_xfail *-*-* }
gdb_test "whatis ::C::OtherFileClass::cOtherFileClassType" "type = short"
gdb_test "print C::OtherFileClass::cOtherFileClassVar" " = 318"
@@ -200,8 +199,7 @@
}
-re "\\$\[0-9\].* = 318\r\n$gdb_prompt $" {
# Do not permit to XFAIL on recent GCCs.
- if {[test_compiler_info {gcc-[0-3]-*}]
- || [test_compiler_info {gcc-4-[0-4]-*}]} {
+ if $xfail_class_types {
setup_xfail *-*-*
fail $test
# Unresolved means human intervention is required to determine
@@ -257,17 +255,9 @@
# Test class typedefs printing.
set expect "type = class C::OtherFileClass \{\r\n.*\r\n *typedef short cOtherFileClassType;\r\n *typedef long cOtherFileClassType2;\r\n\}"
-if {[test_compiler_info {gcc-[0-3]-*}]
- || [test_compiler_info {gcc-4-[0-4]-*}]} {
- # The type in class is missing in older GCCs.
- setup_xfail *-*-*
-}
+if $xfail_class_types { setup_xfail *-*-* }
gdb_test "ptype OtherFileClass" $expect "ptype OtherFileClass typedefs"
-if {[test_compiler_info {gcc-[0-3]-*}]
- || [test_compiler_info {gcc-4-[0-4]-*}]} {
- # The type in class is missing in older GCCs.
- setup_xfail *-*-*
-}
+if $xfail_class_types { setup_xfail *-*-* }
gdb_test "ptype ::C::OtherFileClass" $expect "ptype ::C::OtherFileClass typedefs"
# Some anonymous namespace tests.