diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 21:35:57 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 21:35:57 +0000 |
| commit | b500fc1b519ab243ad1ae31f64c3fe3bca1dc08f (patch) | |
| tree | 222e16c8b8847ceb2f7169b8c899a16a7e9e3d38 /o3d/tests/tests.gyp | |
| parent | 506cb1db9a466aad6b8d3fdce9cb94eb54516e47 (diff) | |
| download | chromium_src-b500fc1b519ab243ad1ae31f64c3fe3bca1dc08f.zip chromium_src-b500fc1b519ab243ad1ae31f64c3fe3bca1dc08f.tar.gz chromium_src-b500fc1b519ab243ad1ae31f64c3fe3bca1dc08f.tar.bz2 | |
Added command buffer unit tests to gyp.
Can optionally override default renderer with environment variable. One of:
GYP_DEFINES = "renderer=d3d9"
GYP_DEFINES = "renderer=gl"
GYP_DEFINES = "renderer=cb cb_service=d3d9"
GYP_DEFINES = "renderer=cb cb_service=gl"
Fixed some warnings.
Works on windows with D3D9 but not GL, mac or linux yet.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/208037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27125 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/tests/tests.gyp')
| -rw-r--r-- | o3d/tests/tests.gyp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/o3d/tests/tests.gyp b/o3d/tests/tests.gyp index 36c9fa0..fc3c5ce 100644 --- a/o3d/tests/tests.gyp +++ b/o3d/tests/tests.gyp @@ -28,9 +28,13 @@ '../../base/base.gyp:base', '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', + '../../testing/gmock.gyp:gmock', '../../native_client/src/shared/imc/imc.gyp:google_nacl_imc', '../compiler/technique/technique.gyp:o3dTechnique', '../compiler/technique/technique.gyp:o3dTechniqueTest', + '../command_buffer/command_buffer.gyp:command_buffer_client_test', + '../command_buffer/command_buffer.gyp:command_buffer_common_test', + '../command_buffer/command_buffer.gyp:command_buffer_service_test', '../core/core.gyp:o3dCore', '../core/core.gyp:o3dCorePlatform', '../core/core.gyp:o3dCoreTest', @@ -162,7 +166,7 @@ 'editbin /SUBSYSTEM:CONSOLE $(OutDir)/$(TargetFileName)', }, ], - ['OS == "win" and (renderer == "d3d9" or renderer == "cb")', + ['OS == "win" and (renderer == "d3d9" or cb_service == "d3d9")', { 'sources': [ 'common/win/dxcapture.cc', |