diff options
| author | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 22:42:39 +0000 |
|---|---|---|
| committer | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 22:42:39 +0000 |
| commit | 90669cb412412e38b62d53e567dae37a917b5ca1 (patch) | |
| tree | 6613fc0862d41c7491ae7d8b7b07c96eb8daa386 /o3d | |
| parent | d3be4f1d9a1a09f47a59182ed5510a5cd6e41609 (diff) | |
| download | chromium_src-90669cb412412e38b62d53e567dae37a917b5ca1.zip chromium_src-90669cb412412e38b62d53e567dae37a917b5ca1.tar.gz chromium_src-90669cb412412e38b62d53e567dae37a917b5ca1.tar.bz2 | |
Enable gmock on windows scons build
I made these changes and build both test-dbg-d3d
and dbg-cb and no errors.
Review URL: http://codereview.chromium.org/199033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25537 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/tests/build.scons | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/o3d/tests/build.scons b/o3d/tests/build.scons index 73dc3ef..5ac1254 100644 --- a/o3d/tests/build.scons +++ b/o3d/tests/build.scons @@ -35,17 +35,6 @@ Import('env') env['COMPONENT_TEST_SUBSYSTEM_WINDOWS'] = True -if env.Bit('windows'): - # gmock on MSVC currently has 3 issues: - # - it needs <tuple>, that MSVC doesn't have. We could use boost for that - # - the 1.0.0 version triggers a bug in MSVC where function-local template - # types cause duplicate symbols. It may be fixed in a more recent release. - # - on MSVC, it triggers a bug where it gets confused between chrome's and - # gmock's version of down_cast. - use_gmock = False -else: - use_gmock = True - gtest_env = env.Clone() gtest_env.Append( CPPPATH = ['$GTEST_DIR/include', @@ -58,13 +47,12 @@ gtest_sources = [ gtest_objs = [gtest_env.ComponentObject(name, '$GTEST_DIR/src/%s.cc' % name) for name in gtest_sources] -if use_gmock: - gmock_env = gtest_env.Clone() - gmock_env.Append(CPPPATH = ['$GMOCK_DIR/include', - '$GMOCK_DIR']) - gmock_sources = ['gmock-all'] - gtest_objs += [gmock_env.ComponentObject(name, '$GMOCK_DIR/src/%s.cc' % name) - for name in gmock_sources] +gmock_env = gtest_env.Clone() +gmock_env.Append(CPPPATH = ['$GMOCK_DIR/include', + '$GMOCK_DIR']) +gmock_sources = ['gmock-all'] +gtest_objs += [gmock_env.ComponentObject(name, '$GMOCK_DIR/src/%s.cc' % name) + for name in gmock_sources] gtest_lib = gtest_env.Library('gtest', gtest_objs) env.Append( @@ -298,15 +286,12 @@ if 'RENDERER_CB' in env['CPPDEFINES']: 'command_buffer/common/cross/bitfield_helpers_test.cc', 'command_buffer/service/cross/effect_utils_test.cc', 'command_buffer/service/cross/resource_test.cc', - ] - if use_gmock: - tests += [ - 'command_buffer/client/cross/cmd_buffer_helper_test.cc', - 'command_buffer/client/cross/fenced_allocator_test.cc', - 'command_buffer/client/cross/buffer_sync_proxy_test.cc', - 'command_buffer/service/cross/buffer_rpc_test.cc', - 'command_buffer/service/cross/cmd_buffer_engine_test.cc', - 'command_buffer/service/cross/cmd_parser_test.cc', + 'command_buffer/client/cross/cmd_buffer_helper_test.cc', + 'command_buffer/client/cross/fenced_allocator_test.cc', + 'command_buffer/client/cross/buffer_sync_proxy_test.cc', + 'command_buffer/service/cross/buffer_rpc_test.cc', + 'command_buffer/service/cross/cmd_buffer_engine_test.cc', + 'command_buffer/service/cross/cmd_parser_test.cc', ] unit_tests = env.Program('unit_tests', tests) |