Changeset 90527 in webkit
- Timestamp:
- Jul 6, 2011 7:49:47 PM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r90526 r90527 1 2011-07-06 Dirk Pranke <dpranke@chromium.org> 2 3 nrwt: remove --use-apache from the command line 4 https://bugs.webkit.org/show_bug.cgi?id=63358 5 6 Reviewed by Adam Barth. 7 8 Re-land the fix in bug 63358 - the prior fix was flawed in that 9 we were trying to start the http server during check_sys_deps() 10 but not actually setting up the environment properly. This 11 broken prior to this change, but exposed by it, since the patch 12 changes the chromium port to call the base class's checks. 13 14 * Scripts/webkitpy/common/system/executive.py: 15 * Scripts/webkitpy/layout_tests/port/base.py: 16 * Scripts/webkitpy/layout_tests/port/chromium.py: 17 * Scripts/webkitpy/layout_tests/port/chromium_linux.py: 18 * Scripts/webkitpy/layout_tests/port/chromium_win.py: 19 * Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py: 20 * Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py: 21 * Scripts/webkitpy/layout_tests/port/port_testcase.py: 22 * Scripts/webkitpy/layout_tests/run_webkit_tests.py: 23 1 24 2011-07-06 Adam Barth <abarth@webkit.org> 2 25 -
trunk/Tools/Scripts/webkitpy/common/system/executive.py
r90016 r90527 400 400 args, 401 401 cwd=None, 402 env=None, 402 403 input=None, 403 404 error_handler=None, … … 419 420 stderr=stderr, 420 421 cwd=cwd, 422 env=env, 421 423 close_fds=self._should_close_fds()) 422 424 output = process.communicate(string_to_communicate)[0] -
trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py
r90520 r90527 139 139 self._multiprocessing_is_available = (multiprocessing is not None) 140 140 self._results_directory = None 141 self.set_option_default('use_apache', self._default_to_apache())142 141 143 142 def executive(self): … … 226 225 227 226 def check_httpd(self): 228 if self. get_option('use_apache'):227 if self._uses_apache(): 229 228 path = self._path_to_apache() 230 229 else: … … 232 231 233 232 try: 234 return self._executive.run_command([path, "-v"], return_exit_code=True) == 0 233 env = self.setup_environ_for_server() 234 return self._executive.run_command([path, "-v"], env=env, return_exit_code=True) == 0 235 235 except OSError, e: 236 236 _log.error("No httpd found. Cannot run http tests.") … … 662 662 assert not self._http_server, 'Already running an http server.' 663 663 664 if self. get_option('use_apache'):664 if self._uses_apache(): 665 665 server = apache_http_server.LayoutTestApacheHttpd(self, self.results_directory()) 666 666 else: … … 851 851 return self._config.build_directory(args[0]) 852 852 853 def _default_to_apache(self): 854 """Override if the port should use LigHTTPd instead of Apache by default. 855 856 Ports that override start_http_server() ignore this method.""" 853 def _uses_apache(self): 857 854 return True 858 855 -
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
-
Property
svn:executable
set to
*
r90520 r90527 119 119 120 120 def check_sys_deps(self, needs_http): 121 result = super(ChromiumPort, self).check_sys_deps(needs_http) 122 121 123 cmd = [self._path_to_driver(), '--check-layout-test-sys-deps'] 122 124 … … 133 135 _log.error(output) 134 136 return False 135 return True137 return result 136 138 137 139 def check_image_diff(self, override_step=None, logging=True): -
Property
svn:executable
set to
-
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py
r90514 r90527 95 95 def check_build(self, needs_http): 96 96 result = chromium.ChromiumPort.check_build(self, needs_http) 97 if needs_http:98 if self.get_option('use_apache'):99 result = self._check_apache_install() and result100 else:101 result = self._check_lighttpd_install() and result102 97 result = self.check_wdiff() and result 103 98 -
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py
r90514 r90527 56 56 class ChromiumWinPort(chromium.ChromiumPort): 57 57 """Chromium Win implementation of the Port class.""" 58 58 59 # FIXME: Figure out how to unify this with base.TestConfiguration.all_systems()? 59 60 SUPPORTED_VERSIONS = ('xp', 'vista', 'win7') … … 130 131 return self._filesystem.join(self.path_from_webkit_base(), 'Source', 'WebKit', 'chromium', *comps) 131 132 132 def _ default_to_apache(self):133 def _uses_apache(self): 133 134 return False 134 135 -
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py
r90514 r90527 58 58 def _mock_path_from_chromium_base(self, *comps): 59 59 return self._port._filesystem.join("/chromium/src", *comps) 60 61 def test_uses_apache(self): 62 port = self.make_port() 63 if not port: 64 return 65 66 self.assertFalse(port._uses_apache()) 60 67 61 68 def test_setup_environ_for_server(self): -
trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py
r90520 r90527 41 41 42 42 from webkitpy.tool import mocktool 43 mock_options = mocktool.MockOptions(use_apache=True, 44 configuration='Release') 43 mock_options = mocktool.MockOptions(configuration='Release') 45 44 46 45 -
trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
r90514 r90527 90 90 self.assertTrue('--foo=baz' in cmd_line) 91 91 92 def test_uses_apache(self): 93 port = self.make_port() 94 if not port: 95 return 96 97 self.assertTrue(port._uses_apache()) 98 92 99 def assert_servers_are_down(self, host, ports): 93 100 for port in ports: -
trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
r90526 r90527 147 147 if options.pixel_tests is None: 148 148 options.pixel_tests = True 149 150 if not options.use_apache:151 options.use_apache = sys.platform.startswith('linux') or sys.platform == 'darwin'152 149 153 150 if not options.time_out_ms: … … 376 373 optparse.make_option("--force", action="store_true", default=False, 377 374 help="Run all tests, even those marked SKIP in the test list"), 378 optparse.make_option("--use-apache", action="store_true",379 default=False, help="Whether to use apache instead of lighttpd."),380 375 optparse.make_option("--time-out-ms", 381 376 help="Set the timeout for each test"),
Note: See TracChangeset
for help on using the changeset viewer.