| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'remoting_test_common', | 8 'target_name': 'remoting_test_common', |
| 9 'type': 'static_library', | 9 'type': 'static_library', |
| 10 'dependencies': [ | 10 'dependencies': [ |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 }], | 281 }], |
| 282 ], # end of 'conditions' | 282 ], # end of 'conditions' |
| 283 }, # end of target 'remoting_unittests' | 283 }, # end of target 'remoting_unittests' |
| 284 { | 284 { |
| 285 'target_name': 'remoting_browser_test_resources', | 285 'target_name': 'remoting_browser_test_resources', |
| 286 'type': 'none', | 286 'type': 'none', |
| 287 'copies': [ | 287 'copies': [ |
| 288 { | 288 { |
| 289 'destination': '<(PRODUCT_DIR)/remoting/browser_test_resources', | 289 'destination': '<(PRODUCT_DIR)/remoting/browser_test_resources', |
| 290 'files': [ | 290 'files': [ |
| 291 '<@(remoting_webapp_js_test_common_files)', | 291 '<@(remoting_webapp_browsertest_js_all_files)', |
| 292 '<@(remoting_webapp_js_browser_test_files)', | |
| 293 ], | 292 ], |
| 294 }, | 293 }, |
| 295 ], # end of copies | 294 ], # end of copies |
| 296 }, # end of target 'remoting_browser_test_resources' | 295 }, # end of target 'remoting_browser_test_resources' |
| 297 { | 296 { |
| 298 'target_name': 'remoting_webapp_unittest', | 297 'target_name': 'remoting_webapp_unittest', |
| 299 'type': 'none', | 298 'type': 'none', |
| 300 'variables': { | 299 'variables': { |
| 301 'output_dir': '<(PRODUCT_DIR)/remoting/unittests', | 300 'output_dir': '<(PRODUCT_DIR)/remoting/unittests', |
| 302 'webapp_js_files': [ | 301 'webapp_js_files': [ |
| (...skipping 22 matching lines...) Expand all Loading... |
| 325 'destination': '<(output_dir)/sinonjs', | 324 'destination': '<(output_dir)/sinonjs', |
| 326 'files': [ | 325 'files': [ |
| 327 '../third_party/sinonjs/src/sinon.js', | 326 '../third_party/sinonjs/src/sinon.js', |
| 328 '../third_party/sinonjs/src/sinon-qunit.js', | 327 '../third_party/sinonjs/src/sinon-qunit.js', |
| 329 ], | 328 ], |
| 330 }, | 329 }, |
| 331 { | 330 { |
| 332 'destination': '<(output_dir)', | 331 'destination': '<(output_dir)', |
| 333 'files': [ | 332 'files': [ |
| 334 '<@(webapp_js_files)', | 333 '<@(webapp_js_files)', |
| 335 '<@(remoting_webapp_js_test_common_files)', | 334 '<@(remoting_webapp_unittest_all_files)', |
| 336 '<@(remoting_webapp_unittest_additional_files)', | |
| 337 '<@(remoting_webapp_unittest_js_files)', | |
| 338 ], | 335 ], |
| 339 }, | 336 }, |
| 340 ], | 337 ], |
| 341 'actions': [ | 338 'actions': [ |
| 342 { | 339 { |
| 343 'action_name': 'Build Remoting Webapp unittest.html', | 340 'action_name': 'Build Remoting Webapp unittest.html', |
| 344 'inputs': [ | 341 'inputs': [ |
| 345 'webapp/build-html.py', | 342 'webapp/build-html.py', |
| 346 '<(remoting_webapp_unittest_template_main)', | 343 '<(remoting_webapp_unittest_template_main)', |
| 347 '<@(webapp_js_files)', | 344 '<@(webapp_js_files)', |
| 348 '<@(remoting_webapp_js_test_common_files)', | 345 '<@(remoting_webapp_unittest_js_all_files)' |
| 349 '<@(remoting_webapp_unittest_js_files)' | |
| 350 ], | 346 ], |
| 351 'outputs': [ | 347 'outputs': [ |
| 352 '<(output_dir)/unittest.html', | 348 '<(output_dir)/unittest.html', |
| 353 ], | 349 ], |
| 354 'action': [ | 350 'action': [ |
| 355 'python', 'webapp/build-html.py', | 351 'python', 'webapp/build-html.py', |
| 356 '<@(_outputs)', | 352 '<@(_outputs)', |
| 357 '<(remoting_webapp_unittest_template_main)', | 353 '<(remoting_webapp_unittest_template_main)', |
| 358 # GYP automatically removes subsequent duplicated command line | 354 # GYP automatically removes subsequent duplicated command line |
| 359 # arguments. Therefore, the excludejs flag must be set before the | 355 # arguments. Therefore, the excludejs flag must be set before the |
| 360 # instrumentedjs flag or else GYP will ignore the files in the | 356 # instrumentedjs flag or else GYP will ignore the files in the |
| 361 # exclude list. | 357 # exclude list. |
| 362 '--exclude-js', '<@(remoting_webapp_unittest_exclude_files)', | 358 '--exclude-js', '<@(remoting_webapp_unittest_js_exclude_files)', |
| 363 '--js', '<@(remoting_webapp_unittest_js_files)', | 359 '--js', '<@(remoting_webapp_unittest_js_all_files)', |
| 364 '<@(remoting_webapp_js_test_common_files)', | |
| 365 '--instrument-js', '<@(webapp_js_files)', | 360 '--instrument-js', '<@(webapp_js_files)', |
| 366 ], | 361 ], |
| 367 }, | 362 }, |
| 368 ], | 363 ], |
| 369 }, # end of target 'remoting_webapp_unittest' | 364 }, # end of target 'remoting_webapp_unittest' |
| 370 ], # end of targets | 365 ], # end of targets |
| 371 | 366 |
| 372 'conditions': [ | 367 'conditions': [ |
| 373 ['enable_remoting_host==1', { | 368 ['enable_remoting_host==1', { |
| 374 'targets': [ | 369 'targets': [ |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 'dependencies': [ | 410 'dependencies': [ |
| 416 '../base/allocator/allocator.gyp:allocator', | 411 '../base/allocator/allocator.gyp:allocator', |
| 417 ], | 412 ], |
| 418 }], | 413 }], |
| 419 ], # end of 'conditions' | 414 ], # end of 'conditions' |
| 420 }, # end of target 'remoting_perftests' | 415 }, # end of target 'remoting_perftests' |
| 421 ] | 416 ] |
| 422 }] | 417 }] |
| 423 ] | 418 ] |
| 424 } | 419 } |
| OLD | NEW |