| OLD | NEW | 
|    1 # Copyright 2015 The Chromium Authors. All rights reserved. |    1 # Copyright 2015 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   'depot_tools/gclient', |    6   'depot_tools/gclient', | 
|    7   'ios', |    7   'ios', | 
|    8   'recipe_engine/json', |    8   'recipe_engine/json', | 
|    9   'recipe_engine/platform', |    9   'recipe_engine/platform', | 
|   10   'recipe_engine/properties', |   10   'recipe_engine/properties', | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
|   21     api.ios.read_build_config(master_name='chromium.mac') |   21     api.ios.read_build_config(master_name='chromium.mac') | 
|   22     try: |   22     try: | 
|   23       api.ios.build(suffix='with patch') |   23       api.ios.build(suffix='with patch') | 
|   24     except api.step.StepFailure: |   24     except api.step.StepFailure: | 
|   25       bot_update_json = bot_update_step.json.output |   25       bot_update_json = bot_update_step.json.output | 
|   26       api.gclient.c.revisions['src'] = str( |   26       api.gclient.c.revisions['src'] = str( | 
|   27           bot_update_json['properties']['got_revision']) |   27           bot_update_json['properties']['got_revision']) | 
|   28       api.ios.checkout(patch=False, update_presentation=False) |   28       api.ios.checkout(patch=False, update_presentation=False) | 
|   29       api.ios.build(suffix='without patch') |   29       api.ios.build(suffix='without patch') | 
|   30       raise |   30       raise | 
|   31     if api.properties['buildername'] == 'ios-simulator-swarming': |   31     api.ios.test_swarming() | 
|   32       api.ios.test_swarming() |  | 
|   33     else: |  | 
|   34       api.ios.test() |  | 
|   35  |   32  | 
|   36 def GenTests(api): |   33 def GenTests(api): | 
|   37   def suppress_analyze(): |   34   def suppress_analyze(): | 
|   38     """Overrides analyze step data so that all targets get compiled.""" |   35     """Overrides analyze step data so that all targets get compiled.""" | 
|   39     return api.override_step_data( |   36     return api.override_step_data( | 
|   40         'read filter exclusion spec', |   37         'read filter exclusion spec', | 
|   41         api.json.output({ |   38         api.json.output({ | 
|   42             'base': { |   39             'base': { | 
|   43                 'exclusions': ['f.*'], |   40                 'exclusions': ['f.*'], | 
|   44             }, |   41             }, | 
| (...skipping 30 matching lines...) Expand all  Loading... | 
|   75       'configuration': 'Debug', |   72       'configuration': 'Debug', | 
|   76       'sdk': 'iphonesimulator8.0', |   73       'sdk': 'iphonesimulator8.0', | 
|   77       'tests': [ |   74       'tests': [ | 
|   78         { |   75         { | 
|   79           'app': 'fake tests', |   76           'app': 'fake tests', | 
|   80           'device type': 'fake device', |   77           'device type': 'fake device', | 
|   81           'os': '8.1', |   78           'os': '8.1', | 
|   82         }, |   79         }, | 
|   83       ], |   80       ], | 
|   84     }) |   81     }) | 
 |   82     + api.step_data( | 
 |   83         'bootstrap swarming.swarming.py --version', | 
 |   84         stdout=api.raw_io.output('1.2.3'), | 
 |   85     ) | 
 |   86     + suppress_analyze() | 
|   85   ) |   87   ) | 
|   86  |   88  | 
|   87   yield ( |   89   yield ( | 
 |   90     api.test('no_tests') | 
 |   91     + api.platform('mac', 64) | 
 |   92     + api.properties(patch_url='patch url') | 
 |   93     + api.properties( | 
 |   94       buildername='ios-simulator', | 
 |   95       buildnumber='0', | 
 |   96       issue=123456, | 
 |   97       mastername='tryserver.fake', | 
 |   98       patchset=1, | 
 |   99       rietveld='fake://rietveld.url', | 
 |  100       slavename='fake-vm', | 
 |  101       path_config='kitchen', | 
 |  102     ) | 
 |  103     + api.ios.make_test_build_config({ | 
 |  104       'xcode version': 'fake xcode version', | 
 |  105       'GYP_DEFINES': { | 
 |  106         'fake gyp define 1': 'fake value 1', | 
 |  107         'fake gyp define 2': 'fake value 2', | 
 |  108       }, | 
 |  109       'compiler': 'ninja', | 
 |  110       'configuration': 'Debug', | 
 |  111       'sdk': 'iphonesimulator8.0', | 
 |  112       'tests': [ | 
 |  113       ], | 
 |  114     }) | 
 |  115     + api.step_data( | 
 |  116         'bootstrap swarming.swarming.py --version', | 
 |  117         stdout=api.raw_io.output('1.2.3'), | 
 |  118     ) | 
 |  119     + suppress_analyze() | 
 |  120   ) | 
 |  121  | 
 |  122   yield ( | 
|   88     api.test('swarming') |  123     api.test('swarming') | 
|   89     + api.platform('mac', 64) |  124     + api.platform('mac', 64) | 
|   90     + api.properties(patch_url='patch url') |  125     + api.properties(patch_url='patch url') | 
|   91     + api.properties( |  126     + api.properties( | 
|   92       buildername='ios-simulator-swarming', |  127       buildername='ios-simulator-swarming', | 
|   93       buildnumber='0', |  128       buildnumber='0', | 
|   94       issue=123456, |  129       issue=123456, | 
|   95       mastername='tryserver.fake', |  130       mastername='tryserver.fake', | 
|   96       patchset=1, |  131       patchset=1, | 
|   97       rietveld='fake://rietveld.url', |  132       rietveld='fake://rietveld.url', | 
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  185       'configuration': 'Debug', |  220       'configuration': 'Debug', | 
|  186       'sdk': 'iphonesimulator8.0', |  221       'sdk': 'iphonesimulator8.0', | 
|  187       'tests': [ |  222       'tests': [ | 
|  188         { |  223         { | 
|  189           'app': 'fake tests', |  224           'app': 'fake tests', | 
|  190           'device type': 'fake device', |  225           'device type': 'fake device', | 
|  191           'os': '8.1', |  226           'os': '8.1', | 
|  192         }, |  227         }, | 
|  193       ], |  228       ], | 
|  194     }) |  229     }) | 
 |  230     + api.step_data( | 
 |  231         'bootstrap swarming.swarming.py --version', | 
 |  232         stdout=api.raw_io.output('1.2.3'), | 
 |  233     ) | 
 |  234     + suppress_analyze() | 
|  195   ) |  235   ) | 
|  196  |  236  | 
|  197   yield ( |  237   yield ( | 
|  198     api.test('parent') |  238     api.test('parent') | 
|  199     + api.platform('mac', 64) |  239     + api.platform('mac', 64) | 
|  200     + api.properties(patch_url='patch url') |  240     + api.properties(patch_url='patch url') | 
|  201     + api.properties( |  241     + api.properties( | 
|  202       buildername='ios', |  242       buildername='ios', | 
|  203       buildnumber='0', |  243       buildnumber='0', | 
|  204       issue=123456, |  244       issue=123456, | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
|  217           'os': '8.1', |  257           'os': '8.1', | 
|  218         }, |  258         }, | 
|  219       ], |  259       ], | 
|  220     }) |  260     }) | 
|  221     + api.ios.make_test_build_config_for_parent({ |  261     + api.ios.make_test_build_config_for_parent({ | 
|  222       'xcode version': 'fake xcode version', |  262       'xcode version': 'fake xcode version', | 
|  223       'GYP_DEFINES': { |  263       'GYP_DEFINES': { | 
|  224         'fake gyp define 1': 'fake value 1', |  264         'fake gyp define 1': 'fake value 1', | 
|  225         'fake gyp define 2': 'fake value 2', |  265         'fake gyp define 2': 'fake value 2', | 
|  226       }, |  266       }, | 
|  227       'compiler': 'xcodebuild', |  267       'compiler': 'ninja', | 
|  228       'configuration': 'Debug', |  268       'configuration': 'Debug', | 
|  229       'sdk': 'iphonesimulator8.0', |  269       'sdk': 'iphonesimulator8.0', | 
|  230       'use_mb': False, |  | 
|  231     }) |  270     }) | 
 |  271     + api.step_data( | 
 |  272         'bootstrap swarming.swarming.py --version', | 
 |  273         stdout=api.raw_io.output('1.2.3'), | 
 |  274     ) | 
 |  275     + suppress_analyze() | 
|  232   ) |  276   ) | 
|  233  |  277  | 
|  234   yield ( |  278   yield ( | 
|  235     api.test('without_patch_success') |  279     api.test('without_patch_success') | 
|  236     + api.platform('mac', 64) |  280     + api.platform('mac', 64) | 
|  237     + api.properties(patch_url='patch url') |  281     + api.properties(patch_url='patch url') | 
|  238     + api.properties( |  282     + api.properties( | 
|  239       buildername='ios', |  283       buildername='ios', | 
|  240       buildnumber='0', |  284       buildnumber='0', | 
|  241       issue=123456, |  285       issue=123456, | 
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  330       'configuration': 'Debug', |  374       'configuration': 'Debug', | 
|  331       'sdk': 'iphonesimulator8.0', |  375       'sdk': 'iphonesimulator8.0', | 
|  332       'tests': [ |  376       'tests': [ | 
|  333         { |  377         { | 
|  334           'app': 'fake tests', |  378           'app': 'fake tests', | 
|  335           'device type': 'fake device', |  379           'device type': 'fake device', | 
|  336           'os': '8.1', |  380           'os': '8.1', | 
|  337         }, |  381         }, | 
|  338       ], |  382       ], | 
|  339     }) |  383     }) | 
 |  384     + api.step_data( | 
 |  385         'bootstrap swarming.swarming.py --version', | 
 |  386         stdout=api.raw_io.output('1.2.3'), | 
 |  387     ) | 
 |  388     + suppress_analyze() | 
|  340   ) |  389   ) | 
|  341  |  390  | 
|  342   yield ( |  391   yield ( | 
|  343     api.test('gyp_goma') |  392     api.test('gyp_goma') | 
|  344     + api.platform('mac', 64) |  393     + api.platform('mac', 64) | 
|  345     + api.properties(patch_url='patch url') |  394     + api.properties(patch_url='patch url') | 
|  346     + api.properties( |  395     + api.properties( | 
|  347       buildername='ios-simulator', |  396       buildername='ios-simulator', | 
|  348       buildnumber='0', |  397       buildnumber='0', | 
|  349       issue=123456, |  398       issue=123456, | 
| (...skipping 19 matching lines...) Expand all  Loading... | 
|  369       'configuration': 'Debug', |  418       'configuration': 'Debug', | 
|  370       'sdk': 'iphonesimulator8.0', |  419       'sdk': 'iphonesimulator8.0', | 
|  371       'tests': [ |  420       'tests': [ | 
|  372         { |  421         { | 
|  373           'app': 'fake tests', |  422           'app': 'fake tests', | 
|  374           'device type': 'fake device', |  423           'device type': 'fake device', | 
|  375           'os': '8.1', |  424           'os': '8.1', | 
|  376         }, |  425         }, | 
|  377       ], |  426       ], | 
|  378     }) |  427     }) | 
 |  428     + api.step_data( | 
 |  429         'bootstrap swarming.swarming.py --version', | 
 |  430         stdout=api.raw_io.output('1.2.3'), | 
 |  431     ) | 
 |  432     + suppress_analyze() | 
|  379   ) |  433   ) | 
| OLD | NEW |