Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(184)

Side by Side Diff: chrome_frame/chrome_frame.gyp

Issue 10007043: Attempt to fix ChromeFrameTestWithWebServer tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move snapshot fn into ui_test_utils_win.cc Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/base/ui_test_utils_win.cc ('k') | chrome_frame/test/chrome_frame_test_utils.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'variables': { 9 'variables': {
10 'version_py_path': '../tools/build/version.py', 10 'version_py_path': '../tools/build/version.py',
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 'direct_dependent_settings': { 72 'direct_dependent_settings': {
73 'include_dirs': ['<(SHARED_INTERMEDIATE_DIR)'], 73 'include_dirs': ['<(SHARED_INTERMEDIATE_DIR)'],
74 }, 74 },
75 }, 75 },
76 { 76 {
77 'target_name': 'chrome_frame_unittests', 77 'target_name': 'chrome_frame_unittests',
78 'type': 'executable', 78 'type': 'executable',
79 'dependencies': [ 79 'dependencies': [
80 '../base/base.gyp:test_support_base', 80 '../base/base.gyp:test_support_base',
81 '../chrome/app/policy/cloud_policy_codegen.gyp:policy', 81 '../chrome/app/policy/cloud_policy_codegen.gyp:policy',
82 '../chrome/chrome.gyp:test_support_common',
82 '../net/net.gyp:net', 83 '../net/net.gyp:net',
83 '../testing/gmock.gyp:gmock', 84 '../testing/gmock.gyp:gmock',
84 '../testing/gtest.gyp:gtest', 85 '../testing/gtest.gyp:gtest',
85 'chrome_frame_launcher.gyp:chrome_frame_helper_lib', 86 'chrome_frame_launcher.gyp:chrome_frame_helper_lib',
86 'chrome_frame_ie', 87 'chrome_frame_ie',
87 'chrome_frame_strings', 88 'chrome_frame_strings',
88 'chrome_tab_idl', 89 'chrome_tab_idl',
89 'locales/locales.gyp:*', 90 'locales/locales.gyp:*',
90 ], 91 ],
91 'sources': [ 92 'sources': [
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 'type': 'executable', 300 'type': 'executable',
300 'dependencies': [ 301 'dependencies': [
301 '../base/base.gyp:base', 302 '../base/base.gyp:base',
302 '../base/base.gyp:base_i18n', 303 '../base/base.gyp:base_i18n',
303 '../base/base.gyp:test_support_base', 304 '../base/base.gyp:test_support_base',
304 '../build/temp_gyp/googleurl.gyp:googleurl', 305 '../build/temp_gyp/googleurl.gyp:googleurl',
305 '../chrome/chrome.gyp:common', 306 '../chrome/chrome.gyp:common',
306 '../chrome/chrome.gyp:browser', 307 '../chrome/chrome.gyp:browser',
307 '../chrome/chrome.gyp:debugger', 308 '../chrome/chrome.gyp:debugger',
308 '../chrome/chrome.gyp:image_pre_reader', 309 '../chrome/chrome.gyp:image_pre_reader',
310 '../chrome/chrome.gyp:test_support_common',
309 '../chrome/chrome.gyp:test_support_ui', 311 '../chrome/chrome.gyp:test_support_ui',
310 '../chrome/chrome.gyp:utility', 312 '../chrome/chrome.gyp:utility',
311 '../content/content.gyp:content_gpu', 313 '../content/content.gyp:content_gpu',
312 '../testing/gmock.gyp:gmock', 314 '../testing/gmock.gyp:gmock',
313 '../testing/gtest.gyp:gtest', 315 '../testing/gtest.gyp:gtest',
314 '../third_party/libxml/libxml.gyp:libxml', 316 '../third_party/libxml/libxml.gyp:libxml',
315 '../third_party/libxslt/libxslt.gyp:libxslt', 317 '../third_party/libxslt/libxslt.gyp:libxslt',
316 'chrome_frame_ie', 318 'chrome_frame_ie',
317 'chrome_frame_strings', 319 'chrome_frame_strings',
318 'chrome_frame_utils', 320 'chrome_frame_utils',
(...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
1051 # Use outputs of this action as inputs for the main target build. 1053 # Use outputs of this action as inputs for the main target build.
1052 # Seems as a misnomer but makes this happy on Linux (scons). 1054 # Seems as a misnomer but makes this happy on Linux (scons).
1053 'process_outputs_as_sources': 1, 1055 'process_outputs_as_sources': 1,
1054 }, 1056 },
1055 ], 1057 ],
1056 }, 1058 },
1057 ], 1059 ],
1058 }, ], # 'coverage!=0' 1060 }, ], # 'coverage!=0'
1059 ], # 'conditions' 1061 ], # 'conditions'
1060 } 1062 }
OLDNEW
« no previous file with comments | « chrome/test/base/ui_test_utils_win.cc ('k') | chrome_frame/test/chrome_frame_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698