diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-28 19:12:28 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-28 19:12:28 +0000 |
| commit | 5e8c6691bace726b64c76ba4fdc68c3ea0a1a325 (patch) | |
| tree | 68f517b9c4bd6a23af53efe97936124b4d94412e | |
| parent | 2feb19b125ef3fd6bebef1b5eefd08e92523d897 (diff) | |
| download | chromium_src-5e8c6691bace726b64c76ba4fdc68c3ea0a1a325.zip chromium_src-5e8c6691bace726b64c76ba4fdc68c3ea0a1a325.tar.gz chromium_src-5e8c6691bace726b64c76ba4fdc68c3ea0a1a325.tar.bz2 | |
Revert "gtest shouldn't link in gtest_main.cc, as that provides its own main()."
This reverts commit r14755.
Ugh, Windows build uses some gyp and some not. :(
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14759 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/temp_gyp/googleurl.gyp | 1 | ||||
| -rw-r--r-- | printing/printing.gyp | 1 | ||||
| -rw-r--r-- | testing/gtest.gyp | 13 |
3 files changed, 1 insertions, 14 deletions
diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp index d5d0ea7..b518e4c 100644 --- a/build/temp_gyp/googleurl.gyp +++ b/build/temp_gyp/googleurl.gyp @@ -62,7 +62,6 @@ 'dependencies': [ 'googleurl', '../../testing/gtest.gyp:gtest', - '../../testing/gtest.gyp:main', '../../third_party/icu38/icu38.gyp:icuuc', ], 'sources': [ diff --git a/printing/printing.gyp b/printing/printing.gyp index baa6341..51768fd 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -46,7 +46,6 @@ 'dependencies': [ 'printing', '../testing/gtest.gyp:gtest', - '../testing/gtest.gyp:main', ], 'sources': [ 'units_unittest.cc', diff --git a/testing/gtest.gyp b/testing/gtest.gyp index 88866a6..078ca3c 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -40,6 +40,7 @@ 'gtest/src/gtest-internal-inl.h', 'gtest/src/gtest-port.cc', 'gtest/src/gtest.cc', + 'gtest/src/gtest_main.cc', 'multiprocess_func_list.cc', 'multiprocess_func_list.h', 'platform_test.h', @@ -64,17 +65,5 @@ ], }, }, - { - # Note that calling this "gtest_main" confuses the scons build, - # which uses "_main" on files to produce special behavior. - 'target_name': 'main', - 'type': '<(library)', - 'dependencies': [ - 'gtest', - ], - 'sources': [ - 'gtest/src/gtest_main.cc', - ], - }, ], } |