From f5c4b229c67d9ef2e79ba86432a409a8f506b3f6 Mon Sep 17 00:00:00 2001 From: Jan Vrany Date: Fri, 9 Oct 2020 06:47:30 +0100 Subject: [PATCH] Notify observers that directories have changed when using "directory" CLI command gdb/ChangeLog * source.c (directory_command): Notify observers that "directories" parameter has changed. gdb/testsuite/ChangeLog * gdb.mi/mi-cmd-param-changed.exp: Check that notification is is emmited for both 'set directories' and 'directory' commands. --- gdb/ChangeLog | 5 +++++ gdb/source.c | 11 +++++++++-- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp | 11 +++++++++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cba2c27c0e1..4927c895fa0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-10-09 Jan Vrany + + * source.c (directory_command): Notify observers that "directories" + parameter has changed. + 2020-10-08 Tom Tromey * cli/cli-cmds.c (print_disassembly): Style function name and diff --git a/gdb/source.c b/gdb/source.c index 0c2b5a4f83d..a73a31f644c 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -446,6 +446,7 @@ init_source_path (void) static void directory_command (const char *dirname, int from_tty) { + bool value_changed = false; dont_repeat (); /* FIXME, this goes to "delete dir"... */ if (dirname == 0) @@ -454,15 +455,21 @@ directory_command (const char *dirname, int from_tty) { xfree (source_path); init_source_path (); + value_changed = true; } } else { mod_path (dirname, &source_path); forget_cached_source_info (); + value_changed = true; + } + if (value_changed) + { + gdb::observers::command_param_changed.notify ("directories", source_path); + if (from_tty) + show_directories_1 ((char *) 0, from_tty); } - if (from_tty) - show_directories_1 ((char *) 0, from_tty); } /* Add a path given with the -d command line switch. diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 075fe2ff5a3..3d88199c63c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-10-09 Jan Vrany + + * gdb.mi/mi-cmd-param-changed.exp: Check that notification is + is emmited for both 'set directories' and 'directory' commands. + 2020-10-08 Tom Tromey * gdb.base/style.exp: Check that "main"'s name is styled. diff --git a/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp b/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp index 031d396dbab..2d653c0e801 100644 --- a/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp +++ b/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp @@ -102,6 +102,17 @@ proc test_command_param_changed { } { ".*=cmd-param-changed,param=\"check type\",value=\"on\".*\\^done" \ "\"set ch type on\"" + # Notification is emitted for both 'set directories' and 'directory'. + mi_gdb_test "set directories \$cdir:\$cwd:/tmp" \ + ".*=cmd-param-changed,param=\"directories\",value=\".*\".*\\^done" \ + "\"set directories \$cdir:\$cwd:/tmp\"" + mi_gdb_test "directory /usr/src/gdb" \ + ".*=cmd-param-changed,param=\"directories\",value=\".*\".*\\^done" \ + "\"directory /usr/src/gdb\"" + mi_gdb_test "directory" \ + ".*=cmd-param-changed,param=\"directories\",value=\".*\".*\\^done" \ + "\"directory\"" + mi_gdb_exit } } -- 2.30.2