[pushed] Fix GDB build in infrun.c when configured with unit tests disabled

Joel Brobecker brobecker@adacore.com
Sat Sep 12 20:54:55 GMT 2020


Hello,

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.
Pushed to master.

Thanks,
-- 
Joel

---
 gdb/ChangeLog | 4 ++++
 gdb/infrun.c  | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6b1563a..ec0ed5f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2020-09-12  Joel Brobecker  <brobecker@adacore.com>
+
+	* infrun.c (namespace selftests): Only define #if GDB_SELF_TEST.
+
 2020-09-11  Moritz Riesterer  <moritz.riesterer@intel.com>
 	    Felix Willgerodt  <Felix.Willgerodt@intel.com>
 
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 82ec300..5773fd0 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.1.4



More information about the Gdb-patches mailing list