Clean up "Reading symbols" output

This patch is another attempt to fix PR cli/19551.  Unlike my previous
attempt, it doesn't print progress.  Instead, it just changes some
messages and adds newlines to make the output a bit nicer.

It also removes the "done." text that was previously emitted.  The
idea here is that it is obvious when gdb is done reading debug info,
as it starts then doing something else; and that while this message
did not provide much benefit to users, it did make it harder to make
the output clean.

After this change the output from "./gdb -iex 'set complaint 1' -nx ./gdb"
reads:

    Reading symbols from ./gdb...
    .debug_ranges entry has start address of zero [in module /home/tromey/gdb/build/gdb/gdb]
    DW_AT_low_pc 0x0 is zero for DIE at 0x17116c1 [in module /home/tromey/gdb/build/gdb/gdb]
    .debug_line address at offset 0xa22f5 is 0 [in module /home/tromey/gdb/build/gdb/gdb]
    During symbol reading, unsupported tag: 'DW_TAG_unspecified_type'.
    During symbol reading, const value length mismatch for 'std::ratio<1, 1000000000>::num', got 8, expected 0.

gdb/ChangeLog
2018-10-04  Tom Tromey  <tom@tromey.com>

	PR cli/19551:
	* symfile.c (symbol_file_add_with_addrs): Update output.
	* psymtab.c (require_partial_symbols): Update output.

gdb/testsuite/ChangeLog
2018-10-04  Tom Tromey  <tom@tromey.com>

	PR cli/19551:
	* lib/mi-support.exp (mi_gdb_file_cmd): Update.
	* lib/gdb.exp (gdb_file_cmd): Update.
	* gdb.stabs/weird.exp (print_weird_var): Update.
	* gdb.server/solib-list.exp: Update.
	* gdb.multi/remove-inferiors.exp (test_remove_inferiors): Update.
	* gdb.mi/mi-cli.exp: Update.
	* gdb.linespec/linespec.exp: Update.
	* gdb.dwarf2/dw2-stack-boundary.exp: Update.
	* gdb.dwarf2/dw2-objfile-overlap.exp: Update.
	* gdb.cp/cp-relocate.exp: Update.
	* gdb.base/sym-file.exp: Update.
	* gdb.base/relocate.exp: Update.
	* gdb.base/readnever.exp: Update.
	* gdb.base/print-symbol-loading.exp (test_load_core): Update.
	* gdb.base/kill-detach-inferiors-cmd.exp: Update.
	* gdb.base/dbx.exp (gdb_file_cmd): Update.
	* gdb.base/code_elim.exp: Update.
	* gdb.base/break-unload-file.exp (test_break): Update.
	* gdb.base/break-interp.exp (test_attach_gdb): Update.
	* gdb.base/break-idempotent.exp (force_breakpoint_re_set):
	Update.
	* gdb.base/attach.exp (do_attach_tests): Update.
	* gdb.base/sepdebug.exp: Update.
	* gdb.python/py-section-script.exp: Update.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8be3e87692fd968aa10a9231f5ead7c03bfca6f7..0b9dff67c27dc5daed0867c827c52e0fdf5419bc 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2018-10-04  Tom Tromey  <tom@tromey.com>
+
+       PR cli/19551:
+       * symfile.c (symbol_file_add_with_addrs): Update output.
+       * psymtab.c (require_partial_symbols): Update output.
+
 2018-10-04  Tom Tromey  <tom@tromey.com>
 
        PR cli/22234:

diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index 219357e586bd1e441e52a32ca06145c7ad1fec82..274d56734c9d04170fc5f21f8858f1b58bd00ad7 100644 (file)
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -78,11 +78,8 @@ require_partial_symbols (struct objfile *objfile, int verbose)
       if (objfile->sf->sym_read_psymbols)
        {
          if (verbose)
-           {
-             printf_filtered (_("Reading symbols from %s..."),
-                              objfile_name (objfile));
-             gdb_flush (gdb_stdout);
-           }
+           printf_filtered (_("Reading symbols from %s...\n"),
+                            objfile_name (objfile));
          (*objfile->sf->sym_read_psymbols) (objfile);
 
          /* Partial symbols list are not expected to changed after this
@@ -90,17 +87,9 @@ require_partial_symbols (struct objfile *objfile, int verbose)
          objfile->global_psymbols.shrink_to_fit ();
          objfile->static_psymbols.shrink_to_fit ();
 
-         if (verbose)
-           {
-             if (!objfile_has_symbols (objfile))
-               {
-                 wrap_here ("");
-                 printf_filtered (_("(no debugging symbols found)..."));
-                 wrap_here ("");
-               }
-
-             printf_filtered (_("done.\n"));
-           }
+         if (verbose && !objfile_has_symbols (objfile))
+           printf_filtered (_("(No debugging symbols found in %s)\n"),
+                            objfile_name (objfile));
        }
     }
 

diff --git a/gdb/symfile.c b/gdb/symfile.c
index 0767562d5ca6f60b36f18a33c52cfd0bec73094f..ed41b5b70fffe90930343fb8ee7b955e644892ab 100644 (file)
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -1110,11 +1110,7 @@ symbol_file_add_with_addrs (bfd *abfd, const char *name,
       if (deprecated_pre_add_symbol_hook)
        deprecated_pre_add_symbol_hook (name);
       else
-       {
-         printf_filtered (_("Reading symbols from %s..."), name);
-         wrap_here ("");
-         gdb_flush (gdb_stdout);
-       }
+       printf_filtered (_("Reading symbols from %s...\n"), name);
     }
   syms_from_objfile (objfile, addrs, add_flags);
 
@@ -1126,29 +1122,19 @@ symbol_file_add_with_addrs (bfd *abfd, const char *name,
   if ((flags & OBJF_READNOW))
     {
       if (should_print)
-       {
-         printf_filtered (_("expanding to full symbols..."));
-         wrap_here ("");
-         gdb_flush (gdb_stdout);
-       }
+       printf_filtered (_("Expanding full symbols from %s...\n"), name);
 
       if (objfile->sf)
        objfile->sf->qf->expand_all_symtabs (objfile);
     }
 
   if (should_print && !objfile_has_symbols (objfile))
-    {
-      wrap_here ("");
-      printf_filtered (_("(no debugging symbols found)..."));
-      wrap_here ("");
-    }
+    printf_filtered (_("(No debugging symbols found in %s)\n"), name);
 
   if (should_print)
     {
       if (deprecated_post_add_symbol_hook)
        deprecated_post_add_symbol_hook ();
-      else
-       printf_filtered (_("done.\n"));
     }
 
   /* We print some messages regardless of whether 'from_tty ||

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 17cff0b99b20ec1012e928ec66892d0cef898adf..b26a24267b6cb2b4ff6b081f3244a7c15fb8c44b 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,31 @@
+2018-10-04  Tom Tromey  <tom@tromey.com>
+
+       PR cli/19551:
+       * lib/mi-support.exp (mi_gdb_file_cmd): Update.
+       * lib/gdb.exp (gdb_file_cmd): Update.
+       * gdb.stabs/weird.exp (print_weird_var): Update.
+       * gdb.server/solib-list.exp: Update.
+       * gdb.multi/remove-inferiors.exp (test_remove_inferiors): Update.
+       * gdb.mi/mi-cli.exp: Update.
+       * gdb.linespec/linespec.exp: Update.
+       * gdb.dwarf2/dw2-stack-boundary.exp: Update.
+       * gdb.dwarf2/dw2-objfile-overlap.exp: Update.
+       * gdb.cp/cp-relocate.exp: Update.
+       * gdb.base/sym-file.exp: Update.
+       * gdb.base/relocate.exp: Update.
+       * gdb.base/readnever.exp: Update.
+       * gdb.base/print-symbol-loading.exp (test_load_core): Update.
+       * gdb.base/kill-detach-inferiors-cmd.exp: Update.
+       * gdb.base/dbx.exp (gdb_file_cmd): Update.
+       * gdb.base/code_elim.exp: Update.
+       * gdb.base/break-unload-file.exp (test_break): Update.
+       * gdb.base/break-interp.exp (test_attach_gdb): Update.
+       * gdb.base/break-idempotent.exp (force_breakpoint_re_set):
+       Update.
+       * gdb.base/attach.exp (do_attach_tests): Update.
+       * gdb.base/sepdebug.exp: Update.
+       * gdb.python/py-section-script.exp: Update.
+
 2018-10-04  Tom Tromey  <tom@tromey.com>
 
        PR cli/22234:

diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp
index 3f3a0edbb9d3ead48390c38315d03ddb3250faac..327d73d59885e382ec55e676b0cc6b99511b07f0 100644 (file)
--- a/gdb/testsuite/gdb.base/attach.exp
+++ b/gdb/testsuite/gdb.base/attach.exp
@@ -165,10 +165,10 @@ proc do_attach_tests {} {
     set test "set file, before attach1"
     gdb_test_multiple "file $binfile" "$test" {
        -re "Load new symbol table from.*y or n. $" {
-           gdb_test "y" "Reading symbols from $escapedbinfile\.\.\.*done." \
+           gdb_test "y" "Reading symbols from $escapedbinfile\.\.\.*" \
                "$test (re-read)"
        }
-       -re "Reading symbols from $escapedbinfile\.\.\.*done.*$gdb_prompt $" {
+       -re "Reading symbols from $escapedbinfile\.\.\.*$gdb_prompt $" {
            pass "$test"
        }
     }
@@ -224,7 +224,7 @@ proc do_attach_tests {} {
            # executable's symbol table.  This in turn always results in
            # asking the user for actually loading the symbol table of the
            # executable.
-           gdb_test "y" "Reading symbols from $sysroot$escapedbinfile\.\.\.*done." \
+           gdb_test "y" "Reading symbols from $sysroot$escapedbinfile\.\.\.*" \
                "$test (reset file)"
 
            set found_exec_file 1
@@ -239,10 +239,10 @@ proc do_attach_tests {} {
        set test "load file manually, after attach2"
        gdb_test_multiple "file $binfile" "$test" {
            -re "A program is being debugged already..*Are you sure you want to change the file.*y or n. $" {
-               gdb_test "y" "Reading symbols from $escapedbinfile\.\.\.*done." \
+               gdb_test "y" "Reading symbols from $escapedbinfile\.\.\.*" \
                    "$test (re-read)"
            }
-           -re "Reading symbols from $escapedbinfile\.\.\.*done.*$gdb_prompt $" {
+           -re "Reading symbols from $escapedbinfile\.\.\.*$gdb_prompt $" {
                pass "$test"
            }
        }

diff --git a/gdb/testsuite/gdb.base/break-idempotent.exp b/gdb/testsuite/gdb.base/break-idempotent.exp
index 300f95d81aecf1bb1f47ecfe42f40db947f2f523..0b1e5db67a7d00b14e276a27b24adf67f393d58a 100644 (file)
--- a/gdb/testsuite/gdb.base/break-idempotent.exp
+++ b/gdb/testsuite/gdb.base/break-idempotent.exp
@@ -69,7 +69,7 @@ proc force_breakpoint_re_set {} {
            send_gdb "y\n"
            exp_continue
        }
-       -re "Reading symbols from.*done.*$gdb_prompt $" {
+       -re "Reading symbols from.*$gdb_prompt $" {
            pass $test
        }
     }

diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp
index 72117cb4a6f0ece54b95fbe797d09ad1157940e4..50d0c23a279f7f174b02fb0ee99d8bf94f85cb0a 100644 (file)
--- a/gdb/testsuite/gdb.base/break-interp.exp
+++ b/gdb/testsuite/gdb.base/break-interp.exp
@@ -258,7 +258,7 @@ proc test_attach_gdb {file pid displacement prefix} {
        # Print the "PIE (Position Independent Executable) displacement" message.
        gdb_test_no_output "set verbose on"
 
-       gdb_test "file $file" "Reading symbols from .*done\\." "file"
+       gdb_test "file $file" "Reading symbols from .*" "file"
 
        set test "attach"
        gdb_test_multiple "attach $pid" $test {

diff --git a/gdb/testsuite/gdb.base/break-unload-file.exp b/gdb/testsuite/gdb.base/break-unload-file.exp
index bb8027930cb21c3a3cceff75402b09585039564c..4ede688d04c020bdca7782bc3be4766cdd82d54d 100644 (file)
--- a/gdb/testsuite/gdb.base/break-unload-file.exp
+++ b/gdb/testsuite/gdb.base/break-unload-file.exp
@@ -132,7 +132,7 @@ proc test_break { initial_load always_inserted break_command } {
                send_gdb "y\n"
                exp_continue
            }
-           -re "Reading symbols from.*done.*$gdb_prompt $" {
+           -re "Reading symbols from.*$gdb_prompt $" {
                pass $test
            }
        }

diff --git a/gdb/testsuite/gdb.base/code_elim.exp b/gdb/testsuite/gdb.base/code_elim.exp
index 5ebcffece85d11b52c13fa5b71b31973aba1ec72..962df4d773a85063f48732f40072d09c4335ba25 100644 (file)
--- a/gdb/testsuite/gdb.base/code_elim.exp
+++ b/gdb/testsuite/gdb.base/code_elim.exp
@@ -75,7 +75,7 @@ gdb_exit
 gdb_start
 
 gdb_test "symbol-file ${binfile1}" \
-       "Reading symbols from .*${testfile1}\\.\\.\\.done\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
+       "Reading symbols from .*${testfile1}\\.\\.\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
        "symbol-file ${testfile1}"
 
 with_test_prefix "single psymtabs" {
@@ -109,13 +109,13 @@ gdb_start
 
 with_test_prefix "order1" {
     gdb_test "add-symbol-file ${binfile1} 0x100000 -s .bss 0x120000" \
-           "Reading symbols from .*${testfile1}\\.\\.\\.done\\." \
+           "Reading symbols from .*${testfile1}\\.\\.\\." \
            "add-symbol-file ${testfile1} 0x100000" \
            "add symbol table from file \".*${testfile1}\" at.*\\(y or n\\) " \
            "y"
 
     gdb_test "add-symbol-file ${binfile2} 0x200000 -s .data 0x210000 -s .bss 0x220000" \
-           "Reading symbols from .*${testfile2}\\.\\.\\.done\\." \
+           "Reading symbols from .*${testfile2}\\.\\.\\." \
            "add-symbol-file ${testfile2} 0x200000" \
            "add symbol table from file \".*${testfile2}\" at.*\\(y or n\\) " \
            "y"
@@ -133,13 +133,13 @@ gdb_start
 
 with_test_prefix "order2" {
     gdb_test "add-symbol-file ${binfile2} 0x200000 -s .data 0x210000 -s .bss 0x220000" \
-           "Reading symbols from .*${testfile2}\\.\\.\\.done\\." \
+           "Reading symbols from .*${testfile2}\\.\\.\\." \
            "add-symbol-file ${testfile2} 0x200000" \
            "add symbol table from file \".*${testfile2}\" at.*\\(y or n\\) " \
            "y"
 
     gdb_test "add-symbol-file ${binfile1} 0x100000 -s .bss 0x120000" \
-           "Reading symbols from .*${testfile1}\\.\\.\\.done\\." \
+           "Reading symbols from .*${testfile1}\\.\\.\\." \
            "add-symbol-file ${testfile1} 0x100000" \
            "add symbol table from file \".*${testfile1}\" at.*\\(y or n\\) " \
            "y"

diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp
index 688fcbed1338fab9fa74b48e8f3aed4a10444151..2744115a7e6c85391e65d621086a91c013adb3c5 100644 (file)
--- a/gdb/testsuite/gdb.base/dbx.exp
+++ b/gdb/testsuite/gdb.base/dbx.exp
@@ -174,7 +174,7 @@ proc gdb_file_cmd {arg} {
 
     send_gdb "symbol-file $arg\n"
     gdb_expect {
-        -re "Reading symbols from.*done.*$gdb_prompt $" {
+        -re "Reading symbols from.*$gdb_prompt $" {
             verbose "\t\tLoaded $arg into the $GDB"
             send_gdb "exec-file $arg\n" 
             gdb_expect {

diff --git a/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp b/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp
index b1382469835644cd2f30bda3b8cc1cb1fc234e8f..85856f76bf3e9f2e68330daf241e07778f5304b2 100644 (file)
--- a/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp
+++ b/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp
@@ -34,7 +34,7 @@ runto_main
 # Add another forked inferior process.
 gdb_test "add-inferior" "Added inferior 2" "add inferior 2"
 gdb_test "inferior 2" "Switching to inferior 2.*"
-gdb_test "file $binfile" "Reading symbols from .*done.*" "load binary"
+gdb_test "file $binfile" "Reading symbols from .*" "load binary"
 gdb_test "start" "Temporary breakpoint.*Starting program.*"
 
 # Add an attached inferior process.

diff --git a/gdb/testsuite/gdb.base/print-symbol-loading.exp b/gdb/testsuite/gdb.base/print-symbol-loading.exp
index 6d3005b50e522501ecb13e812483538a1ccc6f32..119a26e8635294bb1db02426bbd2d0294cddd8f7 100644 (file)
--- a/gdb/testsuite/gdb.base/print-symbol-loading.exp
+++ b/gdb/testsuite/gdb.base/print-symbol-loading.exp
@@ -56,7 +56,7 @@ proc test_load_core { print_symbol_loading } {
        gdb_reinitialize_dir $srcdir/$subdir
        gdb_test_no_output "set print symbol-loading $print_symbol_loading"
        if { ${print_symbol_loading} != "off" } {
-           gdb_test "file $binfile" "Reading symbols from.*done\\." "file"
+           gdb_test "file $binfile" "Reading symbols from.*" "file"
        } else {
            gdb_test_no_output "file $binfile" "file"
        }

diff --git a/gdb/testsuite/gdb.base/readnever.exp b/gdb/testsuite/gdb.base/readnever.exp
index bf70201d403c23596d04c449a9125dd4146dfe8a..805ecd218a2f1abd5d1bb5f01e753f5efbca856c 100644 (file)
--- a/gdb/testsuite/gdb.base/readnever.exp
+++ b/gdb/testsuite/gdb.base/readnever.exp
@@ -74,7 +74,7 @@ save_vars { GDBFLAGS } {
 gdb_exit
 gdb_start
 gdb_test "symbol-file ${binfile}0.o -readnever" \
-    "Reading symbols from ${binfile}0\.o\.\.\.\\\(no debugging symbols found\\\)\.\.\.done\." \
+    "Reading symbols from ${binfile}0\.o\.\.\.\r\n\\\(No debugging symbols found in .*\\\)" \
     "use symbol-file -readnever"
 
 gdb_test_no_output "maint info symtabs" \

diff --git a/gdb/testsuite/gdb.base/relocate.exp b/gdb/testsuite/gdb.base/relocate.exp
index b6f18d9c69dc22d352541009accb6e140f3ec3ef..4c1696a8cac82678ec5dd942a5f3237285fb0a12 100644 (file)
--- a/gdb/testsuite/gdb.base/relocate.exp
+++ b/gdb/testsuite/gdb.base/relocate.exp
@@ -116,11 +116,11 @@ gdb_test_multiple "add-symbol-file -s -section-name 0x200 $binfile 0x100" $test
 # Since we're here, might as well test the 'symbol-file' command and
 # if its arguments can also be passed at any position.
 gdb_test "symbol-file -readnow $binfile" \
-    "Reading symbols from ${binfile}\.\.\.expanding to full symbols\.\.\.done\." \
+    "Reading symbols from ${binfile}\.\.\.\r\nExpanding full symbols from ${binfile}\.\.\." \
     "symbol-file with -readnow first"
 clean_restart
 gdb_test "symbol-file $binfile -readnow" \
-    "Reading symbols from ${binfile}\.\.\.expanding to full symbols\.\.\.done\." \
+    "Reading symbols from ${binfile}\.\.\.\r\nExpanding full symbols from ${binfile}\.\.\." \
     "symbol-file with -readnow second"
 gdb_test "symbol-file -readnow" \
     "no symbol file name was specified" \
@@ -130,7 +130,7 @@ gdb_test "symbol-file -- -non-existent-file" \
     "symbol-file with -- disables option processing"
 clean_restart
 gdb_test "symbol-file -readnow -- $binfile" \
-    "Reading symbols from ${binfile}\.\.\.expanding to full symbols\.\.\.done\." \
+    "Reading symbols from ${binfile}\.\.\.\r\nExpanding full symbols from ${binfile}\.\.\." \
     "symbol-file with -- and -readnow"
 gdb_test "symbol-file -- $binfile -readnow" \
     "Unrecognized argument \"-readnow\"" \
@@ -147,7 +147,7 @@ gdb_test "add-symbol-file ${binfile} 0 -s .whatever" \
 
 # Load the object file.
 gdb_test "add-symbol-file ${binfile} 0" \
-       "Reading symbols from .*${testfile}\\.o\\.\\.\\.done\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
+       "Reading symbols from .*${testfile}\\.o\\.\\.\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
        "add-symbol-file ${testfile}.o 0" \
        "add symbol table from file \".*${testfile}\\.o\" at\[ \t\r\n\]+\.text_addr = 0x0\[\r\n\]+\\(y or n\\) " \
        "y"
@@ -196,7 +196,7 @@ gdb_test_no_output "set \$offset = 0x10000"
 
 # Load the object file.
 gdb_test "add-symbol-file ${binfile} \$offset" \
-       "Reading symbols from .*${testfile}\\.o\\.\\.\\.done\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
+       "Reading symbols from .*${testfile}\\.o\\.\\.\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
        "add-symbol-file ${testfile}.o \$offset" \
        "add symbol table from file \".*${testfile}\\.o\" at\[ \t\r\n\]+\.text_addr = 0x10000\[\r\n\]+\\(y or n\\) " \
        "y"
@@ -217,7 +217,7 @@ if { "${function_foo_addr}" == "${new_function_foo_addr}" } {
 set offset 0x10000
 clean_restart
 gdb_test "symbol-file -o $offset $binfile" \
-    "Reading symbols from ${binfile}\.\.\.done\." \
+    "Reading symbols from ${binfile}\.\.\." \
     "symbol-file with offset"
 
 # Make sure the address of a static variable is moved by offset.
@@ -241,7 +241,7 @@ gdb_assert {${new_function_foo_addr} == ${function_foo_addr} + $offset} \
 set offset 0x10000
 clean_restart
 gdb_test "add-symbol-file -o $offset $binfile" \
-    "Reading symbols from ${binfile}\.\.\.done\." \
+    "Reading symbols from ${binfile}\.\.\." \
     "add-symbol-file with offset" \
     "add symbol table from file \".*${testfile}\\.o\" with all sections offset by $offset\[\r\n\]+\\(y or n\\) " \
     "y"
@@ -266,7 +266,7 @@ gdb_assert { ${new_function_foo_addr} == ${function_foo_addr} + $offset } \
 set text [ format "0x%x" [expr ${function_foo_addr} + 0x20000] ]
 clean_restart
 gdb_test "add-symbol-file $binfile -o $offset $text" \
-    "Reading symbols from ${binfile}\.\.\.done\." \
+    "Reading symbols from ${binfile}\.\.\." \
     "add-symbol-file with offset, text address given" \
     "add symbol table from file \".*${testfile}\\.o\" at\[ \t\r\n\]+\.text_addr = ${text}\[\r\n\]+with other sections offset by ${offset}\[\r\n\]+\\(y or n\\) " \
     "y"
@@ -281,7 +281,7 @@ gdb_assert { ${function_foo_addr} != ${new_function_foo_addr} } \
 set data [ format "0x%x" [expr ${global_foo_addr} + 0x20000] ]
 clean_restart
 gdb_test "add-symbol-file $binfile -o $offset -s .data $data" \
-    "Reading symbols from ${binfile}\.\.\.done\." \
+    "Reading symbols from ${binfile}\.\.\." \
     "add-symbol-file with offset, data address given" \
     "add symbol table from file \".*${testfile}\\.o\" at\[ \t\r\n\]+\.data_addr = ${data}\[\r\n\]+with other sections offset by ${offset}\[\r\n\]+\\(y or n\\) " \
     "y"

diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/sepdebug.exp
index 5baf151789d48f572df6c208a8f520cc19073979..8c790d0d9190d23efcba6879b7a16ad39c438202 100644 (file)
--- a/gdb/testsuite/gdb.base/sepdebug.exp
+++ b/gdb/testsuite/gdb.base/sepdebug.exp
@@ -660,7 +660,7 @@ if {[build_executable sepdebug.exp sepdebug2 sepdebug2.c debug] != -1
 
     set escapedobjdirsubdir [string_to_regexp [standard_output_file {}]]
 
-    gdb_test "file [standard_output_file sepdebug2]" "warning: the debug information found in \"${escapedobjdirsubdir}/sepdebug2\\.debug\" does not match \"${escapedobjdirsubdir}/sepdebug2\" \\(CRC mismatch\\)\\..*\\(no debugging symbols found\\).*" "CRC mismatch is reported"
+    gdb_test "file [standard_output_file sepdebug2]" "warning: the debug information found in \"${escapedobjdirsubdir}/sepdebug2\\.debug\" does not match \"${escapedobjdirsubdir}/sepdebug2\" \\(CRC mismatch\\)\\..*\\(No debugging symbols found in .*\\).*" "CRC mismatch is reported"
 }
 
 

diff --git a/gdb/testsuite/gdb.base/sym-file.exp b/gdb/testsuite/gdb.base/sym-file.exp
index 6b12026acc2a3604bd29c9be829522619f9664d5..4add7a4f1748de3f8b40d54d42316a23efec0c9a 100644 (file)
--- a/gdb/testsuite/gdb.base/sym-file.exp
+++ b/gdb/testsuite/gdb.base/sym-file.exp
@@ -93,7 +93,7 @@ if {!$result} then {
 
 # 3) Add the library's symbols using 'add-symbol-file'.
 set result [gdb_test "add-symbol-file ${lib_syms} addr" \
-                    "Reading symbols from .*${lib_syms}\\.\\.\\.done\\." \
+                    "Reading symbols from .*${lib_syms}\\.\\.\\." \
                     "add-symbol-file ${lib_basename}.so addr" \
                     "add symbol table from file \".*${lib_basename}\\.so\"\
  at.*\\(y or n\\) " \
@@ -177,7 +177,7 @@ with_test_prefix "stale bkpts" {
 
     # Load the library's symbols.
     gdb_test "add-symbol-file ${lib_syms} addr" \
-       "Reading symbols from .*${lib_syms}\\.\\.\\.done\\." \
+       "Reading symbols from .*${lib_syms}\\.\\.\\." \
        "add-symbol-file ${lib_basename}.so addr" \
        "add symbol table from file \".*${lib_syms}\"\
 at.*\\(y or n\\) " \

diff --git a/gdb/testsuite/gdb.cp/cp-relocate.exp b/gdb/testsuite/gdb.cp/cp-relocate.exp
index 63d2ad476d27958fc6d4cf5a5d6ec6758a7d25d9..d07fd9e158fc2fc3fa42adb5ec82aff40061967d 100644 (file)
--- a/gdb/testsuite/gdb.cp/cp-relocate.exp
+++ b/gdb/testsuite/gdb.cp/cp-relocate.exp
@@ -123,7 +123,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 
 gdb_test "add-symbol-file ${binfile} 0 -s ${func1_sec} 0x10000 -s ${func2_sec} 0x20000" \
-       "Reading symbols from .*${testfile}\\.o\\.\\.\\.done\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
+       "Reading symbols from .*${testfile}\\.o\\.\\.\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
        "add-symbol-file ${testfile}.o" \
        "add symbol table from file \".*${testfile}\\.o\" at.*\\(y or n\\) " \
        "y"

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp b/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp
index 54da2b4c0328b7fd10a4e21b2da26f163778c7e5..e8474ad0a38b90b64eb401a97b7cf907f8f463c0 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp
@@ -37,7 +37,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile_outer}" "${binfile_outer}" \
 clean_restart $executable_outer
 
 gdb_test "add-symbol-file $binfile_inner outer_inner" \
-         {Reading symbols from .*\.\.\.done\.} "add-symbol-file" \
+         {Reading symbols from .*\.\.\.} "add-symbol-file" \
         "\r\n\t\\.text_addr = 0x\[0-9a-f\]+\r\n\\(y or n\\) \$" "y"
 
 # Expand symtab for ${binfile_outer}.

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp b/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp
index 5be51f435696fdc34d389cd42f39207bffbfa684..cce8b4dd1165418fb1e6b1f5dd87e0f262949d23 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp
@@ -38,7 +38,7 @@ if [is_remote host] {
     }
 }
 gdb_test_no_output "set complaints 100"
-gdb_test "file $binfile" {Reading symbols from .*\.\.\.location description stack underflow\r\nlocation description stack overflow\r\ndone\.} "check partial symtab errors"
+gdb_test "file $binfile" {Reading symbols from .*\.\.\.\r\nlocation description stack underflow\r\nlocation description stack overflow} "check partial symtab errors"
 
 gdb_test "p underflow" {Asked for position 0 of stack, stack only has 0 elements on it\.}
 gdb_test "p overflow" " = 2"

diff --git a/gdb/testsuite/gdb.linespec/linespec.exp b/gdb/testsuite/gdb.linespec/linespec.exp
index 6dba93ee3cc5be0c82cdca019e3502fe79b5fb16..f1de642f23a054aafc936c8b7cb49b7049f074cd 100644 (file)
--- a/gdb/testsuite/gdb.linespec/linespec.exp
+++ b/gdb/testsuite/gdb.linespec/linespec.exp
@@ -210,7 +210,7 @@ gdb_test "inferior 2" "Switching to inferior 2 .*" \
 # Note that in particular this should not cause errors when re-setting
 # breakpoints.
 gdb_test "file $binfile" \
-    "Reading symbols from .*done." \
+    "Reading symbols from .*" \
     "set the new inferior file for linespec tests"
 
 gdb_test "break main" \

diff --git a/gdb/testsuite/gdb.mi/mi-cli.exp b/gdb/testsuite/gdb.mi/mi-cli.exp
index 6ce6439eb778b7571d9ca92c3414607ddda74020..8ef2a45403787c460c32b56d014da45631dbae77 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi-cli.exp
@@ -56,7 +56,7 @@ mi_gdb_test "-interpreter-exec console bogus" \
 #   {(=.*)+\^done} \
 #   "-interpreter-exec console \"file \$binfile\""
 mi_gdb_test "-interpreter-exec console \"file $binfile\"" \
-  {~"Reading symbols from .*mi-cli...".*\^done} \
+  {~"Reading symbols from .*mi-cli...\\n".*} \
   "-interpreter-exec console \"file \$binfile\""
 
 mi_run_to_main

diff --git a/gdb/testsuite/gdb.multi/remove-inferiors.exp b/gdb/testsuite/gdb.multi/remove-inferiors.exp
index a336c6de4ecbe3bd9facfafec30b04e82c4fc733..16de2d62321d648d00f22b599080b167f65e37ef 100644 (file)
--- a/gdb/testsuite/gdb.multi/remove-inferiors.exp
+++ b/gdb/testsuite/gdb.multi/remove-inferiors.exp
@@ -49,7 +49,7 @@ proc test_remove_inferiors { } {
     # Load binfile and start the inferior.
     set binfile_re [string_to_regexp ${binfile}]
     gdb_test "file ${binfile}" \
-            "Reading symbols from ${binfile_re}...done." \
+            "Reading symbols from ${binfile_re}..." \
             "load binary"
 
     if {![runto_main]} {

diff --git a/gdb/testsuite/gdb.python/py-section-script.exp b/gdb/testsuite/gdb.python/py-section-script.exp
index bf75ef578aa97e8468f2f34aeec568c66da6cfb9..b0e37ed4a2d81135229ec2c28b605fa9079e1cc2 100644 (file)
--- a/gdb/testsuite/gdb.python/py-section-script.exp
+++ b/gdb/testsuite/gdb.python/py-section-script.exp
@@ -140,7 +140,7 @@ with_test_prefix "sepdebug" {
        -re "\r\nwarning: Invalid entry in \\.debug_gdb_scripts section.*\r\n$gdb_prompt $" {
            fail $test
        }
-       -re "done\\.\r\n$gdb_prompt $" {
+       -re "\r\n$gdb_prompt $" {
            pass $test
        }
     }

diff --git a/gdb/testsuite/gdb.server/solib-list.exp b/gdb/testsuite/gdb.server/solib-list.exp
index 53b3c6749a12781d48538e0547f537eb07ff98d0..6fbaa834e2fbef0a5987f5d444f56a573c53b53b 100644 (file)
--- a/gdb/testsuite/gdb.server/solib-list.exp
+++ b/gdb/testsuite/gdb.server/solib-list.exp
@@ -88,7 +88,7 @@ foreach nonstop { 0 1 } { with_test_prefix "non-stop $nonstop" {
     # but before "target remote" below so that qSymbol data get already
     # initialized from BINFILE (and not from ld.so first needing a change to
     # BINFILE later).
-    gdb_test "file ${binfile}" {Reading symbols from .*\.\.\.done\..*} "file binfile" \
+    gdb_test "file ${binfile}" {Reading symbols from .*\.\.\..*} "file binfile" \
             {(Are you sure you want to change the file|Load new symbol table from ".*")\? \(y or n\) } "y"
 
     set test "target $gdbserver_protocol"

diff --git a/gdb/testsuite/gdb.stabs/weird.exp b/gdb/testsuite/gdb.stabs/weird.exp
index 2806dfd8828bfdfd79778c5959de26c3ce4f6bac..595b0c829935c89575d696aa1f250fabebb4d16f 100644 (file)
--- a/gdb/testsuite/gdb.stabs/weird.exp
+++ b/gdb/testsuite/gdb.stabs/weird.exp
@@ -301,7 +301,7 @@ gdb_expect 60 {
        send_gdb "y\n"
        exp_continue
     }
-    -re "^Reading symbols from .*$binfile_re\\.\\.\\.done\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)\r\n$gdb_prompt $" {
+    -re "^Reading symbols from .*$binfile_re\\.\\.\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)\r\n$gdb_prompt $" {
        pass "weirdx.o read without error"
     }
     -re ".*$gdb_prompt $" {

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index fbdb436e331d2d9d1fced3eb4612e6fed9c0e294..e91a3c8d3af0cf7bdad482d463c73b92a3af48a0 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -1523,17 +1523,17 @@ proc gdb_file_cmd { arg } {
 
     send_gdb "file $arg\n"
     gdb_expect 120 {
-       -re "Reading symbols from.*LZMA support was disabled.*done.*$gdb_prompt $" {
+       -re "Reading symbols from.*LZMA support was disabled.*$gdb_prompt $" {
            verbose "\t\tLoaded $arg into $GDB; .gnu_debugdata found but no LZMA available"
            set gdb_file_cmd_debug_info "lzma"
            return 0
        }
-       -re "Reading symbols from.*no debugging symbols found.*done.*$gdb_prompt $" {
+       -re "Reading symbols from.*no debugging symbols found.*$gdb_prompt $" {
            verbose "\t\tLoaded $arg into $GDB with no debugging symbols"
            set gdb_file_cmd_debug_info "nodebug"
            return 0
        }
-        -re "Reading symbols from.*done.*$gdb_prompt $" {
+        -re "Reading symbols from.*$gdb_prompt $" {
             verbose "\t\tLoaded $arg into $GDB"
            set gdb_file_cmd_debug_info "debug"
            return 0
@@ -1541,7 +1541,7 @@ proc gdb_file_cmd { arg } {
         -re "Load new symbol table from \".*\".*y or n. $" {
             send_gdb "y\n"
             gdb_expect 120 {
-                -re "Reading symbols from.*done.*$gdb_prompt $" {
+                -re "Reading symbols from.*$gdb_prompt $" {
                     verbose "\t\tLoaded $arg with new symbol table into $GDB"
                    set gdb_file_cmd_debug_info "debug"
                    return 0

diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index bf9f613985a97f0985e1144941ba8e584b09165f..235d03e90221f9b27a6f9be0dbd2a0ce2b5a85b5 100644 (file)
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -504,7 +504,7 @@ proc mi_gdb_file_cmd { arg } {
 # output.  Queries are an error for mi.
     send_gdb "105-file-exec-and-symbols $arg\n"
     gdb_expect 120 {
-       -re "Reading symbols from.*done.*$mi_gdb_prompt$" {
+       -re "Reading symbols from.*$mi_gdb_prompt$" {
            verbose "\t\tLoaded $arg into the $GDB"
            return 0
        }
@@ -515,7 +515,7 @@ proc mi_gdb_file_cmd { arg } {
        -re "Load new symbol table from \".*\".*y or n. $" {
            send_gdb "y\n"
            gdb_expect 120 {
-               -re "Reading symbols from.*done.*$mi_gdb_prompt$" {
+               -re "Reading symbols from.*$mi_gdb_prompt$" {
                    verbose "\t\tLoaded $arg with new symbol table into $GDB"
                    # All OK
                }