The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-13 15:59:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

UnitTests: Skip PageFaultTest if exception handlers are not supported

Browse Source 
Page faults should only occur on architectures that support exception
handlers, so skip the test on other architectures to avoid spurious test
failures.
This commit is contained in:
Dentomologist 2022-05-19 12:17:46 -07:00
parent 62601663e5
commit 6ffd938f98
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/Core/MemTools.cpp
View File

@ -113,6 +113,11 @@ void UninstallExceptionHandler()
s_veh_handle = nullptr; s_veh_handle = nullptr;
} }
bool IsExceptionHandlerSupported()
{
return true;
}
#elif defined(__APPLE__) && !defined(USE_SIGACTION_ON_APPLE) #elif defined(__APPLE__) && !defined(USE_SIGACTION_ON_APPLE)
static void CheckKR(const char* name, kern_return_t kr) static void CheckKR(const char* name, kern_return_t kr)
@ -245,6 +250,11 @@ void UninstallExceptionHandler()
{ {
} }
bool IsExceptionHandlerSupported()
{
return true;
}
#elif defined(_POSIX_VERSION) && !defined(_M_GENERIC) #elif defined(_POSIX_VERSION) && !defined(_M_GENERIC)
static struct sigaction old_sa_segv; static struct sigaction old_sa_segv;
@ -353,15 +363,27 @@ void UninstallExceptionHandler()
sigaction(SIGBUS, &old_sa_bus, nullptr); sigaction(SIGBUS, &old_sa_bus, nullptr);
#endif #endif
} }
bool IsExceptionHandlerSupported()
{
return true;
}
#else // _M_GENERIC or unsupported platform #else // _M_GENERIC or unsupported platform
void InstallExceptionHandler() void InstallExceptionHandler()
{ {
} }
void UninstallExceptionHandler() void UninstallExceptionHandler()
{ {
} }
bool IsExceptionHandlerSupported()
{
return false;
}
#endif #endif
} // namespace EMM } // namespace EMM

1
Source/Core/Core/MemTools.h
View File

@ -7,4 +7,5 @@ namespace EMM
{ {
void InstallExceptionHandler(); void InstallExceptionHandler();
void UninstallExceptionHandler(); void UninstallExceptionHandler();
bool IsExceptionHandlerSupported();
} // namespace EMM } // namespace EMM

5
Source/UnitTests/Core/PageFaultTest.cpp
View File

@ -61,6 +61,11 @@ static void ASAN_DISABLE perform_invalid_access(void* data)
TEST(PageFault, PageFault) TEST(PageFault, PageFault)
{ {
if (!EMM::IsExceptionHandlerSupported())
{
// TODO: Use GTEST_SKIP() instead when GTest is updated to 1.10+
return;
}
EMM::InstallExceptionHandler(); EMM::InstallExceptionHandler();
void* data = Common::AllocateMemoryPages(PAGE_GRAN); void* data = Common::AllocateMemoryPages(PAGE_GRAN);
EXPECT_NE(data, nullptr); EXPECT_NE(data, nullptr);