Make run-webkit-tests work with virtual parent LayoutTest directories

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 1488 matching lines @@
     def _all_virtual_tests(self, suites):
         tests = []
         for suite in suites:
             self._populate_virtual_suite(suite)
             tests.extend(suite.tests.keys())
         return tests
 
     def _virtual_tests_matching_paths(self, paths, suites):
         tests = []
         for suite in suites:
-            if any(p.startswith(suite.name) for p in paths):
+            if any(p.startswith(suite.name) for p in paths) or any(suite.name.startswith(p) for p in paths):

[qyearsley, 2017/04/05 22:47:07]

This is a bit difficult to think about without thinking of examples, for me...

So, suppose suites = [
  VirtualTestSuite(prefix='layout_ng', base='fast/block/basic',
args=['----enable-blink-features=LayoutNG']),
  VirtualTestSuite(prefix='layout_ng', base='fast/block/margin-collapse',
args=['----enable-blink-features=LayoutNG']),
] and paths = ['virtual/layout_ng/fast']

The the names of the suites are 

  virtual/layout_ng/fast/block/basic, and
  virtual/layout_ng/fast/block/margin-collapse

then any(p.startswith(suite.name) for p in paths) is False because both of the
suite names are longer than the given path, but any(suite.name.startswith(p) for
p in paths) is True because both of the suite names start with the given path.

So, this seems correct. :-)

[Gleb Lanbin, 2017/04/06 17:27:32]

Acknowledged.

                 self._populate_virtual_suite(suite)
             for test in suite.tests:
                 if any(test.startswith(p) for p in paths):
                     tests.append(test)

[qyearsley, 2017/04/05 22:47:07]

I *think* that we might want to change this bit as well (see comment below in
tests)

if any(test == p or
       test.startswith(p + '/') or
       test.startswith(p) and p.endswith('/')) for p in paths)

Although that makes it more complex and uglier.

What do you think?

[Gleb Lanbin, 2017/04/06 17:27:32]

Done.

         return tests
 
     def _populate_virtual_suite(self, suite):
         if not suite.tests:
             base_tests = self.real_tests([suite.base])
             suite.tests = {}
             for test in base_tests:
                 suite.tests[test.replace(suite.base, suite.name, 1)] = test
 
     def is_virtual_test(self, test_name):
@@ skipping 115 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)