From 8087c3fa8b5d695e3e29e69d70d0b35ec902ac59 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Sat, 12 Sep 2020 12:30:56 -0700 Subject: [PATCH] Fix GDB build in infrun.c when configured with unit tests disabled I noticed this while testing the GDB in the context of the upcoming GDB 10 release branching, because part of the process involves setting development to False, which in turn changes the default for including unittest to false as well. As a result, without this patch, we get compilation errors in infrun.c such as: infrun.c:9219:5: error: `scoped_mock_context' was not declared in this scope This patch fixes it by bracketing the unitttest in namespace selftest with an #if GDB_SELF_TEST. gdb/ChangeLog: * infrun.c (namespace selftests): Only define #if GDB_SELF_TEST. Tested on x86_64-linux, with and without self-tests. --- gdb/ChangeLog | 4 ++++ gdb/infrun.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6b1563a111..ec0ed5f1b2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2020-09-12 Joel Brobecker + + * infrun.c (namespace selftests): Only define #if GDB_SELF_TEST. + 2020-09-11 Moritz Riesterer Felix Willgerodt diff --git a/gdb/infrun.c b/gdb/infrun.c index 82ec30086a..5773fd0395 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -9200,6 +9200,7 @@ infrun_async_inferior_event_handler (gdb_client_data data) inferior_event_handler (INF_REG_EVENT); } +#if GDB_SELF_TEST namespace selftests { @@ -9264,6 +9265,8 @@ infrun_thread_ptid_changed () } /* namespace selftests */ +#endif /* GDB_SELF_TEST */ + void _initialize_infrun (); void _initialize_infrun () -- 2.34.1