diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2017-06-18 12:57:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-18 12:57:57 -0700 |
| commit | 72d5dd754a1749e20dd5bacb6becf454082ece8b (patch) | |
| tree | 5bcc936a76a6cfad5de543bc971ec1eeff0cf5c5 /Source/UnitTests/Core | |
| parent | e63c33783049753784a24675bfa0792e54684fbd (diff) | |
| parent | 5243eae4e97f4d4152ea8681f038f8601a3f5715 (diff) | |
Merge pull request #5639 from leoetlino/unit-test-profile
UnitTests: Use a temporary profile directory
Diffstat (limited to 'Source/UnitTests/Core')
| -rw-r--r-- | Source/UnitTests/Core/CoreTimingTest.cpp | 9 | ||||
| -rw-r--r-- | Source/UnitTests/Core/MMIOTest.cpp | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/Source/UnitTests/Core/CoreTimingTest.cpp b/Source/UnitTests/Core/CoreTimingTest.cpp index 6f35bfff3c..ca2e08bb56 100644 --- a/Source/UnitTests/Core/CoreTimingTest.cpp +++ b/Source/UnitTests/Core/CoreTimingTest.cpp @@ -6,7 +6,9 @@ #include <array> #include <bitset> +#include <string> +#include "Common/FileUtil.h" #include "Core/Config/Config.h" #include "Core/ConfigManager.h" #include "Core/Core.h" @@ -35,10 +37,10 @@ void CallbackTemplate(u64 userdata, s64 lateness) class ScopeInit final { public: - ScopeInit() + ScopeInit() : m_profile_path(File::CreateTempDir()) { Core::DeclareAsCPUThread(); - UICommon::SetUserDirectory(""); + UICommon::SetUserDirectory(m_profile_path); Config::Init(); SConfig::Init(); PowerPC::Init(PowerPC::CORE_INTERPRETER); @@ -51,7 +53,10 @@ public: SConfig::Shutdown(); Config::Shutdown(); Core::UndeclareAsCPUThread(); + File::DeleteDirRecursively(m_profile_path); } +private: + std::string m_profile_path; }; static void AdvanceAndCheck(u32 idx, int downcount, int expected_lateness = 0, diff --git a/Source/UnitTests/Core/MMIOTest.cpp b/Source/UnitTests/Core/MMIOTest.cpp index f1a414045a..b54d82d27d 100644 --- a/Source/UnitTests/Core/MMIOTest.cpp +++ b/Source/UnitTests/Core/MMIOTest.cpp @@ -3,9 +3,11 @@ // Refer to the license.txt file included. #include <gtest/gtest.h> +#include <string> #include <unordered_set> #include "Common/CommonTypes.h" +#include "Common/FileUtil.h" #include "Core/Config/Config.h" #include "Core/HW/MMIO.h" #include "UICommon/UICommon.h" @@ -31,7 +33,8 @@ TEST(UniqueID, UniqueEnough) TEST(IsMMIOAddress, SpecialAddresses) { - UICommon::SetUserDirectory(""); + const std::string profile_path = File::CreateTempDir(); + UICommon::SetUserDirectory(profile_path); Config::Init(); SConfig::Init(); SConfig::GetInstance().bWii = true; @@ -56,6 +59,7 @@ TEST(IsMMIOAddress, SpecialAddresses) SConfig::Shutdown(); Config::Shutdown(); + File::DeleteDirRecursively(profile_path); } class MappingTest : public testing::Test |