diff options
Diffstat (limited to 'o3d/tests')
| -rw-r--r-- | o3d/tests/build.scons | 12 | ||||
| -rw-r--r-- | o3d/tests/common/win/testing_common.cc | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/o3d/tests/build.scons b/o3d/tests/build.scons index 83efd83..218fbda 100644 --- a/o3d/tests/build.scons +++ b/o3d/tests/build.scons @@ -153,12 +153,12 @@ if env.Bit('windows'): env.Help('\n') swiftshader_install = [] -if env.Bit('windows'):
- # Copy SwiftShader to plugin dir.
- swiftshader_path = env.subst('$SWIFTSHADER_DIR/swiftshader_d3d9.dll')
- if os.path.exists(swiftshader_path):
- swiftshader_install = env.Replicate('$ARTIFACTS_DIR/O3DExtras',
- swiftshader_path)
+if env.Bit('windows'): + # Copy SwiftShader to plugin dir. + swiftshader_path = env.subst('$SWIFTSHADER_DIR/swiftshader_d3d9.dll') + if os.path.exists(swiftshader_path): + swiftshader_install = env.Replicate('$ARTIFACTS_DIR/O3DExtras', + swiftshader_path) # ------------------------------------------------------------------------- # Unit tests diff --git a/o3d/tests/common/win/testing_common.cc b/o3d/tests/common/win/testing_common.cc index e51fc6a..702f970 100644 --- a/o3d/tests/common/win/testing_common.cc +++ b/o3d/tests/common/win/testing_common.cc @@ -160,7 +160,8 @@ int WINAPI WinMain(HINSTANCE instance, display_window = display_window; display_window->set_hwnd(g_window_handle); g_display_window = display_window; - bool offscreen = ::GetEnvironmentVariableW(kOffScreenRenderer, NULL, 0); + bool offscreen = (::GetEnvironmentVariableW(kOffScreenRenderer, + NULL, 0) == 0); if (offscreen) { success = g_renderer->Init(*g_display_window, true) == o3d::Renderer::SUCCESS; |