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

Side by Side Diff: apps/shell/app_shell.gyp

Issue 394103004: Move DnsApiTest.DnsResolveIPLiteral and DnsApiTest.DnsResolveHostname to app_shell_browsertests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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 | « no previous file | apps/shell/browser/DEPS » ('j') | apps/shell/browser/dns_apitest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 { 195 {
196 'target_name': 'app_shell_browsertests', 196 'target_name': 'app_shell_browsertests',
197 'type': '<(gtest_target_type)', 197 'type': '<(gtest_target_type)',
198 'dependencies': [ 198 'dependencies': [
199 'app_shell_lib', 199 'app_shell_lib',
200 # TODO(yoz): find the right deps 200 # TODO(yoz): find the right deps
201 '<(DEPTH)/base/base.gyp:test_support_base', 201 '<(DEPTH)/base/base.gyp:test_support_base',
202 '<(DEPTH)/content/content.gyp:content_app_both', 202 '<(DEPTH)/content/content.gyp:content_app_both',
203 '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_suppo rt', 203 '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_suppo rt',
204 '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content', 204 '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content',
205 '<(DEPTH)/extensions/extensions.gyp:extensions_test_support',
205 '<(DEPTH)/testing/gtest.gyp:gtest', 206 '<(DEPTH)/testing/gtest.gyp:gtest',
206 ], 207 ],
207 'defines': [ 208 'defines': [
208 'HAS_OUT_OF_PROC_TEST_RUNNER', 209 'HAS_OUT_OF_PROC_TEST_RUNNER',
209 ], 210 ],
210 'sources': [ 211 'sources': [
211 # TODO(yoz): Refactor once we have a second test target. 212 # TODO(yoz): Refactor once we have a second test target.
213 'browser/dns_apitest.cc',
212 'browser/shell_browsertest.cc', 214 'browser/shell_browsertest.cc',
213 'test/shell_test.h', 215 'test/shell_test.h',
214 'test/shell_test.cc', 216 'test/shell_test.cc',
215 'test/shell_test_launcher_delegate.cc', 217 'test/shell_test_launcher_delegate.cc',
216 'test/shell_test_launcher_delegate.h', 218 'test/shell_test_launcher_delegate.h',
217 'test/shell_tests_main.cc', 219 'test/shell_tests_main.cc',
218 ], 220 ],
219 }, 221 },
220 ], # targets 222 ], # targets
221 } 223 }
OLDNEW
« no previous file with comments | « no previous file | apps/shell/browser/DEPS » ('j') | apps/shell/browser/dns_apitest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698