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

Unified Diff: chrome/chrome_tests.gypi

Issue 8438063: Make it possible to include another file and port print_preview unit test to unit_tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add descriptions to TEST_F's params. 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
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 59cc637bd28804d0d3f32bcb77db045e7c8a50dc..4a6865c15e40273a22f45dc870308e5ab07f847f 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1527,6 +1527,8 @@
'browser/profiles/profile_info_cache_unittest.cc',
'browser/profiles/profile_manager_unittest.cc',
'browser/renderer_host/web_cache_manager_unittest.cc',
+ 'browser/resources/print_preview/print_preview_utils.js',
+ 'browser/resources/print_preview/print_preview_utils_unittest.gtestjs',
'browser/resources_util_unittest.cc',
'browser/rlz/rlz_unittest.cc',
'browser/safe_browsing/bloom_filter_unittest.cc',
@@ -1952,7 +1954,7 @@
'test/base/v8_unit_test.cc',
'test/base/v8_unit_test.h',
'test/data/resource.rc',
- 'test/data/unit/framework_unittest.js',
+ 'test/data/unit/framework_unittest.gtestjs',
'tools/convert_dict/convert_dict_unittest.cc',
'../content/browser/renderer_host/render_widget_host_unittest.cc',
'../content/browser/renderer_host/text_input_client_mac_unittest.mm',
@@ -1976,9 +1978,24 @@
],
'rules': [
{
- 'rule_name': 'js2unit',
+ 'rule_name': 'copyjs',
'extension': 'js',
'msvs_external_rule': 1,
+ 'inputs': [],
+ 'outputs': [
+ '<(PRODUCT_DIR)/test_data/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).<(_extension)',
+ ],
+ 'action': [
+ 'python',
+ '-c', 'import shutil,sys; shutil.copyfile(sys.argv[1], sys.argv[2])',
bradn 2011/11/07 06:10:38 Minor nit. It might be nice to put this in a separ
Sheridan Rawlins 2011/11/08 01:11:49 Done.
+ '<@(_inputs)', '<(RULE_INPUT_PATH)',
+ '<@(_outputs)',
+ ],
+ },
+ {
+ 'rule_name': 'js2unit',
+ 'extension': 'gtestjs',
bradn 2011/11/07 06:10:38 So gtest.js might work here (like 80% sure it'll w
Sheridan Rawlins 2011/11/08 01:11:49 This needs gyp support to accomplish and I feel is
+ 'msvs_external_rule': 1,
'inputs': [
'<(gypv8sh)',
'<(PRODUCT_DIR)/v8_shell<(EXECUTABLE_SUFFIX)',
@@ -1988,7 +2005,7 @@
],
'outputs': [
'<(js2gtest_out_dir)/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).cc',
- '<(PRODUCT_DIR)/test_data/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
+ '<(PRODUCT_DIR)/test_data/chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).<(_extension)',
],
'process_outputs_as_sources': 1,
'action': [
@@ -1996,7 +2013,7 @@
'<@(_inputs)',
'unit',
'<(RULE_INPUT_PATH)',
- 'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
+ 'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).<(_extension)',
'<@(_outputs)',
],
},
« no previous file with comments | « chrome/browser/resources/print_preview/print_preview_utils_unittest.gtestjs ('k') | chrome/test/base/js2gtest.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698