diff options
| author | oshima <oshima@chromium.org> | 2014-11-07 14:17:20 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-07 22:17:34 +0000 |
| commit | 153fc11c88cc94409b1ef8f08a175e0931b35c07 (patch) | |
| tree | 496c5f4b9c41d6f88132c367fd84b73bf4a7ed6a /athena/athena.gyp | |
| parent | 0510d2d5ee3c9a9153741cdf53061932e4f0bedf (diff) | |
| download | chromium_src-153fc11c88cc94409b1ef8f08a175e0931b35c07.zip chromium_src-153fc11c88cc94409b1ef8f08a175e0931b35c07.tar.gz chromium_src-153fc11c88cc94409b1ef8f08a175e0931b35c07.tar.bz2 | |
Add AthenaBrowserTest framework
This allow us to run tests that depends on content/extensions without chrome/.
* extract AthenaMainDelegate from athena_main.cc to use it in browser tests.
* renamed existing AthenaBrowserTest for chrome to AthenaChromeBrowserTset
* Renamed athena_xxx_brosertest.{h|cc} to xxx_browser_test.{h|cc} to match the patter used for other base test class for browser tests.
BUG=None
TBR=davidben@chromium.org, jamescook@chromium.org
Review URL: https://codereview.chromium.org/689163003
Cr-Commit-Position: refs/heads/master@{#303307}
Diffstat (limited to 'athena/athena.gyp')
| -rw-r--r-- | athena/athena.gyp | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/athena/athena.gyp b/athena/athena.gyp index e4e1455..b5ffcf6 100644 --- a/athena/athena.gyp +++ b/athena/athena.gyp @@ -282,11 +282,49 @@ 'test/base/test_resource_manager_delegate.cc', 'test/base/test_windows.cc', 'test/base/test_windows.h', + 'test/base/test_util.cc', + 'test/base/test_util.h', 'wm/test/window_manager_impl_test_api.cc', 'wm/test/window_manager_impl_test_api.h', ], }, { + 'target_name': 'athena_browsertest_support', + 'type': 'static_library', + 'dependencies': [ + '../testing/gtest.gyp:gtest', + 'athena_test_support', + 'main/athena_main.gyp:athena_main_lib', + 'resources/athena_resources.gyp:athena_pak', + ], + 'sources': [ + 'test/base/activity_lifetime_tracker.h', + 'test/base/activity_lifetime_tracker.cc', + 'test/base/athena_browser_test.h', + 'test/base/athena_browser_test.cc', + 'test/base/athena_browser_test.h', + 'test/base/athena_test_launcher_delegate.cc', + 'test/base/athena_test_launcher_delegate.h', + ], + }, + { + 'target_name': 'athena_browsertests', + 'type': 'executable', + 'dependencies': [ + '../testing/gtest.gyp:gtest', + '../skia/skia.gyp:skia', + 'athena_browsertest_support', + 'athena_app_shell_lib', + 'athena_lib', + ], + 'defines': [ + 'HAS_OUT_OF_PROC_TEST_RUNNER', + ], + 'sources': [ + 'test/base/athena_browser_test_main.cc', + ], + }, + { 'target_name': 'athena_unittests', 'type': 'executable', 'dependencies': [ |