Merge pull request #9032 from shuffle2/msbuild-unittests

UnitTests: avoid using glob to find compilation units
dolphin-emu · Aug 17, 2020 · fee6bef · fee6bef
2 parents b5241d1 + d40ae8a
commit fee6bef
Show file tree

Hide file tree

Showing 6 changed files with 219 additions and 193 deletions.
diff --git a/Source/Core/Core/IOS/FS/HostBackend/FS.cpp b/Source/Core/Core/IOS/FS/HostBackend/FS.cpp
@@ -515,9 +515,9 @@ ResultCode HostFileSystem::Rename(Uid uid, Gid gid, const std::string& old_path,
   }
 
   // Finally, remove the child from the old parent and move it to the new parent.
+  FstEntry* new_entry = GetFstEntryForPath(new_path);
   const auto it = std::find_if(old_parent->children.begin(), old_parent->children.end(),
                                GetNamePredicate(split_old_path.file_name));
-  FstEntry* new_entry = GetFstEntryForPath(new_path);
   if (it != old_parent->children.end())
   {
     *new_entry = *it;

diff --git a/Source/UnitTests/Core/CMakeLists.txt b/Source/UnitTests/Core/CMakeLists.txt
@@ -10,7 +10,7 @@ add_dolphin_test(DSPAssemblyTest
   DSP/HermesBinary.cpp
 )
 
-add_dolphin_test(ESFormatsTest IOS/ES/FormatsTest.cpp IOS/ES/TestBinaryData.cpp)
+add_dolphin_test(ESFormatsTest IOS/ES/FormatsTest.cpp)
 
 add_dolphin_test(FileSystemTest IOS/FS/FileSystemTest.cpp)
 

diff --git a/Source/UnitTests/Core/IOS/ES/TestBinaryData.cpp b/Source/UnitTests/Core/IOS/ES/TestBinaryData.cpp