From 6dc532e90e4c662b19988696b877a4d0dd09239a Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 9 Dec 2020 20:04:58 -0800 Subject: [PATCH] Removes Main config loader from test runners This was accidental and can cause test failures. Make sure to not load arguments from Main config for these --- Source/Tests/IRLoader.cpp | 1 - Source/Tests/TestHarness.cpp | 1 - Source/Tests/TestHarnessRunner.cpp | 1 - 3 files changed, 3 deletions(-) diff --git a/Source/Tests/IRLoader.cpp b/Source/Tests/IRLoader.cpp index b75d42b55..cd7a76da1 100644 --- a/Source/Tests/IRLoader.cpp +++ b/Source/Tests/IRLoader.cpp @@ -98,7 +98,6 @@ int main(int argc, char **argv, char **const envp) { LogMan::Msg::InstallHandler(MsgHandler); FEXCore::Config::Initialize(); - FEXCore::Config::AddLayer(std::make_unique()); FEXCore::Config::AddLayer(std::make_unique(argc, argv)); FEXCore::Config::AddLayer(std::make_unique(envp)); FEXCore::Config::Load(); diff --git a/Source/Tests/TestHarness.cpp b/Source/Tests/TestHarness.cpp index 3c4110214..ffcb03372 100644 --- a/Source/Tests/TestHarness.cpp +++ b/Source/Tests/TestHarness.cpp @@ -52,7 +52,6 @@ int main(int argc, char **argv) { LogMan::Msg::InstallHandler(MsgHandler); FEXCore::Config::Initialize(); - FEXCore::Config::AddLayer(std::make_unique()); FEXCore::Config::AddLayer(std::make_unique(argc, argv)); FEXCore::Config::Load(); diff --git a/Source/Tests/TestHarnessRunner.cpp b/Source/Tests/TestHarnessRunner.cpp index 80e7daedd..db5c6c6c3 100644 --- a/Source/Tests/TestHarnessRunner.cpp +++ b/Source/Tests/TestHarnessRunner.cpp @@ -53,7 +53,6 @@ int main(int argc, char **argv, char **const envp) { LogMan::Throw::InstallHandler(AssertHandler); LogMan::Msg::InstallHandler(MsgHandler); FEXCore::Config::Initialize(); - FEXCore::Config::AddLayer(std::make_unique()); FEXCore::Config::AddLayer(std::make_unique(argc, argv)); FEXCore::Config::AddLayer(std::make_unique(envp)); FEXCore::Config::Load();