From 0ea357b04cb02dd3a49b59bc349525626f061279 Mon Sep 17 00:00:00 2001
From: Edward d'Auvergne <edward@nmr-relax.com>
Date: Tue, 12 Jun 2018 14:28:23 +0200
Subject: [PATCH] TestSuite: Improved memory management for the event manager.

In the initTestGlobals() helper function, the event manager is added to the subsystem manager (both
created by the FGGlobals ctor).  This allows the event manager to be destroyed via the subsystem
manager in the FGGlobals dtor.
---
 test_suite/FGTestApi/globals.cxx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test_suite/FGTestApi/globals.cxx b/test_suite/FGTestApi/globals.cxx
index 21f759f3b..cb0257727 100644
--- a/test_suite/FGTestApi/globals.cxx
+++ b/test_suite/FGTestApi/globals.cxx
@@ -13,6 +13,7 @@
 
 #include <Time/TimeManager.hxx>
 
+#include <simgear/structure/event_mgr.hxx>
 #include <simgear/timing/timestamp.hxx>
 
 
@@ -46,6 +47,14 @@ void initTestGlobals(const std::string& testName)
     std::unique_ptr<TimeManager> t;
     t.reset(new TimeManager);
     t->init(); // establish mag-var data
+
+    /**
+     * Both the event manager and subsystem manager are initialised by the
+     * FGGlobals ctor, but only the subsystem manager is destroyed by the dtor.
+     * Here the event manager is added to the subsystem manager so it can be
+     * destroyed via the subsystem manager.
+     */
+    globals->add_subsystem("events", globals->get_event_mgr(), SGSubsystemMgr::DISPLAY);
 }
 
 }  // End of namespace setUp.