gdb/testsuite/

	* gdb.base/valgrind-db-attach.exp: Use unsupported instead of xfail.
	Recognize "command not found".

2 files changed, 13 insertions, 4 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index cbe4e77a372..26003076538 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2010-02-16  Daniel Jacobowitz  <dan@codesourcery.com>
 
+	* gdb.base/valgrind-db-attach.exp: Use unsupported instead of xfail.
+	Recognize "command not found".
+
+2010-02-16  Daniel Jacobowitz  <dan@codesourcery.com>
+
 	* gdb.arch/thumb2-it.exp (test_it_break): Handle hardware
 	single-stepping.
 
diff --git a/gdb/testsuite/gdb.base/valgrind-db-attach.exp b/gdb/testsuite/gdb.base/valgrind-db-attach.exp
index 2aa22c1e5ec..8382a66cadf 100644
--- a/gdb/testsuite/gdb.base/valgrind-db-attach.exp
+++ b/gdb/testsuite/gdb.base/valgrind-db-attach.exp
@@ -34,8 +34,7 @@ set cmd "valgrind --db-attach=yes $db_command $binfile"
 set res [remote_spawn host $cmd];
 if { $res < 0 || $res == "" } {
     verbose -log "Spawning $cmd failed."
-    setup_xfail *-*-*
-    fail $test
+    unsupported $test
     return -1
 }
 pass $test
@@ -49,8 +48,13 @@ gdb_test_multiple "" $test {
 	pass $test
     }
     -re "valgrind: failed to start tool 'memcheck' for platform '.*': No such file or directory" {
-	setup_xfail *-*-*
-	fail $test
+	unsupported $test
+	return -1
+    }
+    -re "command not found" {
+	# The spawn succeeded, but then valgrind was not found - e.g. if
+	# we spawned SSH to a remote system.
+	unsupported $test
 	return -1
     }
 }