Changeset 57964 in webkit


Ignore:
Timestamp:
Apr 21, 2010 3:57:15 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-04-21 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>

Reviewed by Eric Seidel.

new-run-webkit-tests: try to detect alternate apache path
https://bugs.webkit.org/show_bug.cgi?id=37587

_check_port_build() also needs to return true in the
base implementation to not fail the check_build step.

  • Scripts/webkitpy/layout_tests/port/webkit.py:
Location:
trunk/WebKitTools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r57963 r57964  
     12010-04-21  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        new-run-webkit-tests: try to detect alternate apache path
     6        https://bugs.webkit.org/show_bug.cgi?id=37587
     7
     8        _check_port_build() also needs to return true in the
     9        base implementation to not fail the check_build step.
     10
     11        * Scripts/webkitpy/layout_tests/port/webkit.py:
     12
    1132010-04-21  Yi Shen  <yi.4.shen@nokia.com>
    214
  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py

    r57858 r57964  
    5555        base.Port.__init__(self, port_name, options)
    5656        self._cached_build_root = None
     57        self._cached_apache_path = None
    5758
    5859        # FIXME: disable pixel tests until they are run by default on the
     
    103104    def _check_port_build(self):
    104105        # Ports can override this method to do additional checks.
    105         pass
     106        return True
    106107
    107108    def check_image_diff(self, override_step=None, logging=True):
     
    324325
    325326    def _path_to_apache(self):
    326         return '/usr/sbin/httpd'
     327        if not self._cached_apache_path:
     328            # The Apache binary path can vary depending on OS and distribution
     329            # See http://wiki.apache.org/httpd/DistrosDefaultLayout
     330            for path in ["/usr/sbin/httpd", "/usr/sbin/apache2"]:
     331                if os.path.exists(path):
     332                    self._cached_apache_path = path
     333                    break
     334
     335            if not self._cached_apache_path:
     336                _log.error("Could not find apache. Not installed or unknown path.")
     337
     338        return self._cached_apache_path
    327339
    328340
Note: See TracChangeset for help on using the changeset viewer.