[PATCH 1/2] gdb/testsuite: fix test crc_mismatch.exp with -readnow

[PATCH 1/2] gdb/testsuite: fix test crc_mismatch.exp with -readnow

[Jan Vrany]

Test crc_mismatch.exp fails when using -readnow. This is because in that
case GDB outputs "Expanding full symbols..." after "Reading symbols from
...".

Fix this by updating the test.
---
 gdb/testsuite/gdb.debuginfod/crc_mismatch.exp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp b/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp
index 0d19f7fb7e8..ce154044a38 100644
--- a/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp
+++ b/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp
@@ -64,7 +64,7 @@ if {[build_executable crc_mismatch.exp crc_mismatch-2 crc_mismatch-2.c debug] !=
     gdb_test "file [standard_output_file crc_mismatch-2]" \
 	[multi_line \
 	     "Reading symbols from ${escapedobjdirsubdir}/crc_mismatch-2\\.\\.\\." \
-	     "warning: the debug information found in \"${escapedobjdirsubdir}/crc_mismatch-2\\.debug\" does not match \"${escapedobjdirsubdir}/crc_mismatch-2\" \\(CRC mismatch\\)\\." \
+	     "warning: the debug information found in \"${escapedobjdirsubdir}/crc_mismatch-2\\.debug\" does not match \"${escapedobjdirsubdir}/crc_mismatch-2\" \\(CRC mismatch\\)\\.(?:\r\nExpanding full symbols from \[^\r\n\]+)*" \
 	     "\\(No debugging symbols found in .*\\)"] \
 	"CRC mismatch is reported"
 
@@ -80,7 +80,7 @@ if {[build_executable crc_mismatch.exp crc_mismatch-2 crc_mismatch-2.c debug] !=
 	    gdb_test "file [standard_output_file crc_mismatch-2]" \
 		[multi_line \
 		     "Reading symbols from ${exe_file_re}\\.\\.\\." \
-		     "warning: the debug information found in \"${debug_file_re}\" does not match \"${exe_file_re}\" \\(CRC mismatch\\)\\." \
+		     "warning: the debug information found in \"${debug_file_re}\" does not match \"${exe_file_re}\" \\(CRC mismatch\\)\\.(?:\r\nExpanding full symbols from \[^\r\n\]+)*" \
 		     "\\(No debugging symbols found in \[^\r\n\]+\\)"] \
 		"CRC mismatch is reported"
 	}
-- 
2.51.0

[PATCH 2/2] db/testsuite: fix test build-id-no-debug-warning.exp with -readnow

[Jan Vrany]

Test build-id-no-debug-warning.exp fails when using -readnow. This is
because in that case GDB outputs "Expanding full symbols from..." after
"Reading symbols from ...".

Fix this by updating the test.
---
 gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 cfd1a275d89..4fabc9931b4 100644
--- a/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp
+++ b/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp
@@ -82,7 +82,7 @@ set debug_file_re [string_to_regexp $build_id_debug_file]
 gdb_test "file ${build_id_debug_file}" \
     [multi_line \
 	 "Reading symbols from $debug_file_re\\.\\.\\." \
-	 "warning: \"$debug_file_re\": separate debug info file has no debug info" \
+	 "warning: \"$debug_file_re\": separate debug info file has no debug info(?:\r\nExpanding full symbols from \[^\r\n\]+)*" \
 	 "\\(No debugging symbols found in \[^\r\n\]+\\)"] \
     "load test file, expect a warning"
 
@@ -101,7 +101,7 @@ with_test_prefix "check styling" {
 	gdb_test "file ${build_id_debug_file}" \
 	    [multi_line \
 		 "Reading symbols from $debug_file_re\\.\\.\\." \
-		 "warning: \"$debug_file_re\": separate debug info file has no debug info" \
+		 "warning: \"$debug_file_re\": separate debug info file has no debug info(?:\r\nExpanding full symbols from \[^\r\n\]+)*" \
 		 "\\(No debugging symbols found in \[^\r\n\]+\\)"] \
 	    "load test file, expect a warning"
     }
-- 
2.51.0

Re: [PATCH 2/2] db/testsuite: fix test build-id-no-debug-warning.exp with -readnow

[Tom Tromey]

>>>>> "Jan" == Jan Vrany <jan.vrany@labware.com> writes:

Jan> Test build-id-no-debug-warning.exp fails when using -readnow. This is
Jan> because in that case GDB outputs "Expanding full symbols from..." after
Jan> "Reading symbols from ...".

Jan> Fix this by updating the test.

Thanks.
Approved-By: Tom Tromey <tom@tromey.com>

Tom

Re: [PATCH 1/2] gdb/testsuite: fix test crc_mismatch.exp with -readnow

[Tom Tromey]

>>>>> "Jan" == Jan Vrany <jan.vrany@labware.com> writes:

Jan> Test crc_mismatch.exp fails when using -readnow. This is because in that
Jan> case GDB outputs "Expanding full symbols..." after "Reading symbols from
Jan> ...".

I guess this code doesn't use gdb_file_command because it 's looking for
a certain warning.

Anyway this seems fine, thanks.
Approved-By: Tom Tromey <tom@tromey.com>

Tom