diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 023f5a815c..850607c054 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-04-10 Tom de Vries + + * gdb.base/style.exp: Expect "Expanding full symbols" message for + -readnow. + 2020-04-10 Tom de Vries PR cli/25808 diff --git a/gdb/testsuite/gdb.base/style.exp b/gdb/testsuite/gdb.base/style.exp index 1071b023aa..129f1746a3 100644 --- a/gdb/testsuite/gdb.base/style.exp +++ b/gdb/testsuite/gdb.base/style.exp @@ -34,6 +34,8 @@ save_vars { env(TERM) } { return -1 } + set readnow [readnow] + if {![runto_main]} { fail "style tests failed" return @@ -140,8 +142,15 @@ save_vars { env(TERM) } { ] set quoted [string_to_regexp $binfile] + set pass_re "Reading symbols from [style $quoted file]\.\.\." + if { $readnow } { + set pass_re \ + [multi_line \ + $pass_re \ + "Expanding full symbols from [style $quoted file]\.\.\."] + } gdb_test "file $binfile" \ - "Reading symbols from [style $quoted file]..." \ + $pass_re \ "filename is styled when loading symbol file" gdb_test "pwd" "Working directory [style .*? file].*"