Title: [89414] trunk/Tools
- Revision
- 89414
- Author
- commit-qu...@webkit.org
- Date
- 2011-06-22 01:22:33 -0700 (Wed, 22 Jun 2011)
Log Message
2011-06-22 Kristóf Kosztyó <kosztyo.kris...@stud.u-szeged.hu>
Reviewed by Dirk Pranke.
[NRWT] Print error message when there is no httpd present on the system
https://bugs.webkit.org/show_bug.cgi?id=62027
* Scripts/webkitpy/layout_tests/port/apache_http_server.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (89413 => 89414)
--- trunk/Tools/ChangeLog 2011-06-22 07:12:36 UTC (rev 89413)
+++ trunk/Tools/ChangeLog 2011-06-22 08:22:33 UTC (rev 89414)
@@ -1,3 +1,12 @@
+2011-06-22 Kristóf Kosztyó <kosztyo.kris...@stud.u-szeged.hu>
+
+ Reviewed by Dirk Pranke.
+
+ [NRWT] Print error message when there is no httpd present on the system
+ https://bugs.webkit.org/show_bug.cgi?id=62027
+
+ * Scripts/webkitpy/layout_tests/port/apache_http_server.py:
+
2011-06-21 Dirk Pranke <dpra...@chromium.org>
Unreviewed, build fix.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (89413 => 89414)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-06-22 07:12:36 UTC (rev 89413)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-06-22 08:22:33 UTC (rev 89414)
@@ -188,6 +188,8 @@
This step can be skipped with --nocheck-sys-deps.
Returns whether the system is properly configured."""
+ if needs_http:
+ return self.check_httpd()
return True
def check_image_diff(self, override_step=None, logging=True):
@@ -227,6 +229,18 @@
return True
+ def check_httpd(self):
+ if self.get_option('use_apache'):
+ path = self._path_to_apache()
+ else:
+ path = self._path_to_lighttpd()
+
+ try:
+ return self._executive.run_command([path, "-v"], return_exit_code=True) == 0
+ except OSError, e:
+ _log.error("No httpd found. Cannot run http tests.")
+ return False
+
def compare_text(self, expected_text, actual_text):
"""Return whether or not the two strings are *not* equal. This
routine is used to diff text output.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
