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

Unified Diff: chrome/chrome_tests.gypi

Issue 7087014: Support automatic javascript test registry in gtest when creating WebUI tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move the include of the generated dir to the condition for ! 'arm'. Created 9 years, 6 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 | « chrome/browser/ui/webui/web_ui_browsertest.cc ('k') | chrome/test/data/webui/print_preview.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 9637fec74acc117a3d87310af3ed838fb14cc9d3..4ad461e09dea73ee0b39edbca414f9dd79db399d 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2272,6 +2272,12 @@
# Executable that runs each browser test in a new process.
'target_name': 'browser_tests',
'type': 'executable',
+ 'variables': {
+ 'gypv8sh': '../tools/gypv8sh.py',
+ 'js2webui': 'browser/ui/webui/javascript2webui.js',
+ 'js2webui_out_dir': '<(SHARED_INTERMEDIATE_DIR)/js2webui',
+ 'rule_input_relpath': 'test/data/webui',
+ },
'dependencies': [
'browser',
'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
@@ -2533,6 +2539,7 @@
'renderer/safe_browsing/render_view_fake_resources_test.h',
'renderer/translate_helper_browsertest.cc',
'test/automation/dom_automation_browsertest.cc',
+ 'test/data/webui/sample_pass.js',
'test/gpu/gpu_browsertest.cc',
'test/in_process_browser_test_browsertest.cc',
'test/out_of_proc_test_runner.cc',
@@ -2716,7 +2723,30 @@
],
}],
['target_arch!="arm"', {
+ 'rules': [
+ {
+ 'rule_name': 'js2webui',
+ 'extension': 'js',
+ 'inputs': [
+ '<(gypv8sh)',
+ '<(PRODUCT_DIR)/v8_shell<(EXECUTABLE_SUFFIX)',
+ '<(js2webui)',
+ ],
+ 'outputs': [
+ '<(js2webui_out_dir)/chrome/<(rule_input_relpath)/<(RULE_INPUT_ROOT)-inl.h',
+ ],
+ 'process_outputs_as_sources': 1,
+ 'action': [
+ 'python', '<@(_inputs)', '<(RULE_INPUT_PATH)', '<@(_outputs)',
+ ],
+ },
+ ],
+ 'include_dirs': [
+ '<(js2webui_out_dir)',
+ ],
'dependencies': [
+ # build time dependency.
+ '../v8/tools/gyp/v8.gyp:v8_shell#host',
# run time dependency
'../webkit/webkit.gyp:copy_npapi_test_plugin',
],
« no previous file with comments | « chrome/browser/ui/webui/web_ui_browsertest.cc ('k') | chrome/test/data/webui/print_preview.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698