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

Unified Diff: chrome/chrome_tests.gypi

Issue 8599010: Setup JS unittests for Chromoting (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Upload again to remove bogus files Created 9 years, 1 month 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/chrome_installer_util.gypi ('k') | chrome/js_unittest_rules.gypi » ('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 6705dac271223a70b3cd2eef5f73bc6bf6459750..b061f10adef4ec0c1d7cd824cdd1a7999afa4ef8 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3,12 +3,6 @@
# found in the LICENSE file.
{
'variables' : {
- # Variables for js2gtest rules
- 'gypv8sh': '../tools/gypv8sh.py',
- 'js2gtest': 'test/base/js2gtest.js',
- 'mock_js': 'third_party/mock4js/mock4js.js',
- 'test_api_js': 'test/data/webui/test_api.js',
-
'pyautolib_sources': [
'app/chrome_command_ids.h',
'app/chrome_dll_resource.h',
@@ -32,6 +26,9 @@
}],
],
},
+ 'includes': [
+ 'js_unittest_vars.gypi',
+ ],
'targets': [
{
# This target contains mocks and test utilities that don't belong in
@@ -1180,6 +1177,10 @@
'include_dirs': [
'..',
],
+ # TODO(scr): Use this in browser_tests too.
+ 'includes': [
+ 'js_unittest_rules.gypi',
+ ],
'defines': [
'CLD_WINDOWS',
],
@@ -2023,50 +2024,6 @@
'../webkit/quota/mock_storage_client.cc',
'../webkit/quota/mock_storage_client.h',
],
- 'rules': [
- {
- 'rule_name': 'copyjs',
- 'extension': 'js',
- 'msvs_external_rule': 1,
- 'inputs': [
- '../build/cp.py',
- ],
- 'outputs': [
- '<(PRODUCT_DIR)/test_data/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).<(_extension)',
- ],
- 'action': [
- 'python',
- '<@(_inputs)',
- '<(RULE_INPUT_PATH)',
- '<@(_outputs)',
- ],
- },
- {
- 'rule_name': 'js2unit',
- 'extension': 'gtestjs',
- 'msvs_external_rule': 1,
- 'inputs': [
- '<(gypv8sh)',
- '<(PRODUCT_DIR)/v8_shell<(EXECUTABLE_SUFFIX)',
- '<(mock_js)',
- '<(test_api_js)',
- '<(js2gtest)',
- ],
- 'outputs': [
- '<(INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT)-gen.cc',
- '<(PRODUCT_DIR)/test_data/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).<(_extension)',
- ],
- 'process_outputs_as_sources': 1,
- 'action': [
- 'python',
- '<@(_inputs)',
- 'unit',
- '<(RULE_INPUT_PATH)',
- 'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).<(_extension)',
- '<@(_outputs)',
- ],
- },
- ],
'conditions': [
['target_arch!="arm"', {
'dependencies': [
« no previous file with comments | « chrome/chrome_installer_util.gypi ('k') | chrome/js_unittest_rules.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698