Add LayoutTests/FlagExpectations directory for flag-specific expectations.

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 1277 matching lines @@
         return True
 
     def _port_specific_expectations_files(self):
         paths = []
         paths.append(self.path_from_chromium_base('skia', 'skia_test_expectations.txt'))
         paths.append(self._filesystem.join(self.layout_tests_dir(), 'NeverFixTests'))
         paths.append(self._filesystem.join(self.layout_tests_dir(), 'StaleTestExpectations'))
         paths.append(self._filesystem.join(self.layout_tests_dir(), 'SlowTests'))
         return paths
 
+    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 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 = OrderedDict()
@@ skipping 27 matching lines @@
 
         ignore_mode = self.get_option('ignore_flaky_tests')
         if ignore_mode == 'very-flaky' or ignore_mode == 'maybe-flaky':
             return expectations.flakes_by_path(ignore_mode == 'very-flaky')
         if ignore_mode == 'unexpected':
             return expectations.unexpected_results_by_path()
         _log.warning("Unexpected ignore mode: '%s'." % ignore_mode)
         return {}
 
     def expectations_files(self):
-        return [self.path_to_generic_test_expectations_file()] + self._port_specific_expectations_files()
+        return ([self.path_to_generic_test_expectations_file()] +
+                self._port_specific_expectations_files() +
+                self._flag_specific_expectations_files())
 
     def repository_path(self):
         """Returns the repository path for the chromium code base."""
         return self.path_from_chromium_base('build')
 
     _WDIFF_DEL = '##WDIFF_DEL##'
     _WDIFF_ADD = '##WDIFF_ADD##'
     _WDIFF_END = '##WDIFF_END##'
 
     def _format_wdiff_output_as_html(self, wdiff):
@@ skipping 432 matching lines @@
 class PhysicalTestSuite(object):
     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)