Add flag-specific baseline search path to run-webkit-tests.

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 282 matching lines @@
         baseline_search_paths = self.baseline_search_path()
         return baseline_search_paths[0]
 
     def virtual_baseline_search_path(self, test_name):
         suite = self.lookup_virtual_suite(test_name)
         if not suite:
             return None
         return [self._filesystem.join(path, suite.name) for path in self.default_baseline_search_path()]
 
     def baseline_search_path(self):
-        return self.get_option('additional_platform_directory', []) + self._compare_baseline() + self.default_baseline_search_path()
+        return (self.get_option('additional_platform_directory', []) +
+                self._flag_specific_baseline_search_path() +
+                self._compare_baseline() +
+                self.default_baseline_search_path())
 
     def default_baseline_search_path(self):
         """Return a list of absolute paths to directories to search under for
         baselines. The directories are searched in order."""
         return map(self._webkit_baseline_path, self.FALLBACK_PATHS[self.version()])
 
     @memoized
     def _compare_baseline(self):
         factory = PortFactory(self.host)
         target_port = self.get_option('compare_port')
@@ skipping 944 matching lines @@
                 test_configurations.append(TestConfiguration(version, architecture, build_type))
         return test_configurations
 
     def warn_if_bug_missing_in_test_expectations(self):
         return True
 
     def _flag_specific_expectations_files(self):
         return [self._filesystem.join(self.layout_tests_dir(), 'FlagExpectations', flag.lstrip('-'))
                 for flag in self.get_option('additional_driver_flag', [])]
 
+    def _flag_specific_baseline_search_path(self):
+        # TODO(skobes): Baselines specific to both flag and platform?
+        return [self._filesystem.join(self.layout_tests_dir(), 'flag-specific', flag.lstrip('-'))
+                for flag in self.get_option('additional_driver_flag', [])]
+
     def expectations_dict(self):
         """Returns an OrderedDict of name -> expectations strings.
         The names are expected to be (but not required to be) paths in the filesystem.
         If the name is a path, the file can be considered updatable for things like rebaselining,
         so don't use names that are paths if they're not paths.
         Generally speaking the ordering should be files in the filesystem in cascade order
         (TestExpectations followed by Skipped, if the port honors both formats),
         then any built-in expectations (e.g., from compile-time exclusions), then --additional-expectations options."""
         # FIXME: rename this to test_expectations() once all the callers are updated to know about the ordered dict.
         expectations = collections.OrderedDict()
@@ skipping 501 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)