OLD | NEW |
---|---|
1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 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 'conditions': [ | 9 'conditions': [ |
10 # The iOS frameworks being built for ios_web_shell_test require certs which | 10 # The iOS frameworks being built for ios_web_shell_test require certs which |
11 # bots do not currently have installed. Ninja allows this, Xcode does not. | 11 # bots do not currently have installed. Ninja allows this, Xcode does not. |
12 ['"<(GENERATOR)"=="ninja" or "<(GENERATOR_FLAVOR)"=="ninja"', { | 12 ['"<(GENERATOR)"=="ninja" or "<(GENERATOR_FLAVOR)"=="ninja"', { |
13 'targets': [ | 13 'targets': [ |
14 { | 14 { |
15 'variables': { | 15 'variables': { |
16 'test_host': 'ios_web_shell.app/ios_web_shell', | 16 'test_host': 'ios_web_shell.app/ios_web_shell', |
17 'test_host_name': 'ios_web_shell', | 17 'test_host_name': 'ios_web_shell', |
18 }, | 18 }, |
19 'target_name': 'ios_web_shell_test', | 19 'target_name': 'ios_web_shell_test', |
20 'type': 'loadable_module', | 20 'type': 'loadable_module', |
21 'mac_xctest_bundle': 1, | 21 'mac_xctest_bundle': 1, |
22 'dependencies': [ | 22 'dependencies': [ |
23 '../third_party/earl_grey/earl_grey.gyp:EarlGrey', | 23 '../third_party/earl_grey/earl_grey.gyp:EarlGrey', |
24 'ios_web_shell.gyp:ios_web_shell', | 24 'ios_web_shell.gyp:ios_web_shell', |
25 'ios_web.gyp:ios_web_test_support', | |
25 ], | 26 ], |
26 'sources': [ | 27 'sources': [ |
28 'public/test/http_server_util.h', | |
29 'public/test/http_server_util.mm', | |
30 'shell/test/utils/navigation_egutil.h', | |
Eugene But (OOO till 7-30)
2016/04/21 17:07:51
Utils is very generic directory name and it's tota
baxley
2016/04/21 21:52:50
Sounds good. Let's just leave it all in ios/web/sh
| |
31 'shell/test/utils/navigation_egutil.mm', | |
32 'shell/test/utils/web_view_egutil.h', | |
33 'shell/test/utils/web_view_egutil.mm', | |
27 'shell/test/web_shell_navigation_egtest.mm', | 34 'shell/test/web_shell_navigation_egtest.mm', |
28 ], | 35 ], |
29 'xcode_settings': { | 36 'xcode_settings': { |
30 'WRAPPER_EXTENSION': 'xctest', | 37 'WRAPPER_EXTENSION': 'xctest', |
31 'TEST_HOST': '$(CONFIGURATION_BUILD_DIR)/<(test_host)', | 38 'TEST_HOST': '$(CONFIGURATION_BUILD_DIR)/<(test_host)', |
32 'BUNDLE_LOADER': '$(TEST_HOST)', | 39 'BUNDLE_LOADER': '$(TEST_HOST)', |
33 'conditions':[ | 40 'conditions':[ |
34 ['"<(GENERATOR)"!="xcode" or "<(GENERATOR_FLAVOR)"=="ninja"', { | 41 ['"<(GENERATOR)"!="xcode" or "<(GENERATOR_FLAVOR)"=="ninja"', { |
35 'OTHER_LDFLAGS': [ | 42 'OTHER_LDFLAGS': [ |
36 '-bundle_loader <@(test_host)', | 43 '-bundle_loader <@(test_host)', |
(...skipping 28 matching lines...) Expand all Loading... | |
65 # The iOS frameworks being built for ios_web_shell_test require certs | 72 # The iOS frameworks being built for ios_web_shell_test require certs |
66 # which bot do not currently have installed. Ninja allows this, Xcode | 73 # which bot do not currently have installed. Ninja allows this, Xcode |
67 # does not. | 74 # does not. |
68 'target_name': 'ios_web_shell_test', | 75 'target_name': 'ios_web_shell_test', |
69 'type': 'none', | 76 'type': 'none', |
70 }, | 77 }, |
71 ], | 78 ], |
72 }], | 79 }], |
73 ], | 80 ], |
74 } | 81 } |
OLD | NEW |