diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-02 21:13:40 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-02 21:13:40 +0000 |
| commit | 70afe5afe1061d78781cfc5677da9e14f300e163 (patch) | |
| tree | a6522ab301f4cd2b704b47398be45af492ab3661 | |
| parent | 5d45daa4ce719ee85e711b4e0abf359187d8fec6 (diff) | |
| download | chromium_src-70afe5afe1061d78781cfc5677da9e14f300e163.zip chromium_src-70afe5afe1061d78781cfc5677da9e14f300e163.tar.gz chromium_src-70afe5afe1061d78781cfc5677da9e14f300e163.tar.bz2 | |
Stop building Chrome Frame tests.
They are no longer run on any bots, so save time by not building them.
BUG=316496
Review URL: https://codereview.chromium.org/100213009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242796 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/all.gyp | 36 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 10 |
2 files changed, 3 insertions, 43 deletions
diff --git a/build/all.gyp b/build/all.gyp index 3025548..dfd22ca 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -154,7 +154,7 @@ # TODO(jschuh) Enable Win64 Memory Watcher. crbug.com/176877 '../tools/memory_watcher/memory_watcher.gyp:*', # TODO(jschuh) Enable Win64 Chrome Frame. crbug.com/176875 - '../chrome_frame/chrome_frame.gyp:*', + '../chrome_frame/chrome_frame.gyp:npchrome_frame', ], }], ], @@ -289,15 +289,7 @@ '../ui/views/views.gyp:views_unittests', ], 'conditions': [ - ['target_arch!="x64"', { - 'dependencies': [ - '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', - ] - }, { # target_arch!="x64" + ['target_arch=="x64"', { 'dependencies!': [ '../chrome_frame/chrome_frame.gyp:npchrome_frame', ], @@ -851,15 +843,7 @@ '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugin', ], 'conditions': [ - ['target_arch!="x64"', { - 'dependencies': [ - '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', - ] - }, { # target_arch!="x64" + ['target_arch=="x64"', { 'dependencies!': [ '../chrome_frame/chrome_frame.gyp:npchrome_frame', ], @@ -875,11 +859,6 @@ 'conditions': [ ['target_arch!="x64"', { 'dependencies': [ - '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', '../chrome_frame/chrome_frame.gyp:npchrome_frame', ], }], # target_arch!="x64" @@ -1026,15 +1005,6 @@ '../chrome_frame/chrome_frame.gyp:npchrome_frame', ], }], - ['OS=="win" and target_arch!="x64"', { - 'dependencies': [ - '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', - ], - }], ['OS=="win" and target_arch=="x64"', { 'dependencies!': [ '../chrome_frame/chrome_frame.gyp:npchrome_frame', diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 037da76..7eae83a 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -766,22 +766,12 @@ 'type': 'none', 'dependencies': [ '../base/base.gyp:base_unittests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', '../content/content_shell_and_tests.gyp:content_browsertests', '../content/content_shell_and_tests.gyp:content_shell', '../content/content_shell_and_tests.gyp:content_unittests', '../net/net.gyp:net_unittests', '../ui/ui_unittests.gyp:ui_unittests', ], - 'conditions': [ - ['use_aura==1 or target_arch=="x64"', { - 'dependencies!': [ - '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', - ], - }], - ], }, { 'target_name': 'chrome_version_resources', |