Chromium Code Reviews| Index: chrome/chrome_tests.gypi |
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
| index 84bfd5f05de396adaa9c4a2863b803b9c817c7b8..595ab1aef1610ef8d3487e638d694c11fd17d4e5 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': [ |
| + '../chrome/js_unittest_vars.gypi', |
| + ], |
| 'targets': [ |
| { |
| # This target contains mocks and test utilities that don't belong in |
| @@ -1156,6 +1153,9 @@ |
| 'include_dirs': [ |
| '..', |
| ], |
| + 'includes': [ |
| + 'js_unittest_rules.gypi', |
|
Sheridan Rawlins
2011/11/19 02:36:26
Add comment // TODO(scr): Use this in browser_test
garykac
2011/11/21 20:46:17
Done.
|
| + ], |
| 'defines': [ |
| 'CLD_WINDOWS', |
| ], |
| @@ -2004,50 +2004,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': [ |