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

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

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
     }
 }