Title: [89502] trunk/Tools
- Revision
- 89502
- Author
- [email protected]
- Date
- 2011-06-22 17:18:39 -0700 (Wed, 22 Jun 2011)
Log Message
2011-06-22 Dirk Pranke <[email protected]>
Reviewed by Tony Chang.
nrwt: handle missing httpd cleanly
https://bugs.webkit.org/show_bug.cgi?id=62027
We had reverted the change in r89414, so this adds it back in
(modifying check_sys_deps() in port/base.py to check for an
installed web server).
This change then fixes the change in r89414 to stub out the
check_sys_deps() in the test port so that the unit tests run correctly.
* Scripts/webkitpy/layout_tests/port/base.py:
* Scripts/webkitpy/layout_tests/port/test.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (89501 => 89502)
--- trunk/Tools/ChangeLog 2011-06-23 00:17:08 UTC (rev 89501)
+++ trunk/Tools/ChangeLog 2011-06-23 00:18:39 UTC (rev 89502)
@@ -1,3 +1,20 @@
+2011-06-22 Dirk Pranke <[email protected]>
+
+ Reviewed by Tony Chang.
+
+ nrwt: handle missing httpd cleanly
+ https://bugs.webkit.org/show_bug.cgi?id=62027
+
+ We had reverted the change in r89414, so this adds it back in
+ (modifying check_sys_deps() in port/base.py to check for an
+ installed web server).
+
+ This change then fixes the change in r89414 to stub out the
+ check_sys_deps() in the test port so that the unit tests run correctly.
+
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ * Scripts/webkitpy/layout_tests/port/test.py:
+
2011-06-22 David Levin <[email protected]>
Reviewed by Adam Barth.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (89501 => 89502)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-06-23 00:17:08 UTC (rev 89501)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-06-23 00:18:39 UTC (rev 89502)
@@ -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.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py (89501 => 89502)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py 2011-06-23 00:17:08 UTC (rev 89501)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py 2011-06-23 00:18:39 UTC (rev 89502)
@@ -303,6 +303,9 @@
def check_build(self, needs_http):
return True
+ def check_sys_deps(self, needs_http):
+ return True
+
def default_configuration(self):
return 'Release'
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
