Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Side by Side Diff: Tools/Scripts/webkitpy/layout_tests/port/test.py

Issue 1318813005: Revert of Fix reftest crash logs (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright (C) 2010 Google Inc. All rights reserved. 1 # Copyright (C) 2010 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 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 crashed_pid = 1 636 crashed_pid = 1
637 elif web_process_crash: 637 elif web_process_crash:
638 crashed_process_name = 'WebProcess' 638 crashed_process_name = 'WebProcess'
639 crashed_pid = 2 639 crashed_pid = 2
640 640
641 crash_log = '' 641 crash_log = ''
642 if crashed_process_name: 642 if crashed_process_name:
643 crash_logs = CrashLogs(self._port.host) 643 crash_logs = CrashLogs(self._port.host)
644 crash_log = crash_logs.find_newest_log(crashed_process_name, None) o r '' 644 crash_log = crash_logs.find_newest_log(crashed_process_name, None) o r ''
645 645
646 if 'crash-reftest.html' in test_name:
647 crashed_process_name = self._port.driver_name()
648 crashed_pid = 3
649 crash = True
650 crash_log = 'reftest crash log'
651
652 if stop_when_done: 646 if stop_when_done:
653 self.stop() 647 self.stop()
654 648
655 if test.actual_checksum == driver_input.image_hash: 649 if test.actual_checksum == driver_input.image_hash:
656 image = None 650 image = None
657 else: 651 else:
658 image = test.actual_image 652 image = test.actual_image
659 return DriverOutput(actual_text, image, test.actual_checksum, audio, 653 return DriverOutput(actual_text, image, test.actual_checksum, audio,
660 crash=(crash or web_process_crash), crashed_process_name=crashed_pro cess_name, 654 crash=(crash or web_process_crash), crashed_process_name=crashed_pro cess_name,
661 crashed_pid=crashed_pid, crash_log=crash_log, 655 crashed_pid=crashed_pid, crash_log=crash_log,
662 test_time=time.time() - start_time, timeout=test.timeout, error=test .error, pid=self.pid, 656 test_time=time.time() - start_time, timeout=test.timeout, error=test .error, pid=self.pid,
663 leak=test.leak) 657 leak=test.leak)
664 658
665 def stop(self): 659 def stop(self):
666 self.started = False 660 self.started = False
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698