diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-16 17:07:46 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-16 17:07:46 +0000 |
| commit | 873043ae174de16897b9c9ff84ecd0e4f07ae516 (patch) | |
| tree | 22f01a6cd53d44b66e8f2162c23251bf21ea4a01 /third_party | |
| parent | 87b7ab7648929263d2f74d4ada0a8714598433e7 (diff) | |
| download | chromium_src-873043ae174de16897b9c9ff84ecd0e4f07ae516.zip chromium_src-873043ae174de16897b9c9ff84ecd0e4f07ae516.tar.gz chromium_src-873043ae174de16897b9c9ff84ecd0e4f07ae516.tar.bz2 | |
Build the sync unit tests:
- Remove old main(argc, argv) from syncable_unittest.
- Since the old notifier target had only one unittest,
merge it with the syncer tests.
- Remove listener_unittest.cc entirely.
- Don't compile natserver_main.cc, which has another main()
- Use a test main from the test_support_unit library. This
has the downside of pulling in a lot of deps we don't need,
but it gives us a run_all_unittests.cc.
- Fix a few compile errors in test code.
TEST=unit tests pass
BUG=none
Review URL: http://codereview.chromium.org/205021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 80d529f..cbe9e59 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -41,10 +41,11 @@ # 'files/talk/p2p/client/socketmonitor.cc', # unneeded # 'files/talk/p2p/client/socketmonitor.h', # unneeded - #'files/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h', # openssl - #'files/talk/base/basictypes.h', # overridden - #'files/talk/base/openssladapter.cc', # openssl - #'files/talk/base/openssladapter.h', # openssl + # 'files/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h', # openssl + # 'files/talk/base/basictypes.h', # overridden + # 'files/talk/base/natserver_main.cc', # has a main() + # 'files/talk/base/openssladapter.cc', # openssl + # 'files/talk/base/openssladapter.h', # openssl 'files/talk/base/asynchttprequest.cc', 'files/talk/base/asynchttprequest.h', 'files/talk/base/asyncpacketsocket.cc', @@ -95,7 +96,6 @@ 'files/talk/base/messagequeue.h', 'files/talk/base/natserver.cc', 'files/talk/base/natserver.h', - 'files/talk/base/natserver_main.cc', 'files/talk/base/natsocketfactory.cc', 'files/talk/base/natsocketfactory.h', 'files/talk/base/nattypes.cc', |