diff options
author | Brad Smith <brad@comstyle.com> | 2022-09-01 08:53:59 +0300 |
---|---|---|
committer | Charles Giessen <46324611+charles-lunarg@users.noreply.github.com> | 2022-09-01 21:21:19 +0300 |
commit | efa8903d738a6f35a75cf54a5b7756ef348e9bd9 (patch) | |
tree | 48a5c54920a6d1c40504d1308058c4121b5d007a | |
parent | 87429ffc5dd5cf7bb2ed929336e46c412d6b40ff (diff) |
tests: Further fixes to be able to build on OpenBSD
-rw-r--r-- | tests/framework/framework_config.h.in | 2 | ||||
-rw-r--r-- | tests/framework/shim/shim.h | 2 | ||||
-rw-r--r-- | tests/loader_regression_tests.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/framework/framework_config.h.in b/tests/framework/framework_config.h.in index 406722cb3..ddbb0ab4d 100644 --- a/tests/framework/framework_config.h.in +++ b/tests/framework/framework_config.h.in @@ -99,7 +99,7 @@ #endif #endif // Apple doesn't have 32 bit but this should allow tests to run as if it was supported -#if defined(__APPLE__) || defined(__FreeBSD__) +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) #define CURRENT_PLATFORM_DUMMY_BINARY_WRONG_TYPE DUMMY_BINARY_LINUX_32 #define CURRENT_PLATFORM_DUMMY_BINARY_BAD BAD_DUMMY_BINARY_LINUX_64 #endif diff --git a/tests/framework/shim/shim.h b/tests/framework/shim/shim.h index 066ec3e64..b619465e2 100644 --- a/tests/framework/shim/shim.h +++ b/tests/framework/shim/shim.h @@ -208,7 +208,7 @@ extern "C" { using PFN_get_platform_shim = PlatformShim* (*)(std::vector<fs::FolderManager>* folders); #define GET_PLATFORM_SHIM_STR "get_platform_shim" -#elif defined(__linux__) || defined(__FreeBSD__) +#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) // statically link on linux PlatformShim* get_platform_shim(std::vector<fs::FolderManager>* folders); #endif diff --git a/tests/loader_regression_tests.cpp b/tests/loader_regression_tests.cpp index 97a2a7405..5e30ad132 100644 --- a/tests/loader_regression_tests.cpp +++ b/tests/loader_regression_tests.cpp @@ -2468,7 +2468,7 @@ TEST(CreateInstance, InstanceNullExtensionPtr) { ASSERT_EQ(env.vulkan_functions.vkCreateInstance(&info, VK_NULL_HANDLE, &inst), VK_ERROR_EXTENSION_NOT_PRESENT); } -#if defined(__linux__) || defined(__FreeBSD__) +#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) // NOTE: Sort order only affects Linux TEST(SortedPhysicalDevices, DevicesSortEnabled10NoAppExt) { FrameworkEnvironment env{}; @@ -3280,7 +3280,7 @@ TEST(SortedPhysicalDevices, DeviceGroupsSortedDisabled) { remove_env_var("VK_LOADER_DISABLE_SELECT"); } -#endif // __linux__ || __FreeBSD__ +#endif // __linux__ || __FreeBSD__ || __OpenBSD__ const char* portability_driver_warning = "vkCreateInstance: Found drivers that contain devices which support the portability subset, but the " |