summaryrefslogtreecommitdiffstats
path: root/remoting/remoting_test.gypi
diff options
context:
space:
mode:
authorgarykac <garykac@chromium.org>2015-02-18 18:58:52 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-19 02:59:20 +0000
commitb70d46306599857a556b2be7f2d813f3a3450edb (patch)
tree7a034921fea84ffabdf0e930af7b5cce02288767 /remoting/remoting_test.gypi
parent87e6d8ab7a85f05ff4273208259a12f816a39e5d (diff)
downloadchromium_src-b70d46306599857a556b2be7f2d813f3a3450edb.zip
chromium_src-b70d46306599857a556b2be7f2d813f3a3450edb.tar.gz
chromium_src-b70d46306599857a556b2be7f2d813f3a3450edb.tar.bz2
[Chromoting] Enable jscompile for browser tests.
This enables JScompile for Chromoting's browsertest code and fixes all of the reported errors. This cl also includes a few minor typos and jscompile inconsistencies in the non-test code. BUG= Review URL: https://codereview.chromium.org/927373005 Cr-Commit-Position: refs/heads/master@{#316982}
Diffstat (limited to 'remoting/remoting_test.gypi')
-rw-r--r--remoting/remoting_test.gypi15
1 files changed, 5 insertions, 10 deletions
diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi
index a6510d9..ad1d371 100644
--- a/remoting/remoting_test.gypi
+++ b/remoting/remoting_test.gypi
@@ -290,8 +290,7 @@
{
'destination': '<(PRODUCT_DIR)/remoting/browser_test_resources',
'files': [
- '<@(remoting_webapp_js_test_common_files)',
- '<@(remoting_webapp_js_browser_test_files)',
+ '<@(remoting_webapp_browsertest_all_js_files)',
],
},
], # end of copies
@@ -334,9 +333,7 @@
'destination': '<(output_dir)',
'files': [
'<@(webapp_js_files)',
- '<@(remoting_webapp_js_test_common_files)',
- '<@(remoting_webapp_unittest_additional_files)',
- '<@(remoting_webapp_unittest_js_files)',
+ '<@(remoting_webapp_unittest_all_files)',
],
},
],
@@ -347,8 +344,7 @@
'webapp/build-html.py',
'<(remoting_webapp_unittest_template_main)',
'<@(webapp_js_files)',
- '<@(remoting_webapp_js_test_common_files)',
- '<@(remoting_webapp_unittest_js_files)'
+ '<@(remoting_webapp_unittest_all_js_files)'
],
'outputs': [
'<(output_dir)/unittest.html',
@@ -361,9 +357,8 @@
# arguments. Therefore, the excludejs flag must be set before the
# instrumentedjs flag or else GYP will ignore the files in the
# exclude list.
- '--exclude-js', '<@(remoting_webapp_unittest_exclude_files)',
- '--js', '<@(remoting_webapp_unittest_js_files)',
- '<@(remoting_webapp_js_test_common_files)',
+ '--exclude-js', '<@(remoting_webapp_unittest_exclude_js_files)',
+ '--js', '<@(remoting_webapp_unittest_all_js_files)',
'--instrument-js', '<@(webapp_js_files)',
],
},