Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Tools / Scripts / webkitpy / layout_tests / port / linux.py

diff --git a/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py b/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py
index 3c6fb94..767b2b0 100644 (file)
--- a/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py
+++ b/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py
@@ -30,6 +30,8 @@ import logging
 import re
 
 from webkitpy.common.webkit_finder import WebKitFinder
+from webkitpy.layout_tests.breakpad.dump_reader_multipart import DumpReaderLinux
+from webkitpy.layout_tests.models import test_run_results
 from webkitpy.layout_tests.port import base
 from webkitpy.layout_tests.port import win
 from webkitpy.layout_tests.port import config
@@ -98,12 +100,13 @@ class LinuxPort(base.Port):
         assert port_name in ('linux', 'linux-x86', 'linux-x86_64')
         self._version = 'lucid'  # We only support lucid right now.
         self._architecture = arch
+        if not self.get_option('disable_breakpad'):
+            self._dump_reader = DumpReaderLinux(host, self._build_path())
 
     def additional_drt_flag(self):
         flags = super(LinuxPort, self).additional_drt_flag()
-        # FIXME: Temporarily disable the sandbox on Linux until we can get
-        # stacktraces via breakpad. http://crbug.com/247431
-        flags += ['--no-sandbox']
+        if not self.get_option('disable_breakpad'):
+            flags += ['--enable-crash-reporter', '--crash-dumps-dir=%s' % self._dump_reader.crash_dumps_directory()]
         return flags
 
     def default_baseline_search_path(self):
@@ -115,12 +118,22 @@ class LinuxPort(base.Port):
 
     def check_build(self, needs_http, printer):
         result = super(LinuxPort, self).check_build(needs_http, printer)
+
         if result:
             _log.error('For complete Linux build requirements, please see:')
             _log.error('')
             _log.error('    http://code.google.com/p/chromium/wiki/LinuxBuildInstructions')
         return result
 
+    def look_for_new_crash_logs(self, crashed_processes, start_time):
+        if self.get_option('disable_breakpad'):
+            return None
+        return self._dump_reader.look_for_new_crash_logs(crashed_processes, start_time)
+
+    def clobber_old_port_specific_results(self):
+        if not self.get_option('disable_breakpad'):
+            self._dump_reader.clobber_old_results()
+
     def operating_system(self):
         return 'linux'
 
@@ -138,8 +151,8 @@ class LinuxPort(base.Port):
     #
 
     def _check_apache_install(self):
-        result = self._check_file_exists(self._path_to_apache(), "apache2")
-        result = self._check_file_exists(self._path_to_apache_config_file(), "apache2 config file") and result
+        result = self._check_file_exists(self.path_to_apache(), "apache2")
+        result = self._check_file_exists(self.path_to_apache_config_file(), "apache2 config file") and result
         if not result:
             _log.error('    Please install using: "sudo apt-get install apache2 libapache2-mod-php5"')
             _log.error('')
@@ -158,7 +171,7 @@ class LinuxPort(base.Port):
     def _wdiff_missing_message(self):
         return 'wdiff is not installed; please install using "sudo apt-get install wdiff"'
 
-    def _path_to_apache(self):
+    def path_to_apache(self):
         # The Apache binary path can vary depending on OS and distribution
         # See http://wiki.apache.org/httpd/DistrosDefaultLayout
         for path in ["/usr/sbin/httpd", "/usr/sbin/apache2"]:
@@ -167,13 +180,13 @@ class LinuxPort(base.Port):
         _log.error("Could not find apache. Not installed or unknown path.")
         return None
 
-    def _path_to_lighttpd(self):
+    def path_to_lighttpd(self):
         return "/usr/sbin/lighttpd"
 
-    def _path_to_lighttpd_modules(self):
+    def path_to_lighttpd_modules(self):
         return "/usr/lib/lighttpd"
 
-    def _path_to_lighttpd_php(self):
+    def path_to_lighttpd_php(self):
         return "/usr/bin/php-cgi"
 
     def _path_to_driver(self, configuration=None):