Changeset 90503 in webkit
- Timestamp:
- Jul 6, 2011 2:46:17 PM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r90496 r90503 1 2011-06-24 Dirk Pranke <dpranke@chromium.org> 2 3 Reviewed by Adam Barth. 4 5 nrwt: remove --use-apache from the command line 6 https://bugs.webkit.org/show_bug.cgi?id=63358 7 8 This change removes the --use-apache command line argument. It 9 was initially put in when we were trying to get the cygwin 10 apache instance to work with Chromium win, but that code has 11 bitrotted and doesn't work at all now. 12 13 Arguably we should remove all of the code to allow for a choice 14 of web servers, but since we may still want to switch off of 15 LigHTTPd at some point on Windows, I'll leave the rest in for 16 now (or at least yank it in a different change.) 17 18 * Scripts/webkitpy/layout_tests/port/base.py: 19 * Scripts/webkitpy/layout_tests/port/chromium.py: 20 * Scripts/webkitpy/layout_tests/port/chromium_linux.py: 21 * Scripts/webkitpy/layout_tests/port/chromium_win.py: 22 * Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py: 23 * Scripts/webkitpy/layout_tests/run_webkit_tests.py: 24 1 25 2011-07-06 Dimitri Glazkov <dglazkov@chromium.org> 2 26 -
trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py
r90285 r90503 137 137 self._multiprocessing_is_available = (multiprocessing is not None) 138 138 self._results_directory = None 139 self.set_option_default('use_apache', self._default_to_apache())140 139 141 140 def executive(self): … … 224 223 225 224 def check_httpd(self): 226 if self. get_option('use_apache'):225 if self._uses_apache(): 227 226 path = self._path_to_apache() 228 227 else: … … 647 646 assert not self._http_server, 'Already running an http server.' 648 647 649 if self. get_option('use_apache'):648 if self._uses_apache(): 650 649 server = apache_http_server.LayoutTestApacheHttpd(self, self.results_directory()) 651 650 else: … … 836 835 return self._config.build_directory(args[0]) 837 836 838 def _default_to_apache(self): 839 """Override if the port should use LigHTTPd instead of Apache by default. 840 841 Ports that override start_http_server() ignore this method.""" 837 def _uses_apache(self): 842 838 return True 843 839 -
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
r90191 r90503 118 118 119 119 def check_sys_deps(self, needs_http): 120 result = super(ChromiumPort, self).check_sys_deps(needs_http) 121 120 122 cmd = [self._path_to_driver(), '--check-layout-test-sys-deps'] 121 123 … … 132 134 _log.error(output) 133 135 return False 134 return True136 return result 135 137 136 138 def check_image_diff(self, override_step=None, logging=True): -
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py
r90077 r90503 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
r90077 r90503 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
r85896 r90503 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
r85896 r90503 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
r90191 r90503 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
r90262 r90503 149 149 if options.pixel_tests is None: 150 150 options.pixel_tests = True 151 152 if not options.use_apache:153 options.use_apache = sys.platform.startswith('linux') or sys.platform == 'darwin'154 151 155 152 if not options.time_out_ms: … … 378 375 optparse.make_option("--force", action="store_true", default=False, 379 376 help="Run all tests, even those marked SKIP in the test list"), 380 optparse.make_option("--use-apache", action="store_true",381 default=False, help="Whether to use apache instead of lighttpd."),382 377 optparse.make_option("--time-out-ms", 383 378 help="Set the timeout for each test"),
Note: See TracChangeset
for help on using the changeset viewer.