diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 18:32:21 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 18:32:21 +0000 |
| commit | 22015c33fe44a1cc36596e0b6de37a48dc13b131 (patch) | |
| tree | 643966e3ad01ab48b4f1d0ab48793261c68cee02 /testing/gtest.gyp | |
| parent | ad764d54ec391e95e4ea239aa8eed548ce45cb61 (diff) | |
| download | chromium_src-22015c33fe44a1cc36596e0b6de37a48dc13b131.zip chromium_src-22015c33fe44a1cc36596e0b6de37a48dc13b131.tar.gz chromium_src-22015c33fe44a1cc36596e0b6de37a48dc13b131.tar.bz2 | |
Upgrade gtest to r267 and gmock to r173.
This is step1 into removing the boost + tr1 dependency in windows. It also includes a hack to avoid brining in tr1/functional on gcc, which will move us closer to enabling -fno-rtti.
This CL has passed the try servers. I've also tried compiling gmock, gmock_main, base, base_unittests, and webcore modules in vs2008 express editions.
Review URL: http://codereview.chromium.org/140003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18923 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/gtest.gyp')
| -rw-r--r-- | testing/gtest.gyp | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp index 061667e..e9d15f5 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -12,15 +12,7 @@ 'type': '<(library)', 'msvs_guid': 'BFE8E2A7-3B3B-43B0-A994-3058B852DB8B', 'sources': [ - 'gtest/include/gtest/internal/gtest-death-test-internal.h', - 'gtest/include/gtest/internal/gtest-filepath.h', - 'gtest/include/gtest/internal/gtest-internal.h', - 'gtest/include/gtest/internal/gtest-linked_ptr.h', - 'gtest/include/gtest/internal/gtest-param-util-generated.h', - 'gtest/include/gtest/internal/gtest-param-util.h', - 'gtest/include/gtest/internal/gtest-port.h', - 'gtest/include/gtest/internal/gtest-string.h', - 'gtest/include/gtest/internal/gtest-type-util.h', + # Sources based on files in r267 of gmock. 'gtest/include/gtest/gtest-death-test.h', 'gtest/include/gtest/gtest-message.h', 'gtest/include/gtest/gtest-param-test.h', @@ -30,17 +22,31 @@ 'gtest/include/gtest/gtest.h', 'gtest/include/gtest/gtest_pred_impl.h', 'gtest/include/gtest/gtest_prod.h', - 'gtest/src/gtest-test-part.cc', - 'gtest/src/gtest-typed-test.cc', + 'gtest/include/gtest/internal/gtest-death-test-internal.h', + 'gtest/include/gtest/internal/gtest-filepath.h', + 'gtest/include/gtest/internal/gtest-internal.h', + 'gtest/include/gtest/internal/gtest-linked_ptr.h', + 'gtest/include/gtest/internal/gtest-param-util-generated.h', + 'gtest/include/gtest/internal/gtest-param-util.h', + 'gtest/include/gtest/internal/gtest-port.h', + 'gtest/include/gtest/internal/gtest-string.h', + 'gtest/include/gtest/internal/gtest-tuple.h', + 'gtest/include/gtest/internal/gtest-type-util.h', + 'gtest/src/gtest-all.cc', 'gtest/src/gtest-death-test.cc', 'gtest/src/gtest-filepath.cc', 'gtest/src/gtest-internal-inl.h', 'gtest/src/gtest-port.cc', + 'gtest/src/gtest-test-part.cc', + 'gtest/src/gtest-typed-test.cc', 'gtest/src/gtest.cc', 'multiprocess_func_list.cc', 'multiprocess_func_list.h', 'platform_test.h', ], + 'sources!': [ + 'gtest/src/gtest-all.cc', # Not needed by our build. + ], 'include_dirs': [ 'gtest', 'gtest/include', |