Merge pull request #9463 from Dentomologist/fix_CreateTempDir_calls

UnitTests: Add setup error checking
dolphin-emu · Jan 27, 2021 · bc14e4a · bc14e4a
2 parents 093978b + 83f912b
commit bc14e4a
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/Source/UnitTests/Core/CoreTimingTest.cpp b/Source/UnitTests/Core/CoreTimingTest.cpp
@@ -39,6 +39,10 @@ class ScopeInit final
 public:
   ScopeInit() : m_profile_path(File::CreateTempDir())
   {
+    if (!UserDirectoryExists())
+    {
+      return;
+    }
     Core::DeclareAsCPUThread();
     UICommon::SetUserDirectory(m_profile_path);
     Config::Init();
@@ -48,13 +52,18 @@ class ScopeInit final
   }
   ~ScopeInit()
   {
+    if (!UserDirectoryExists())
+    {
+      return;
+    }
     CoreTiming::Shutdown();
     PowerPC::Shutdown();
     SConfig::Shutdown();
     Config::Shutdown();
     Core::UndeclareAsCPUThread();
     File::DeleteDirRecursively(m_profile_path);
   }
+  bool UserDirectoryExists() const { return !m_profile_path.empty(); }
 
 private:
   std::string m_profile_path;
@@ -77,6 +86,7 @@ static void AdvanceAndCheck(u32 idx, int downcount, int expected_lateness = 0,
 TEST(CoreTiming, BasicOrder)
 {
   ScopeInit guard;
+  ASSERT_TRUE(guard.UserDirectoryExists());
 
   CoreTiming::EventType* cb_a = CoreTiming::RegisterEvent("callbackA", CallbackTemplate<0>);
   CoreTiming::EventType* cb_b = CoreTiming::RegisterEvent("callbackB", CallbackTemplate<1>);
@@ -127,6 +137,7 @@ TEST(CoreTiming, SharedSlot)
   using namespace SharedSlotTest;
 
   ScopeInit guard;
+  ASSERT_TRUE(guard.UserDirectoryExists());
 
   CoreTiming::EventType* cb_a = CoreTiming::RegisterEvent("callbackA", FifoCallback<0>);
   CoreTiming::EventType* cb_b = CoreTiming::RegisterEvent("callbackB", FifoCallback<1>);
@@ -156,6 +167,7 @@ TEST(CoreTiming, SharedSlot)
 TEST(CoreTiming, PredictableLateness)
 {
   ScopeInit guard;
+  ASSERT_TRUE(guard.UserDirectoryExists());
 
   CoreTiming::EventType* cb_a = CoreTiming::RegisterEvent("callbackA", CallbackTemplate<0>);
   CoreTiming::EventType* cb_b = CoreTiming::RegisterEvent("callbackB", CallbackTemplate<1>);
@@ -190,6 +202,7 @@ TEST(CoreTiming, ChainScheduling)
   using namespace ChainSchedulingTest;
 
   ScopeInit guard;
+  ASSERT_TRUE(guard.UserDirectoryExists());
 
   CoreTiming::EventType* cb_a = CoreTiming::RegisterEvent("callbackA", CallbackTemplate<0>);
   CoreTiming::EventType* cb_b = CoreTiming::RegisterEvent("callbackB", CallbackTemplate<1>);
@@ -245,6 +258,7 @@ TEST(CoreTiming, ScheduleIntoPast)
   using namespace ScheduleIntoPastTest;
 
   ScopeInit guard;
+  ASSERT_TRUE(guard.UserDirectoryExists());
 
   s_cb_next = CoreTiming::RegisterEvent("callbackA", CallbackTemplate<0>);
   CoreTiming::EventType* cb_b = CoreTiming::RegisterEvent("callbackB", CallbackTemplate<1>);
@@ -282,6 +296,7 @@ TEST(CoreTiming, ScheduleIntoPast)
 TEST(CoreTiming, Overclocking)
 {
   ScopeInit guard;
+  ASSERT_TRUE(guard.UserDirectoryExists());
 
   CoreTiming::EventType* cb_a = CoreTiming::RegisterEvent("callbackA", CallbackTemplate<0>);
   CoreTiming::EventType* cb_b = CoreTiming::RegisterEvent("callbackB", CallbackTemplate<1>);

diff --git a/Source/UnitTests/Core/IOS/FS/FileSystemTest.cpp b/Source/UnitTests/Core/IOS/FS/FileSystemTest.cpp
@@ -25,15 +25,31 @@ class FileSystemTest : public testing::Test
 protected:
   FileSystemTest() : m_profile_path{File::CreateTempDir()}
   {
+    if (UserDirectoryCreationFailed())
+    {
+      return;
+    }
     UICommon::SetUserDirectory(m_profile_path);
     m_fs = IOS::HLE::Kernel{}.GetFS();
   }
 
   virtual ~FileSystemTest()
   {
+    if (UserDirectoryCreationFailed())
+    {
+      return;
+    }
     m_fs.reset();
     File::DeleteDirRecursively(m_profile_path);
   }
+  void SetUp()
+  {
+    if (UserDirectoryCreationFailed())
+    {
+      FAIL();
+    }
+  }
+  bool UserDirectoryCreationFailed() const { return m_profile_path.empty(); }
 
   std::shared_ptr<FileSystem> m_fs;
 

diff --git a/Source/UnitTests/Core/MMIOTest.cpp b/Source/UnitTests/Core/MMIOTest.cpp
@@ -34,6 +34,7 @@ TEST(UniqueID, UniqueEnough)
 TEST(IsMMIOAddress, SpecialAddresses)
 {
   const std::string profile_path = File::CreateTempDir();
+  ASSERT_FALSE(profile_path.empty());
   UICommon::SetUserDirectory(profile_path);
   Config::Init();
   SConfig::Init();