Make layout test harness extensible with custom layout tests directory

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

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 899 matching lines @@
     def path_from_webkit_base(self, *comps):
         return self._webkit_finder.path_from_webkit_base(*comps)
 
     def path_from_chromium_base(self, *comps):
         return self._webkit_finder.path_from_chromium_base(*comps)
 
     def path_to_script(self, script_name):
         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):
         return self._webkit_finder.perf_tests_dir()
 
     def skipped_layout_tests(self, test_list):
         """Returns tests skipped outside of the TestExpectations files."""
         return set(self._skipped_tests_for_unsupported_features(test_list))
 
     def skips_test(self, test, generic_expectations, full_expectations):
@@ skipping 115 matching lines @@
 
     def perf_results_directory(self):
         return self._build_path()
 
     def inspector_build_directory(self):
         return self._build_path('resources', 'inspector')
 
     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')
 
     def setup_test_run(self):
         """Perform port-specific work at the beginning of a test run."""
         # Delete the disk cache if any to ensure a clean test run.
         dump_render_tree_binary_path = self._path_to_driver()
         cachedir = self._filesystem.dirname(dump_render_tree_binary_path)
         cachedir = self._filesystem.join(cachedir, "cache")
@@ skipping 432 matching lines @@
 
         This is needed only by ports that use the apache_http_server module.
         """
         config_file_from_env = self.host.environ.get('WEBKIT_HTTP_SERVER_CONF_PATH')
         if config_file_from_env:
             if not self._filesystem.exists(config_file_from_env):
                 raise IOError('%s was not found on the system' % config_file_from_env)
             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
     #
     # The routines below should only be called by routines in this class
     # or any of its subclasses.
     #
 
     def _apache_version(self):
         config = self._executive.run_command([self.path_to_apache(), '-v'])
@@ skipping 326 matching lines @@
 
     def __init__(self, base, args, reference_args=None):
         self.name = base
         self.base = base
         self.args = args
         self.reference_args = args if reference_args is None else reference_args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base, self.args, self.reference_args)