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

Unified Diff: ios/web/ios_web_inttests.gyp

Issue 2028013003: [ios Mojo] Integration test for Mojo WebUI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/web/BUILD.gn ('k') | ios/web/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/ios_web_inttests.gyp
diff --git a/ios/web/ios_web_inttests.gyp b/ios/web/ios_web_inttests.gyp
index 771e2e75e9ad104e9f7dbeaf61b548b05086072b..71be2f340624b9f94aa339fc87db23239c301313 100644
--- a/ios/web/ios_web_inttests.gyp
+++ b/ios/web/ios_web_inttests.gyp
@@ -12,16 +12,86 @@
'dependencies': [
'../../base/base.gyp:base',
'../../base/base.gyp:test_support_base',
+ '../../ios/provider/ios_provider_web.gyp:ios_provider_web',
'../../net/net.gyp:net_test_support',
+ '../../services/shell/shell_public.gyp:shell_public',
'../../testing/gtest.gyp:gtest',
'../../ui/base/ui_base.gyp:ui_base_test_support',
'ios_web.gyp:ios_web',
'ios_web.gyp:ios_web_test_support',
+ 'ios_web.gyp:test_mojo_bindings',
+ 'test_resources',
+ 'packed_test_resources',
],
'sources': [
'browser_state_web_view_partition_inttest.mm',
'public/test/http_server_inttest.mm',
'test/run_all_unittests.cc',
+ 'webui/web_ui_mojo_inttest.mm',
+ ],
+ 'mac_bundle_resources': [
+ '<(SHARED_INTERMEDIATE_DIR)/ios/web/test/resources.pak'
+ ],
+ },
+ {
+ # GN version: //ios/web/test:resources
+ 'target_name': 'test_resources',
+ 'type': 'none',
+ 'hard_dependency': 1,
+ 'dependencies': [
+ 'ios_web.gyp:test_mojo_bindings',
+ ],
+ 'actions': [
+ {
+ 'action_name': 'test_resources',
+ 'variables': {
+ 'grit_grd_file': 'test/test_resources.grd',
+ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ios/web/test',
+ 'grit_additional_defines': [
+ '-E', 'root_gen_dir=<(SHARED_INTERMEDIATE_DIR)',
+ ],
+ },
+ 'includes': [ '../../build/grit_action.gypi' ],
+ },
+ ],
+ 'copies': [
+ {
+ 'destination': '<(PRODUCT_DIR)',
+ 'files': [
+ '<(SHARED_INTERMEDIATE_DIR)/ios/web/test/test_resources.pak'
+ ],
+ },
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)',
+ ],
+ },
+ },
+ {
+ 'target_name': 'packed_test_resources',
+ 'type': 'none',
+ 'hard_depency': 1,
+ 'dependencies': [
+ 'test_resources',
+ ],
+ 'variables': {
+ 'repack_path': [
+ '../../tools/grit/grit/format/repack.py',
+ ],
+ },
+ 'actions': [
+ {
+ 'action_name': 'repack_test_resources',
+ 'variables': {
+ 'pak_inputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/ios/web/ios_web_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ios/web/test/test_resources.pak'
+ ],
+ 'pak_output': '<(SHARED_INTERMEDIATE_DIR)/ios/web/test/resources.pak',
+ },
+ 'includes': [ '../../build/repack_action.gypi' ],
+ },
],
},
],
« no previous file with comments | « ios/web/BUILD.gn ('k') | ios/web/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698