Commit 2ed3ced4 authored by zandobersek@gmail.com's avatar zandobersek@gmail.com

Unreviewed, rolling out r161512.

http://trac.webkit.org/changeset/161512
https://bugs.webkit.org/show_bug.cgi?id=126655

Broke webkitpy tests (Requested by ap on #webkit).

Patch by Commit Queue <commit-queue@webkit.org> on 2014-01-08

* Scripts/webkitpy/port/gtk.py:
(GtkPort.__init__):
(GtkPort.setup_test_run):
(GtkPort._port_specific_expectations_files):
* Scripts/webkitpy/port/leakdetector_valgrind.py: Removed.
* Scripts/webkitpy/port/leakdetector_valgrind_unittest.py: Removed.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@161520 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 69de48e6
2014-01-08 Commit Queue <commit-queue@webkit.org>
Unreviewed, rolling out r161512.
http://trac.webkit.org/changeset/161512
https://bugs.webkit.org/show_bug.cgi?id=126655
Broke webkitpy tests (Requested by ap on #webkit).
* Scripts/webkitpy/port/gtk.py:
(GtkPort.__init__):
(GtkPort.setup_test_run):
(GtkPort._port_specific_expectations_files):
* Scripts/webkitpy/port/leakdetector_valgrind.py: Removed.
* Scripts/webkitpy/port/leakdetector_valgrind_unittest.py: Removed.
2014-01-08 Commit Queue <commit-queue@webkit.org>
Unreviewed, rolling out r161517.
......
......@@ -38,7 +38,6 @@ from webkitpy.port.pulseaudio_sanitizer import PulseAudioSanitizer
from webkitpy.port.xvfbdriver import XvfbDriver
from webkitpy.port.westondriver import WestonDriver
from webkitpy.port.linux_get_crash_log import GDBCrashLogGenerator
from webkitpy.port.leakdetector_valgrind import LeakDetectorValgrind
class GtkPort(Port):
......@@ -47,7 +46,6 @@ class GtkPort(Port):
def __init__(self, *args, **kwargs):
super(GtkPort, self).__init__(*args, **kwargs)
self._pulseaudio_sanitizer = PulseAudioSanitizer()
self._leakdetector = LeakDetectorValgrind(self._filesystem, self.results_directory())
if self.get_option("leaks"):
if not self.get_option("wrapper"):
......@@ -83,9 +81,6 @@ class GtkPort(Port):
super(GtkPort, self).setup_test_run()
self._pulseaudio_sanitizer.unload_pulseaudio_module()
if self.get_option("leaks"):
self._leakdetector.clean_leaks_files_from_results_directory()
def clean_up_test_run(self):
super(GtkPort, self).clean_up_test_run()
self._pulseaudio_sanitizer.restore_pulseaudio_module()
......@@ -164,16 +159,6 @@ class GtkPort(Port):
def _port_specific_expectations_files(self):
return [self._filesystem.join(self._webkit_baseline_path(p), 'TestExpectations') for p in reversed(self._search_paths())]
def print_leaks_summary(self):
if not self.get_option('leaks'):
return
# FIXME: This is a hack, but we don't have a better way to get this information from the workers yet
# because we're in the manager process.
leaks_files = self._leakdetector.leaks_files_in_results_directory()
if not leaks_files:
return
self._leakdetector.parse_and_print_leaks_detail(leaks_files)
# FIXME: We should find a way to share this implmentation with Gtk,
# or teach run-launcher how to call run-safari and move this down to Port.
def show_results_html_file(self, results_filename):
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment