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

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.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 91 matching lines @@
 
     def __contains__(self, item):
         return item in self.tests
 
     def __getitem__(self, item):
         return self.tests[item]
 
 #
 # These numbers may need to be updated whenever we add or delete tests. This includes virtual tests.
 #
-TOTAL_TESTS = 106
+TOTAL_TESTS = 108
 TOTAL_WONTFIX = 3
 TOTAL_SKIPS = 22 + TOTAL_WONTFIX
 TOTAL_CRASHES = 76
 
 UNEXPECTED_PASSES = 1
 UNEXPECTED_FAILURES = 26
 
 
 def unit_test_list():
     tests = TestList()
@@ skipping 135 matching lines @@
               expected_image='image_in_pixeldir-pngtEXtchecksum\x00checksum-png')
     tests.add('failures/unexpected/image_not_in_pixeldir.html',
               actual_image='image_not_in_pixeldir-pngtEXtchecksum\x00checksum_fail',
               expected_image='image_not_in_pixeldir-pngtEXtchecksum\x00checksum-png')
 
     # For testing that virtual test suites don't expand names containing themselves
     # See webkit.org/b/97925 and base_unittest.PortTest.test_tests().
     tests.add('passes/test-virtual-passes.html')
     tests.add('passes/virtual_passes/test-virtual-passes.html')
 
+    tests.add('passes_two/test-virtual-passes.html')
     return tests
 
 
 # Here we synthesize an in-memory filesystem from the test list
 # in order to fully control the test output and to demonstrate that
 # we don't need a real filesystem to run the tests.
 def add_unit_tests_to_mock_filesystem(filesystem):
     # Add the test_expectations file.
     filesystem.maybe_make_directory(LAYOUT_TEST_DIR)
     if not filesystem.exists(LAYOUT_TEST_DIR + '/TestExpectations'):
@@ skipping 247 matching lines @@
                     architecture=architecture,
                     build_type=build_type))
         return test_configurations
 
     def configuration_specifier_macros(self):
         return self.configuration_specifier_macros_dict
 
     def virtual_test_suites(self):
         return [
             VirtualTestSuite(prefix='virtual_passes', base='passes', args=['--virtual-arg']),
+            VirtualTestSuite(prefix='virtual_passes', base='passes_two', args=['--virtual-arg']),
             VirtualTestSuite(prefix='skipped', base='failures/expected', args=['--virtual-arg2']),
             VirtualTestSuite(prefix='references_use_default_args', base='passes/reftest.html',
                              args=['--virtual-arg'], references_use_default_args=True),
         ]
 
 
 class TestDriver(Driver):
     """Test/Dummy implementation of the driver interface."""
     next_pid = 1
 
@@ skipping 84 matching lines @@
         else:
             image = test.actual_image
         return DriverOutput(actual_text, image, test.actual_checksum, audio,
                             crash=(crash or web_process_crash), crashed_process_name=crashed_process_name,
                             crashed_pid=crashed_pid, crash_log=crash_log,
                             test_time=time.time() - start_time, timeout=test.timeout, error=test.error, pid=self.pid,
                             leak=test.leak)
 
     def stop(self):
         self.started = False