| OLD | NEW |
| 1 # Copyright (C) 2011 Google Inc. All rights reserved. | 1 # Copyright (C) 2011 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 testname = self._test_name | 213 testname = self._test_name |
| 214 | 214 |
| 215 if driver_output.crash: | 215 if driver_output.crash: |
| 216 failures.append(test_failures.FailureCrash(bool(reference_filename), | 216 failures.append(test_failures.FailureCrash(bool(reference_filename), |
| 217 driver_output.crashed_pro
cess_name, | 217 driver_output.crashed_pro
cess_name, |
| 218 driver_output.crashed_pid
)) | 218 driver_output.crashed_pid
)) |
| 219 if driver_output.error: | 219 if driver_output.error: |
| 220 _log.debug("%s %s crashed, (stderr lines):" % (self._worker_name
, testname)) | 220 _log.debug("%s %s crashed, (stderr lines):" % (self._worker_name
, testname)) |
| 221 else: | 221 else: |
| 222 _log.debug("%s %s crashed, (no stderr)" % (self._worker_name, te
stname)) | 222 _log.debug("%s %s crashed, (no stderr)" % (self._worker_name, te
stname)) |
| 223 elif driver_output.leak: |
| 224 failures.append(test_failures.FailureLeak(bool(reference_filename), |
| 225 driver_output.leak_log)) |
| 226 _log.debug("%s %s leaked" % (self._worker_name, testname)) |
| 223 elif driver_output.error: | 227 elif driver_output.error: |
| 224 _log.debug("%s %s output stderr lines:" % (self._worker_name, testna
me)) | 228 _log.debug("%s %s output stderr lines:" % (self._worker_name, testna
me)) |
| 225 for line in driver_output.error.splitlines(): | 229 for line in driver_output.error.splitlines(): |
| 226 _log.debug(" %s" % line) | 230 _log.debug(" %s" % line) |
| 227 return failures | 231 return failures |
| 228 | 232 |
| 229 def _compare_output(self, expected_driver_output, driver_output): | 233 def _compare_output(self, expected_driver_output, driver_output): |
| 230 failures = [] | 234 failures = [] |
| 231 failures.extend(self._handle_error(driver_output)) | 235 failures.extend(self._handle_error(driver_output)) |
| 232 | 236 |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 elif reference_driver_output.image_hash != actual_driver_output.image_ha
sh: | 398 elif reference_driver_output.image_hash != actual_driver_output.image_ha
sh: |
| 395 diff, err_str = self._port.diff_image(reference_driver_output.image,
actual_driver_output.image) | 399 diff, err_str = self._port.diff_image(reference_driver_output.image,
actual_driver_output.image) |
| 396 if diff: | 400 if diff: |
| 397 failures.append(test_failures.FailureReftestMismatch(reference_f
ilename)) | 401 failures.append(test_failures.FailureReftestMismatch(reference_f
ilename)) |
| 398 elif err_str: | 402 elif err_str: |
| 399 _log.error(err_str) | 403 _log.error(err_str) |
| 400 else: | 404 else: |
| 401 _log.warning(" %s -> ref test hashes didn't match but diff pass
ed" % self._test_name) | 405 _log.warning(" %s -> ref test hashes didn't match but diff pass
ed" % self._test_name) |
| 402 | 406 |
| 403 return TestResult(self._test_name, failures, total_test_time, has_stderr
, pid=actual_driver_output.pid) | 407 return TestResult(self._test_name, failures, total_test_time, has_stderr
, pid=actual_driver_output.pid) |
| OLD | NEW |