Make BaselineOptimizer virtual test suite aware.

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 194 matching lines @@
 
     def baseline_platform_dir(self):
         """Return the absolute path to the default (version-independent) platform-specific results."""
         return self._filesystem.join(self.layout_tests_dir(), 'platform', self.port_name)
 
     def baseline_version_dir(self):
         """Return the absolute path to the platform-and-version-specific results."""
         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()
 
     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."""
         search_paths = []
         search_paths.append(self.name())
         if self.name() != self.port_name:
             search_paths.append(self.port_name)
@@ skipping 1121 matching lines @@
         virtual_tests = list()
         for suite in suites:
             if paths:
                 for test in suite.tests:
                     if any(test.startswith(p) for p in paths):
                         virtual_tests.append(test)
             else:
                 virtual_tests.extend(suite.tests.keys())
         return virtual_tests
 
-    def lookup_virtual_test_base(self, test_name):
+    def is_virtual_test(self, test_name):
+        return bool(self.lookup_virtual_suite(test_name))
+
+    def lookup_virtual_suite(self, test_name):
         for suite in self.populated_virtual_test_suites():
             if test_name.startswith(suite.name):
-                return test_name.replace(suite.name, suite.base, 1)
+                return suite
         return None
 
+    def lookup_virtual_test_base(self, test_name):
+        suite = self.lookup_virtual_suite(test_name)
+        if not suite:
+            return None
+        return test_name.replace(suite.name, suite.base, 1)
+
     def lookup_virtual_test_args(self, test_name):
         for suite in self.populated_virtual_test_suites():
             if test_name.startswith(suite.name):
                 return suite.args
         return []
 
     def should_run_as_pixel_test(self, test_input):
         if not self._options.pixel_tests:
             return False
         if self._options.pixel_test_directories:
@@ skipping 57 matching lines @@
 
 class VirtualTestSuite(object):
     def __init__(self, name, base, args, tests=None):
         self.name = name
         self.base = base
         self.args = args
         self.tests = tests or set()
 
     def __repr__(self):
         return "VirtualTestSuite('%s', '%s', %s)" % (self.name, self.base, self.args)