Don't like ads? PRO users don't see any ads ;-)
Public Pastes
Guest

Untitled

By: a guest on Apr 28th, 2012  |  syntax: None  |  size: 3.04 KB  |  hits: 8  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff --git a/Tools/ChangeLog b/Tools/ChangeLog
  2. index eedd122..a8b154a 100644
  3. --- a/Tools/ChangeLog
  4. +++ b/Tools/ChangeLog
  5. @@ -1,3 +1,12 @@
  6. +2011-06-14  Kristóf Kosztyó  <Kosztyo.Kristof@stud.u-szeged.hu>
  7. +
  8. +        Reviewed by NOBODY (OOPS!).
  9. +
  10. +        [NRWT] Print error message when there is no httpd present on the system
  11. +        https://bugs.webkit.org/show_bug.cgi?id=62027
  12. +
  13. +        * Scripts/webkitpy/layout_tests/port/apache_http_server.py:
  14. +
  15.  2011-06-09  Csaba Osztrogonác  <ossy@webkit.org>
  16.  
  17.          Unreviewed rolling out r88471, because it broke plugin tests on Qt.
  18. diff --git a/Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py b/Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py
  19. index 05a2338..b39074b 100644
  20. --- a/Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py
  21. +++ b/Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py
  22. @@ -206,6 +206,11 @@ class LayoutTestApacheHttpd(http_server_base.HttpServerBase):
  23.              return False
  24.          return True
  25.  
  26. +    def _has_httpd(self):
  27. +        if not(os.system(self._start_cmd + " -v >" + os.devnull)):
  28. +            return True
  29. +        return False
  30. +
  31.      def start(self):
  32.          """Starts the apache http server."""
  33.          # Stop any currently running servers.
  34. diff --git a/Tools/Scripts/webkitpy/layout_tests/port/base.py b/Tools/Scripts/webkitpy/layout_tests/port/base.py
  35. index bf4be0c..ce34e7d 100755
  36. --- a/Tools/Scripts/webkitpy/layout_tests/port/base.py
  37. +++ b/Tools/Scripts/webkitpy/layout_tests/port/base.py
  38. @@ -188,6 +188,8 @@ class Port(object):
  39.          This step can be skipped with --nocheck-sys-deps.
  40.  
  41.          Returns whether the system is properly configured."""
  42. +        self.check_httpd()
  43. +
  44.          return True
  45.  
  46.      def check_image_diff(self, override_step=None, logging=True):
  47. @@ -227,6 +229,14 @@ class Port(object):
  48.  
  49.          return True
  50.  
  51. +    def check_httpd(self):
  52. +        if self.get_option('use_apache'):
  53. +            server = apache_http_server.LayoutTestApacheHttpd(self, self.results_directory())
  54. +        else:
  55. +            server = http_server.Lighttpd(self, self.results_directory())
  56. +        if not(server._has_httpd()):
  57. +            raise Exception('No httpd found. Cannot run http tests.')
  58. +
  59.      def compare_text(self, expected_text, actual_text):
  60.          """Return whether or not the two strings are *not* equal. This
  61.          routine is used to diff text output.
  62. diff --git a/Tools/Scripts/webkitpy/layout_tests/port/http_server.py b/Tools/Scripts/webkitpy/layout_tests/port/http_server.py
  63. index e525ee0..b791128 100755
  64. --- a/Tools/Scripts/webkitpy/layout_tests/port/http_server.py
  65. +++ b/Tools/Scripts/webkitpy/layout_tests/port/http_server.py
  66. @@ -102,6 +102,11 @@ class Lighttpd(http_server_base.HttpServerBase):
  67.      def is_running(self):
  68.          return self._process != None
  69.  
  70. +    def _has_httpd(self):
  71. +        if not(os.system(self._port_obj._path_to_lighttpd_php() + " -v >" + os.devnull)):
  72. +            return True
  73. +        return False
  74. +
  75.      def start(self):
  76.          if self.is_running():
  77.              raise 'Lighttpd already running'
create a new version of this paste RAW Paste Data