| 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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 }], | 283 }], |
| 284 ], # end of 'conditions' | 284 ], # end of 'conditions' |
| 285 }, # end of target 'remoting_unittests' | 285 }, # end of target 'remoting_unittests' |
| 286 { | 286 { |
| 287 'target_name': 'remoting_browser_test_resources', | 287 'target_name': 'remoting_browser_test_resources', |
| 288 'type': 'none', | 288 'type': 'none', |
| 289 'copies': [ | 289 'copies': [ |
| 290 { | 290 { |
| 291 'destination': '<(PRODUCT_DIR)/remoting/browser_test_resources', | 291 'destination': '<(PRODUCT_DIR)/remoting/browser_test_resources', |
| 292 'files': [ | 292 'files': [ |
| 293 '<@(remoting_webapp_js_test_common_files)', | 293 '<@(remoting_webapp_browsertest_all_js_files)', |
| 294 '<@(remoting_webapp_js_browser_test_files)', | |
| 295 ], | 294 ], |
| 296 }, | 295 }, |
| 297 ], # end of copies | 296 ], # end of copies |
| 298 }, # end of target 'remoting_browser_test_resources' | 297 }, # end of target 'remoting_browser_test_resources' |
| 299 { | 298 { |
| 300 'target_name': 'remoting_webapp_unittest', | 299 'target_name': 'remoting_webapp_unittest', |
| 301 'type': 'none', | 300 'type': 'none', |
| 302 'variables': { | 301 'variables': { |
| 303 'output_dir': '<(PRODUCT_DIR)/remoting/unittests', | 302 'output_dir': '<(PRODUCT_DIR)/remoting/unittests', |
| 304 'webapp_js_files': [ | 303 'webapp_js_files': [ |
| (...skipping 22 matching lines...) Expand all Loading... |
| 327 'destination': '<(output_dir)/sinonjs', | 326 'destination': '<(output_dir)/sinonjs', |
| 328 'files': [ | 327 'files': [ |
| 329 '../third_party/sinonjs/src/sinon.js', | 328 '../third_party/sinonjs/src/sinon.js', |
| 330 '../third_party/sinonjs/src/sinon-qunit.js', | 329 '../third_party/sinonjs/src/sinon-qunit.js', |
| 331 ], | 330 ], |
| 332 }, | 331 }, |
| 333 { | 332 { |
| 334 'destination': '<(output_dir)', | 333 'destination': '<(output_dir)', |
| 335 'files': [ | 334 'files': [ |
| 336 '<@(webapp_js_files)', | 335 '<@(webapp_js_files)', |
| 337 '<@(remoting_webapp_js_test_common_files)', | 336 '<@(remoting_webapp_unittest_all_files)', |
| 338 '<@(remoting_webapp_unittest_additional_files)', | |
| 339 '<@(remoting_webapp_unittest_js_files)', | |
| 340 ], | 337 ], |
| 341 }, | 338 }, |
| 342 ], | 339 ], |
| 343 'actions': [ | 340 'actions': [ |
| 344 { | 341 { |
| 345 'action_name': 'Build Remoting Webapp unittest.html', | 342 'action_name': 'Build Remoting Webapp unittest.html', |
| 346 'inputs': [ | 343 'inputs': [ |
| 347 'webapp/build-html.py', | 344 'webapp/build-html.py', |
| 348 '<(remoting_webapp_unittest_template_main)', | 345 '<(remoting_webapp_unittest_template_main)', |
| 349 '<@(webapp_js_files)', | 346 '<@(webapp_js_files)', |
| 350 '<@(remoting_webapp_js_test_common_files)', | 347 '<@(remoting_webapp_unittest_all_js_files)' |
| 351 '<@(remoting_webapp_unittest_js_files)' | |
| 352 ], | 348 ], |
| 353 'outputs': [ | 349 'outputs': [ |
| 354 '<(output_dir)/unittest.html', | 350 '<(output_dir)/unittest.html', |
| 355 ], | 351 ], |
| 356 'action': [ | 352 'action': [ |
| 357 'python', 'webapp/build-html.py', | 353 'python', 'webapp/build-html.py', |
| 358 '<@(_outputs)', | 354 '<@(_outputs)', |
| 359 '<(remoting_webapp_unittest_template_main)', | 355 '<(remoting_webapp_unittest_template_main)', |
| 360 # GYP automatically removes subsequent duplicated command line | 356 # GYP automatically removes subsequent duplicated command line |
| 361 # arguments. Therefore, the excludejs flag must be set before the | 357 # arguments. Therefore, the excludejs flag must be set before the |
| 362 # instrumentedjs flag or else GYP will ignore the files in the | 358 # instrumentedjs flag or else GYP will ignore the files in the |
| 363 # exclude list. | 359 # exclude list. |
| 364 '--exclude-js', '<@(remoting_webapp_unittest_exclude_files)', | 360 '--exclude-js', '<@(remoting_webapp_unittest_exclude_js_files)', |
| 365 '--js', '<@(remoting_webapp_unittest_js_files)', | 361 '--js', '<@(remoting_webapp_unittest_all_js_files)', |
| 366 '<@(remoting_webapp_js_test_common_files)', | |
| 367 '--instrument-js', '<@(webapp_js_files)', | 362 '--instrument-js', '<@(webapp_js_files)', |
| 368 ], | 363 ], |
| 369 }, | 364 }, |
| 370 ], | 365 ], |
| 371 }, # end of target 'remoting_webapp_unittest' | 366 }, # end of target 'remoting_webapp_unittest' |
| 372 ], # end of targets | 367 ], # end of targets |
| 373 | 368 |
| 374 'conditions': [ | 369 'conditions': [ |
| 375 ['enable_remoting_host==1', { | 370 ['enable_remoting_host==1', { |
| 376 'targets': [ | 371 'targets': [ |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 417 'dependencies': [ | 412 'dependencies': [ |
| 418 '../base/allocator/allocator.gyp:allocator', | 413 '../base/allocator/allocator.gyp:allocator', |
| 419 ], | 414 ], |
| 420 }], | 415 }], |
| 421 ], # end of 'conditions' | 416 ], # end of 'conditions' |
| 422 }, # end of target 'remoting_perftests' | 417 }, # end of target 'remoting_perftests' |
| 423 ] | 418 ] |
| 424 }] | 419 }] |
| 425 ] | 420 ] |
| 426 } | 421 } |
| OLD | NEW |