From e7bd7fba34ae1f892acf1e13ac86fca55b68026d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 13 May 2019 09:35:19 -0600 Subject: [PATCH] Add file name styling to "info sharedlibrary" This changes "info sharedlibrary" to add styling to the file name. Tested on x86-64 Fedora 29. gdb/ChangeLog 2019-05-14 Tom Tromey * solib.c (info_sharedlibrary_command): Style the file name. gdb/testsuite/ChangeLog 2019-05-14 Tom Tromey * gdb.base/info-shared.exp (check_info_shared): Add "info shared" styling test. --- gdb/ChangeLog | 4 ++++ gdb/solib.c | 2 +- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/info-shared.exp | 24 ++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 44646f50d5b..095a6c2d635 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2019-05-14 Tom Tromey + + * solib.c (info_sharedlibrary_command): Style the file name. + 2019-05-14 Alan Hayward * aarch64-tdep.c (aarch64_vnh_type): Add half view. diff --git a/gdb/solib.c b/gdb/solib.c index 25555af2939..e0b1a921f82 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -1104,7 +1104,7 @@ info_sharedlibrary_command (const char *pattern, int from_tty) else uiout->field_string ("syms-read", so->symbols_loaded ? "Yes" : "No"); - uiout->field_string ("name", so->so_name); + uiout->field_string ("name", so->so_name, ui_out_style_kind::FILE); uiout->text ("\n"); } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index d8847bc119b..071c638e531 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-05-14 Tom Tromey + + * gdb.base/info-shared.exp (check_info_shared): Add "info shared" + styling test. + 2019-05-14 Tom de Vries * gdb.dwarf2/dw2-skip-prologue.S (.debug_loc): Fix base address diff --git a/gdb/testsuite/gdb.base/info-shared.exp b/gdb/testsuite/gdb.base/info-shared.exp index eb5ee9562ef..e1314bf5dd7 100644 --- a/gdb/testsuite/gdb.base/info-shared.exp +++ b/gdb/testsuite/gdb.base/info-shared.exp @@ -144,3 +144,27 @@ check_info_shared "info sharedlibrary #7" 0 1 # Run to the last stop and check that both libraries are gone. gdb_continue_to_breakpoint "library unload #2" "\\.?stop .*" check_info_shared "info sharedlibrary #8" 0 0 + +with_test_prefix styled { + save_vars { env(TERM) } { + # We need an ANSI-capable terminal to get the output. + setenv TERM ansi + + clean_restart $testfile + + gdb_test_no_output "set style enabled off" + if {![runto_main]} { + return 0 + } + gdb_breakpoint "stop" + gdb_continue_to_breakpoint "library load #1" "\\.?stop .*" + + # Simple test for "info sharedlibrary" styling. Look for styled + # addresses and file name. + set addr "\033\\\[34m${hex}\033\\\[m" + set sofile "\033\\\[32m\[^\033\]+\033\\\[m" + gdb_test_no_output "set style enabled on" + gdb_test "info sharedlibrary" \ + "$addr\[ \t\]+$addr.*$sofile\r\n.*" + } +} -- 2.30.2