| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 DEPS = [ | 5 DEPS = [ |
| 6 'bot_update', | 6 'bot_update', |
| 7 'chromium', | 7 'chromium', |
| 8 'chromium_tests', | 8 'chromium_tests', |
| 9 'gclient', | 9 'gclient', |
| 10 'gpu', | 10 'gpu', |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 bot_update_json['properties']['got_revision']) | 343 bot_update_json['properties']['got_revision']) |
| 344 api.gclient.c.revisions['src/third_party/WebKit'] = str( | 344 api.gclient.c.revisions['src/third_party/WebKit'] = str( |
| 345 bot_update_json['properties']['got_webkit_revision']) | 345 bot_update_json['properties']['got_webkit_revision']) |
| 346 | 346 |
| 347 api.bot_update.ensure_checkout(patch=False, force=True) | 347 api.bot_update.ensure_checkout(patch=False, force=True) |
| 348 api.chromium.runhooks() | 348 api.chromium.runhooks() |
| 349 api.isolate.clean_isolated_files(api.chromium.output_dir) | 349 api.isolate.clean_isolated_files(api.chromium.output_dir) |
| 350 api.chromium.compile() | 350 api.chromium.compile() |
| 351 api.isolate.isolate_tests(api.chromium.output_dir) | 351 api.isolate.isolate_tests(api.chromium.output_dir) |
| 352 | 352 |
| 353 tests = [api.chromium.steps.BlinkTest(api)] | 353 tests = [api.chromium.steps.BlinkTest()] |
| 354 | 354 |
| 355 # TODO(sergiyb): Flag enable_gpu_tests is used to enable GPU tests. This | 355 # TODO(sergiyb): Flag enable_gpu_tests is used to enable GPU tests. This |
| 356 # is however a temporary measure to enable them in GenTests, but not in | 356 # is however a temporary measure to enable them in GenTests, but not in |
| 357 # production. Once respective slaves are moved to swarming, this flag should | 357 # production. Once respective slaves are moved to swarming, this flag should |
| 358 # be removed. | 358 # be removed. |
| 359 if (api.properties['mastername'] == 'tryserver.blink' and | 359 if (api.properties['mastername'] == 'tryserver.blink' and |
| 360 api.properties['buildername'] == 'mac_blink_rel' and | 360 api.properties['buildername'] == 'mac_blink_rel' and |
| 361 api.properties.get('enable_gpu_tests', False)): | 361 api.properties.get('enable_gpu_tests', False)): |
| 362 tests.extend(api.gpu.create_tests( | 362 tests.extend(api.gpu.create_tests( |
| 363 bot_update_step.presentation.properties['got_revision'], | 363 bot_update_step.presentation.properties['got_revision'], |
| (...skipping 30 matching lines...) Expand all Loading... |
| 394 for buildername, bot_config in master_config['builders'].iteritems(): | 394 for buildername, bot_config in master_config['builders'].iteritems(): |
| 395 test_name = 'full_%s_%s' % (_sanitize_nonalpha(mastername), | 395 test_name = 'full_%s_%s' % (_sanitize_nonalpha(mastername), |
| 396 _sanitize_nonalpha(buildername)) | 396 _sanitize_nonalpha(buildername)) |
| 397 tests = [] | 397 tests = [] |
| 398 if bot_config['compile_only']: | 398 if bot_config['compile_only']: |
| 399 tests.append(api.test(test_name)) | 399 tests.append(api.test(test_name)) |
| 400 else: | 400 else: |
| 401 for pass_first in (True, False): | 401 for pass_first in (True, False): |
| 402 test = ( | 402 test = ( |
| 403 api.test(test_name + ('_pass' if pass_first else '_fail')) + | 403 api.test(test_name + ('_pass' if pass_first else '_fail')) + |
| 404 api.step_data(with_patch, canned_test(passing=pass_first)) | 404 api.override_step_data(with_patch, canned_test(passing=pass_first)) |
| 405 ) | 405 ) |
| 406 if not pass_first: | 406 if not pass_first: |
| 407 test += api.step_data( | 407 test += api.override_step_data( |
| 408 without_patch, canned_test(passing=False, minimal=True)) | 408 without_patch, canned_test(passing=False, minimal=True)) |
| 409 tests.append(test) | 409 tests.append(test) |
| 410 | 410 |
| 411 for test in tests: | 411 for test in tests: |
| 412 test += ( | 412 test += ( |
| 413 properties(mastername, buildername, | 413 properties(mastername, buildername, |
| 414 blamelist_real=['someone@chromium.org']) + | 414 blamelist_real=['someone@chromium.org']) + |
| 415 api.platform(bot_config['testing']['platform'], | 415 api.platform(bot_config['testing']['platform'], |
| 416 bot_config.get( | 416 bot_config.get( |
| 417 'chromium_config_kwargs', {}).get('TARGET_BITS', 64)) | 417 'chromium_config_kwargs', {}).get('TARGET_BITS', 64)) |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 479 canned_test(passing=False, | 479 canned_test(passing=False, |
| 480 num_additional_failures=125)) + | 480 num_additional_failures=125)) + |
| 481 api.override_step_data(without_patch, | 481 api.override_step_data(without_patch, |
| 482 canned_test(passing=True, minimal=True)) | 482 canned_test(passing=True, minimal=True)) |
| 483 ) | 483 ) |
| 484 | 484 |
| 485 yield ( | 485 yield ( |
| 486 api.test('non_cq_tryjob') + | 486 api.test('non_cq_tryjob') + |
| 487 properties('tryserver.blink', 'win_blink_rel', | 487 properties('tryserver.blink', 'win_blink_rel', |
| 488 requester='someone@chromium.org') + | 488 requester='someone@chromium.org') + |
| 489 api.step_data(with_patch, canned_test(passing=True)) | 489 api.override_step_data(with_patch, canned_test(passing=True)) |
| 490 ) | 490 ) |
| 491 | 491 |
| 492 yield ( | 492 yield ( |
| 493 api.test('gpu_tests') + | 493 api.test('gpu_tests') + |
| 494 # TODO(sergiyb): Flag enable_gpu_tests is used to enable GPU tests. This | 494 # TODO(sergiyb): Flag enable_gpu_tests is used to enable GPU tests. This |
| 495 # is however a temporary measure to enable them in GenTests, but not in | 495 # is however a temporary measure to enable them in GenTests, but not in |
| 496 # production. Once respective slaves are moved to swarming, this flag should | 496 # production. Once respective slaves are moved to swarming, this flag should |
| 497 # be removed. | 497 # be removed. |
| 498 properties('tryserver.blink', 'mac_blink_rel', enable_gpu_tests=True) + | 498 properties('tryserver.blink', 'mac_blink_rel', enable_gpu_tests=True) + |
| 499 api.platform.name('mac') + | 499 api.platform.name('mac') + |
| 500 api.step_data(with_patch, canned_test(passing=True)) + | 500 api.override_step_data(with_patch, canned_test(passing=True)) + |
| 501 api.override_step_data( | 501 api.override_step_data( |
| 502 'pixel_test on Intel GPU (with patch) on Mac', | 502 'pixel_test on Intel GPU (with patch) on Mac', |
| 503 api.json.canned_telemetry_gpu_output(passing=False, swarming=True)) + | 503 api.json.canned_telemetry_gpu_output(passing=False, swarming=True)) + |
| 504 api.override_step_data( | 504 api.override_step_data( |
| 505 'pixel_test on Intel GPU (without patch) on Mac', | 505 'pixel_test on Intel GPU (without patch) on Mac', |
| 506 api.json.canned_telemetry_gpu_output(passing=False, swarming=True)) | 506 api.json.canned_telemetry_gpu_output(passing=False, swarming=True)) |
| 507 ) | 507 ) |
| OLD | NEW |