* lib/gdb.exp(get_debug_format): Don't cause the testsuite to fail

 	if we can't get a debug format from GDB (we may be testing an
 	older GDB). Use a 10 second timeout when checking for the format.

	* gdb.stabs/weird.exp: Fix quoting.

1 files changed, 9 insertions, 5 deletions

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 250f952..eb37fd5 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -988,19 +988,23 @@ proc get_debug_format { } {
 
     set debug_format "unknown"
     send_gdb "info source\n"
-    gdb_expect {
-	-re ".*Compiled with (.*) debugging format.\r\n$gdb_prompt $" {
+    gdb_expect 10 {
+	-re "Compiled with (.*) debugging format.\r\n$gdb_prompt $" {
 	    set debug_format $expect_out(1,string)
 	    verbose "debug format is $debug_format"
 	    return 1;
 	}
-	-re ".*No current source file.\r\n$gdb_prompt $" {
+	-re "No current source file.\r\n$gdb_prompt $" {
 	    perror "get_debug_format used when no current source file"
 	    return 0;
 	}
+	-re "$gdb_prompt $" {
+	    warning "couldn't check debug format (no valid response)."
+	    return 1;
+	}
 	timeout {
-	    perror "couldn't check debug format (timed out)."
-	    return 0;
+	    warning "couldn't check debug format (timed out)."
+	    return 1;
 	}
     }
 }