[PATCH 3/3] [gdb/symtab] Note success at debuginfod verbose level 2

[Tom de Vries <tdevries@suse.de>]

Expand debuginfod verbose level 2 by also mentioning download successes:
...
Downloading separate debug info for crc_mismatch-2...^M
Download succeeded: separate debug info for crc_mismatch-2.^M
Reading symbols from $client_cache/$hex/debuginfo...^M
...

Tested on x86_64-linux.
---
 gdb/debuginfod-support.c                               |  8 ++++++++
 .../gdb.debuginfod/build-id-no-debug-warning.exp       |  2 ++
 gdb/testsuite/gdb.debuginfod/crc_mismatch.exp          | 10 +++++++---
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c
index e65afb7523f..fe735756f72 100644
--- a/gdb/debuginfod-support.c
+++ b/gdb/debuginfod-support.c
@@ -297,6 +297,14 @@ print_outcome (int fd, const char *desc, const char *fname)
 		  desc,
 		  styled_string (file_name_style.style (), fname));
     }
+  if (fd >= 0 && debuginfod_verbose >= 2)
+    {
+      ui_file *outstream = get_unbuffered (gdb_stdout);
+      gdb_printf (outstream,
+		  _("Download succeeded: %s %ps.\n"),
+		  desc,
+		  styled_string (file_name_style.style (), fname));
+    }
 }
 
 /* See debuginfod-support.h  */
diff --git a/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp b/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp
index d63957ac05c..1f80dee9e33 100644
--- a/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp
+++ b/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp
@@ -156,6 +156,8 @@ proc_with_prefix local_debuginfod { } {
 	[multi_line \
 	     "Reading symbols from ${build_id_debug_file}\\.\\.\\." \
 	     "Downloading separate debug info for ${build_id_debug_file}\\.\\.\\." \
+	     [string_to_regexp \
+		  "Download succeeded: separate debug info for ${build_id_debug_file}."] \
 	     "Reading symbols from ${cache}/\[^\r\n\]+\\.\\.\\.(?:\r\nExpanding full symbols from \[^\r\n\]+)*"] \
 	"debuginfod running, info downloaded, no warnings"
 }
diff --git a/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp b/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp
index 6dcabf60357..8391e8f4a01 100644
--- a/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp
+++ b/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp
@@ -126,10 +126,14 @@ proc_with_prefix local_debuginfod { } {
 
     # CRC mismatch should not be reported now because the correct debuginfo
     # should be fetched from debuginfod.
-    gdb_test "file [standard_output_file crc_mismatch-2]" \
+    set binfile2 [standard_output_file crc_mismatch-2]
+    gdb_test "file $binfile2" \
 	[multi_line \
-	     "Reading symbols from ${escapedobjdirsubdir}/crc_mismatch-2\\.\\.\\." \
-	     "Downloading.*separate debug info for ${escapedobjdirsubdir}/crc_mismatch-2\\.\\.\\." \
+	     [string_to_regexp "Reading symbols from $binfile2..."] \
+	     [string_to_regexp \
+		  "Downloading separate debug info for $binfile2..."] \
+	     [string_to_regexp \
+		  "Download succeeded: separate debug info for $binfile2."] \
 	     "Reading symbols from ${cache}/\[^\r\n\]+\\.\\.\\.(?:\r\nExpanding full symbols from \[^\r\n\]+)*"] \
 	 "debuginfod running, info downloaded, no CRC mismatch"
 }
-- 
2.35.3