| OLD | NEW |
| 1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. |
| 2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze
ged | 2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze
ged |
| 3 # | 3 # |
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
| 6 # met: | 6 # met: |
| 7 # | 7 # |
| 8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
| 10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
| (...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 results['has_wdiff'] = port_obj.wdiff_available() | 304 results['has_wdiff'] = port_obj.wdiff_available() |
| 305 results['has_pretty_patch'] = port_obj.pretty_patch_available() | 305 results['has_pretty_patch'] = port_obj.pretty_patch_available() |
| 306 results['pixel_tests_enabled'] = port_obj.get_option('pixel_tests') | 306 results['pixel_tests_enabled'] = port_obj.get_option('pixel_tests') |
| 307 results['seconds_since_epoch'] = int(time.time()) | 307 results['seconds_since_epoch'] = int(time.time()) |
| 308 results['build_number'] = port_obj.get_option('build_number') | 308 results['build_number'] = port_obj.get_option('build_number') |
| 309 results['builder_name'] = port_obj.get_option('builder_name') | 309 results['builder_name'] = port_obj.get_option('builder_name') |
| 310 | 310 |
| 311 # Don't do this by default since it takes >100ms. | 311 # Don't do this by default since it takes >100ms. |
| 312 # It's only used for uploading data to the flakiness dashboard. | 312 # It's only used for uploading data to the flakiness dashboard. |
| 313 results['chromium_revision'] = '' | 313 results['chromium_revision'] = '' |
| 314 results['blink_revision'] = '' | 314 # TODO(ojan): Clean this up now that we only have one revision field. |
| 315 # And rename it to sky_revision (requires modifing test-results.appspot). |
| 315 if port_obj.get_option('builder_name'): | 316 if port_obj.get_option('builder_name'): |
| 316 for (name, path) in port_obj.repository_paths(): | 317 for (name, path) in port_obj.repository_paths(): |
| 317 scm = port_obj.host.scm_for_path(path) | 318 scm = port_obj.host.scm_for_path(path) |
| 318 if scm: | 319 if scm: |
| 319 rev = scm.svn_revision(path) | 320 rev = scm.latest_git_commit() |
| 320 if rev: | 321 if rev: |
| 321 results[name.lower() + '_revision'] = rev | 322 results[name.lower() + '_revision'] = rev |
| 322 else: | 323 else: |
| 323 _log.warn('Failed to determine svn revision for %s, ' | 324 _log.warn('Failed to determine revision for %s, ' |
| 324 'leaving "%s_revision" key blank in full_results.json.
' | 325 'leaving "%s_revision" key blank in full_results.json.
' |
| 325 % (path, name)) | 326 % (path, name)) |
| 326 | 327 |
| 328 # TODO(ojan): Change test-results.appspot to not require this field. |
| 329 # test-results.appspot.com requires this field to be a number. :( |
| 330 results['blink_revision'] = 0 |
| 331 |
| 327 return results | 332 return results |
| OLD | NEW |