diff options
| -rw-r--r-- | base/base.gyp | 17 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 86 | ||||
| -rw-r--r-- | net/net.gyp | 3 |
3 files changed, 102 insertions, 4 deletions
diff --git a/base/base.gyp b/base/base.gyp index 7808dcf..4017756 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -557,6 +557,23 @@ }], ], }, + { + 'target_name': 'test_support_base', + 'type': 'static_library', + 'dependencies': [ + 'base', + '../testing/gtest.gyp:gtest', + ], + 'sources': [ + 'perftimer.cc', + 'run_all_perftests.cc', + ], + 'direct_dependent_settings': { + 'defines': [ + 'PERF_TEST', + ], + }, + }, ], 'conditions': [ [ 'OS == "win"', { diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 9eab1fb..107bc47 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1715,6 +1715,7 @@ '..', ], 'sources': [ + 'test/testing_browser_process.h', 'test/ui/npapi_test_helper.cc', 'test/ui/npapi_test_helper.h', 'test/ui/run_all_unittests.cc', @@ -2171,8 +2172,89 @@ }, ], # 'actions' }, - ]}, # 'targets' - ], # OS=="mac" + ] + }, { # else: OS != "mac" + 'targets': [ + { + 'target_name': 'page_cycler_tests', + 'type': 'executable', + 'dependencies': [ + 'resources', + 'test_support_ui', + '../base/base.gyp:base', + '../skia/skia.gyp:skia', + '../testing/gtest.gyp:gtest', + ], + 'sources': [ + 'test/page_cycler/page_cycler_test.cc', + 'tools/build/win/precompiled.cc', + 'tools/build/win/precompiled.h', + ], + 'conditions': [ + ['OS!="win"', { + 'sources!': [ + 'tools/build/win/precompiled.cc', + 'tools/build/win/precompiled.h', + ], + }], + ], + }, + { + 'target_name': 'perf_tests', + 'type': 'executable', + 'dependencies': [ + 'browser', + 'common', + 'resources', + '../base/base.gyp:base', + '../base/base.gyp:test_support_base', + '../skia/skia.gyp:skia', + '../testing/gtest.gyp:gtest', + ], + 'sources': [ + 'browser/visitedlink_perftest.cc', + 'test/perf/perftests.cc', + 'test/perf/url_parse_perftest.cc', + ], + 'conditions': [ + ['OS=="linux"', { + 'sources!': [ + # TODO(port): + 'browser/visitedlink_perftest.cc', + ], + }], + ], + }, + { + 'target_name': 'startup_tests', + 'type': 'executable', + 'dependencies': [ + 'browser', + 'common', + 'resources', + 'test_support_ui', + '../base/base.gyp:base', + '../skia/skia.gyp:skia', + '../testing/gtest.gyp:gtest', + ], + 'sources': [ + 'test/startup/feature_startup_test.cc', + 'test/startup/startup_test.cc', + 'tools/build/win/precompiled.cc', + 'tools/build/win/precompiled.h', + ], + 'conditions': [ + ['OS!="win"', { + 'sources!': [ + 'test/startup/feature_startup_test.cc', + 'tools/build/win/precompiled.cc', + 'tools/build/win/precompiled.h', + ], + }], + ], + }, + ], + }], # OS!="mac" ['OS=="win"', { 'targets': [ { diff --git a/net/net.gyp b/net/net.gyp index 1d4123a..5d1049c 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -462,12 +462,11 @@ 'net', 'net_test_support', '../base/base.gyp:base', + '../base/base.gyp:test_support_base', '../testing/gtest.gyp:gtest', ], 'msvs_guid': 'AAC78796-B9A2-4CD9-BF89-09B03E92BF73', 'sources': [ - '../base/perftimer.cc', - '../base/run_all_perftests.cc', 'base/cookie_monster_perftest.cc', 'disk_cache/disk_cache_perftest.cc', 'proxy/proxy_resolver_perftest.cc', |