Config: Integrate

2 files changed, 6 insertions, 0 deletions

diff --git a/Source/UnitTests/Core/CoreTimingTest.cpp b/Source/UnitTests/Core/CoreTimingTest.cpp
index fcec99c87d..f4cac5a6b6 100644
--- a/Source/UnitTests/Core/CoreTimingTest.cpp
+++ b/Source/UnitTests/Core/CoreTimingTest.cpp
@@ -7,6 +7,7 @@
 #include <array>
 #include <bitset>
 
+#include "Core/Config/Config.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
@@ -36,6 +37,7 @@ public:
   ScopeInit()
   {
     Core::DeclareAsCPUThread();
+    Config::Init();
     SConfig::Init();
     PowerPC::Init(PowerPC::CORE_INTERPRETER);
     CoreTiming::Init();
@@ -45,6 +47,7 @@ public:
     CoreTiming::Shutdown();
     PowerPC::Shutdown();
     SConfig::Shutdown();
+    Config::Shutdown();
     Core::UndeclareAsCPUThread();
   }
 };
diff --git a/Source/UnitTests/Core/MMIOTest.cpp b/Source/UnitTests/Core/MMIOTest.cpp
index fd48c786b2..f6b8cfad1e 100644
--- a/Source/UnitTests/Core/MMIOTest.cpp
+++ b/Source/UnitTests/Core/MMIOTest.cpp
@@ -6,6 +6,7 @@
 #include <unordered_set>
 
 #include "Common/CommonTypes.h"
+#include "Core/Config/Config.h"
 #include "Core/HW/MMIO.h"
 
 // Tests that the UniqueID function returns a "unique enough" identifier
@@ -29,6 +30,7 @@ TEST(UniqueID, UniqueEnough)
 
 TEST(IsMMIOAddress, SpecialAddresses)
 {
+  Config::Init();
   SConfig::Init();
   SConfig::GetInstance().bWii = true;
 
@@ -51,6 +53,7 @@ TEST(IsMMIOAddress, SpecialAddresses)
   EXPECT_TRUE(MMIO::IsMMIOAddress(0x0D800F10));  // Mirror of Wii MMIOs
 
   SConfig::Shutdown();
+  Config::Shutdown();
 }
 
 class MappingTest : public testing::Test