diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a769c140a3..c78f4fb2be 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-24  Tom Tromey  <tromey@redhat.com>
+
+	* lib/gdb.exp (skip_unwinder_tests): Don't leave 'ok' set if
+	gdb_test_multiple fails for other reasons.
+
 2012-08-24  Yao Qi  <yao@codesourcery.com>
 
 	* lib/gdb.exp (skip_unwinder_tests): Remove pass.
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 97e79af2cd..0b4c67926d 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -2101,15 +2101,14 @@ proc skip_hw_watchpoint_access_tests {} {
 proc skip_unwinder_tests {} {
     global gdb_prompt
 
-    set ok 1
+    set ok 0
     gdb_test_multiple "print _Unwind_DebugHook" "check for unwinder hook" {
 	-re "= .*no debug info.*_Unwind_DebugHook.*\r\n$gdb_prompt $" {
-	    set ok 0
 	}
 	-re "= .*_Unwind_DebugHook.*\r\n$gdb_prompt $" {
+	    set ok 1
 	}
 	-re "No symbol .* in current context.\r\n$gdb_prompt $" {
-	    set ok 0
 	}
     }
     if {!$ok} {