Make layout test harness extensible with custom layout tests directory

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
index 3b80975914069e15ffdac1be71ddd0a6e5602036..2dcb070ae6348e9f0d3907afeef63e2e2a5f87bf 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
@@ -917,6 +917,9 @@ class Port(object):
         return self._webkit_finder.path_to_script(script_name)
 
     def layout_tests_dir(self):
+        custom_layout_tests_dir = self.get_option('layout_tests_directory')
+        if custom_layout_tests_dir:
+            return custom_layout_tests_dir

[Dirk Pranke, 2016/10/31 23:14:50]

You can change this to 

def layout_tests_dir(self):
    return self.get_option('layout_tests_directory',
self._webkit_finder.layout_tests_dir())

[chenwilliam, 2016/11/01 18:28:35]

I tried it, but it doesn't seem to work because optparse by default sets an
unseen flag as None so then self.get_option's call to getattr doesn't result in
default_value since technically "layout_tests_directory" exists on self._options
(as None). I might be overlooking something but it seems like in practice the
default_value in get_option doesn't get used?

         return self._webkit_finder.layout_tests_dir()
 
     def perf_tests_dir(self):
@@ -1052,6 +1055,9 @@ class Port(object):
     def inspector_debug_directory(self):
         return self.path_from_webkit_base('Source', 'devtools', 'front_end')
 
+    def apache_config_directory(self):
+        return self.path_from_webkit_base('Tools', 'Scripts', 'apache_config')
+
     def default_results_directory(self):
         """Absolute path to the default place to store the test results."""
         return self._build_path('layout-test-results')
@@ -1504,7 +1510,7 @@ class Port(object):
             return config_file_from_env
 
         config_file_name = self._apache_config_file_name_for_platform()
-        return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', config_file_name)
+        return self._filesystem.join(self.apache_config_directory(), config_file_name)
 
     #
     # PROTECTED ROUTINES