aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Evans <dje@google.com>2010-08-02 23:41:19 +0000
committerDoug Evans <dje@google.com>2010-08-02 23:41:19 +0000
commit49c3ccf710317395150d0cee58c36d624001a5ec (patch)
treebc4895c46cb76b90c826611ab0b184dd4b80a8f7
parented9465a7130cf1a0d18843c701105b5f7b17047f (diff)
downloadgdb-49c3ccf710317395150d0cee58c36d624001a5ec.zip
gdb-49c3ccf710317395150d0cee58c36d624001a5ec.tar.gz
gdb-49c3ccf710317395150d0cee58c36d624001a5ec.tar.bz2
* gdb.cp/namespace.exp: When "print ::cOtherFileClassVar" fails
because of an older gcc, change test2 "print ::C::OtherFileClass::cOtherFileClassVar" from unresolved to unsupported.
-rw-r--r--gdb/testsuite/ChangeLog7
-rw-r--r--gdb/testsuite/gdb.cp/namespace.exp14
2 files changed, 17 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b0fc746..a2914f7 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-02 Doug Evans <dje@google.com>
+
+ * gdb.cp/namespace.exp: When "print ::cOtherFileClassVar" fails
+ because of an older gcc, change test2
+ "print ::C::OtherFileClass::cOtherFileClassVar" from unresolved
+ to unsupported.
+
2010-07-30 Kazu Hirata <kazu@codesourcery.com>
* gdb.base/break-always.exp: Do not expect full paths to file
diff --git a/gdb/testsuite/gdb.cp/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp
index 0dcd398..e0f44d1 100644
--- a/gdb/testsuite/gdb.cp/namespace.exp
+++ b/gdb/testsuite/gdb.cp/namespace.exp
@@ -199,14 +199,20 @@ gdb_test_multiple $test $test {
gdb_test $test2 " = 318"
}
-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]-*}]} {
- # Do not permit to XFAIL on recent GCCs.
setup_xfail *-*-*
+ fail $test
+ # Unresolved means human intervention is required to determine
+ # whether the test passed or failed. Since the previous test
+ # xfailed (not failed) human intervention isn't going to help here.
+ # Thus test2 is marked as unsupported instead of unresolved.
+ unsupported $test2
+ } else {
+ fail $test
+ unresolved $test2
}
- fail $test
-
- unresolved $test2
}
}