| 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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 if bugs: | 247 if bugs: |
| 248 test_dict['bugs'] = bugs | 248 test_dict['bugs'] = bugs |
| 249 | 249 |
| 250 if result.reftest_type: | 250 if result.reftest_type: |
| 251 test_dict.update(reftest_type=list(result.reftest_type)) | 251 test_dict.update(reftest_type=list(result.reftest_type)) |
| 252 | 252 |
| 253 test_dict['expected'] = expected | 253 test_dict['expected'] = expected |
| 254 test_dict['actual'] = " ".join(actual) | 254 test_dict['actual'] = " ".join(actual) |
| 255 | 255 |
| 256 def is_expected(actual_result): | 256 def is_expected(actual_result): |
| 257 return expectations.matches_an_expected_result(test_name, result_typ
e, port_obj.get_option('pixel_tests') or result.reftest_type) | 257 return expectations.matches_an_expected_result(test_name, result_typ
e, |
| 258 port_obj.get_option('pixel_tests') or result.reftest_type, |
| 259 port_obj.get_option('enable_sanitizer')) |
| 258 | 260 |
| 259 # To avoid bloating the output results json too much, only add an entry
for whether the failure is unexpected. | 261 # To avoid bloating the output results json too much, only add an entry
for whether the failure is unexpected. |
| 260 if not all(is_expected(actual_result) for actual_result in actual): | 262 if not all(is_expected(actual_result) for actual_result in actual): |
| 261 test_dict['is_unexpected'] = True | 263 test_dict['is_unexpected'] = True |
| 262 | 264 |
| 263 test_dict.update(_interpret_test_failures(result.failures)) | 265 test_dict.update(_interpret_test_failures(result.failures)) |
| 264 | 266 |
| 265 if retry_results: | 267 if retry_results: |
| 266 retry_result = retry_results.unexpected_results_by_name.get(test_nam
e) | 268 retry_result = retry_results.unexpected_results_by_name.get(test_nam
e) |
| 267 if retry_result: | 269 if retry_result: |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 except Exception, e: | 318 except Exception, e: |
| 317 _log.warn("Failed to determine svn revision for checkout (cwd: %s, webki
t_base: %s), leaving 'revision' key blank in full_results.json.\n%s" % (port_obj
._filesystem.getcwd(), port_obj.path_from_webkit_base(), e)) | 319 _log.warn("Failed to determine svn revision for checkout (cwd: %s, webki
t_base: %s), leaving 'revision' key blank in full_results.json.\n%s" % (port_obj
._filesystem.getcwd(), port_obj.path_from_webkit_base(), e)) |
| 318 # Handle cases where we're running outside of version control. | 320 # Handle cases where we're running outside of version control. |
| 319 import traceback | 321 import traceback |
| 320 _log.debug('Failed to learn head svn revision:') | 322 _log.debug('Failed to learn head svn revision:') |
| 321 _log.debug(traceback.format_exc()) | 323 _log.debug(traceback.format_exc()) |
| 322 results['chromium_revision'] = "" | 324 results['chromium_revision'] = "" |
| 323 results['blink_revision'] = "" | 325 results['blink_revision'] = "" |
| 324 | 326 |
| 325 return results | 327 return results |
| OLD | NEW |