Support running Vulkan unit tests from the output directory

This also fixes running them from within Visual Studio without requiring setting any environment variables. Change-Id: I5592b2d6a0abfeaeffbe1b788529c77adf5764ed Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/35629 Presubmit-Ready: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Tested-by: Nicolas Capens <nicolascapens@google.com>

Support running Vulkan unit tests from the output directory
9dc41fd8 · Nicolas Capens · Nicolas Capens · b52384b4 · 9dc41fd8
Commit 9dc41fd8 authored Aug 28, 2019 by Nicolas Capens Committed by Nicolas Capens Aug 28, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Driver.cpp tests/VulkanUnitTests/Driver.cpp +3 -2

No files found.
--- a/tests/VulkanUnitTests/Driver.cpp
+++ b/tests/VulkanUnitTests/Driver.cpp
@@ -64,15 +64,16 @@ bool Driver::loadSwiftShader()
 		#else
 			return load("./build/Release_Win32/vk_swiftshader.dll") ||
 		#endif
-			       load("./build/Release/libvk_swiftshader.dll");
+			       load("./build/Release/libvk_swiftshader.dll") ||
 	#else
 		#if defined(_WIN64)
 			return load("./build/Debug_x64/vk_swiftshader.dll") ||
 		#else
 			return load("./build/Debug_Win32/vk_swiftshader.dll") ||
 		#endif
-			       load("./build/Debug/libvk_swiftshader.dll");
+			       load("./build/Debug/libvk_swiftshader.dll") ||
 	#endif
+			       load("./libvk_swiftshader.dll");
 #elif OS_MAC
 	return load("./build/Darwin/libvk_swiftshader.dylib") ||
 	       load("swiftshader/libvk_swiftshader.dylib") ||