diff options
author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 12:47:34 +0000 |
---|---|---|
committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 12:47:34 +0000 |
commit | 18c83cc15087788e314580d2fd20aff907ba1589 (patch) | |
tree | 14bbce3c0ccf83bdbb80e86c1b082e15689634bf /apps/apps.gypi | |
parent | 0d39935ece19c811aa86977b8aa7743138b6a7fd (diff) | |
download | chromium_src-18c83cc15087788e314580d2fd20aff907ba1589.zip chromium_src-18c83cc15087788e314580d2fd20aff907ba1589.tar.gz chromium_src-18c83cc15087788e314580d2fd20aff907ba1589.tar.bz2 |
Add apps_browsertests target (currently running 0 tests).
Since trybot configurations only really support building test targets, this change adds a test target (that doesn't run any tests) to ensure that app_shell compiles, so that changes that pass the trybots cannot break the main waterfall due to app_shell compile problems.
BUG=349631
Review URL: https://codereview.chromium.org/205653002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/apps.gypi')
-rw-r--r-- | apps/apps.gypi | 52 |
1 files changed, 48 insertions, 4 deletions
diff --git a/apps/apps.gypi b/apps/apps.gypi index 65d1e0d..ddbec1b 100644 --- a/apps/apps.gypi +++ b/apps/apps.gypi @@ -153,8 +153,8 @@ ], }, { - 'target_name': 'app_shell', - 'type': 'executable', + 'target_name': 'app_shell_lib', + 'type': 'static_library', 'defines!': ['CONTENT_IMPLEMENTATION'], 'variables': { 'chromium_code': 1, @@ -177,7 +177,6 @@ 'sources': [ 'shell/app/shell_main_delegate.cc', 'shell/app/shell_main_delegate.h', - 'shell/app/shell_main.cc', 'shell/browser/shell_app_sorting.cc', 'shell/browser/shell_app_sorting.h', 'shell/browser/shell_app_window_delegate.cc', @@ -207,6 +206,24 @@ 'shell/renderer/shell_content_renderer_client.cc', 'shell/renderer/shell_content_renderer_client.h', ], + }, + { + 'target_name': 'app_shell', + 'type': 'executable', + 'defines!': ['CONTENT_IMPLEMENTATION'], + 'variables': { + 'chromium_code': 1, + }, + 'dependencies': [ + 'app_shell_lib', + 'app_shell_pak', + ], + 'include_dirs': [ + '..', + ], + 'sources': [ + 'shell/app/shell_main.cc', + ], 'conditions': [ ['OS=="win"', { 'msvs_settings': { @@ -221,7 +238,34 @@ }], ], }, + { + 'target_name': 'apps_browsertests', + 'type': '<(gtest_target_type)', + 'variables': { + 'chromium_code': 1, + }, + 'dependencies': [ + 'app_shell_lib', + # TODO(yoz): find the right deps + '../base/base.gyp:test_support_base', + '../content/content.gyp:content_app_both', + '../content/content_shell_and_tests.gyp:content_browser_test_support', + '../content/content_shell_and_tests.gyp:test_support_content', + '../testing/gtest.gyp:gtest', + ], + 'defines': [ + 'HAS_OUT_OF_PROC_TEST_RUNNER', + ], + 'sources': [ + # TODO(yoz): Refactor once we have a second test target. + 'test/app_shell_test.h', + 'test/app_shell_test.cc', + 'test/apps_test_launcher_delegate.cc', + 'test/apps_test_launcher_delegate.h', + 'test/apps_tests_main.cc', + ], + }, ], # targets - }], # chromeos==1 + }], # chromeos==1 or linux aura or win aura ], # conditions } |