* gdb.cp/namespace.exp: When "print ::cOtherFileClassVar" fails

	because of an older gcc, change test2
	"print ::C::OtherFileClass::cOtherFileClassVar" from unresolved
	to unsupported.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b0fc7461f73b21bc125068338d1032ac1a78ca8d..a2914f754c66333e20eb7a5f405b19803ae776c6 100644 (file)
--- 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 0dcd398f14bba0ccf7367e2b91e0503cd1848d99..e0f44d12914650134dbf47235f05c275d7ea480a 100644 (file)
--- 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
     }
 }