* 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.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 78242dcddf2fe478e18155486bd210f9065f76bb..6c7836dedee74e766da9fd94efaa765319d16158 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 Thu Jul  3 15:35:12 1997  Bob Manson  <manson@charmed.cygnus.com>
 
+       * 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.
+
        * config/sparclet.exp: Renamed sparclet-loader.c to stub-loader.c.
 
 Mon Jun 30 18:31:43 1997  Bob Manson  <manson@charmed.cygnus.com>

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 250f9520a87c92e9c496cfc4b1512e6809eaf97b..eb37fd5f9dd8078a927e697ce45db5299057bcf5 100644 (file)
--- 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;
        }
     }
 }