[chromium] Remove media tests from ChromiumGpu configurations

https://bugs.webkit.org/show_bug.cgi?id=79720

Patch by James Robinson <jamesr@chromium.org> on 2012-02-27
Reviewed by Adam Barth.

We no longer need to run the media/ tests in both GPU and non-GPU configurations since we can exercise the GPU
composited playback path via tests in the compositing/ directory.

* Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
(_default_tests_paths):
* Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:
(ChromiumGpuTest.test_default_tests_paths):
(ChromiumGpuTest.test_test_files):

Canonical link: https://commits.webkit.org/96828@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@109066 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog

@@ -1,3 +1,19 @@
+2012-02-27  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Remove media tests from ChromiumGpu configurations
+        https://bugs.webkit.org/show_bug.cgi?id=79720
+
+        Reviewed by Adam Barth.
+
+        We no longer need to run the media/ tests in both GPU and non-GPU configurations since we can exercise the GPU
+        composited playback path via tests in the compositing/ directory.
+
+        * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
+        (_default_tests_paths):
+        * Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:
+        (ChromiumGpuTest.test_default_tests_paths):
+        (ChromiumGpuTest.test_test_files):
+
 2012-02-27  Dirk Pranke  <dpranke@chromium.org>
 
         nrwt: log multiline stderr/crash output properly

Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py

@@ -50,25 +50,7 @@ def _set_gpu_options(port, graphics_type='gpu'):
 
 
 def _default_tests_paths(port):
-    paths = []
-    if port.name() != 'chromium-gpu-mac-leopard':
-        # Only run tests requiring accelerated compositing on platforms that
-        # support it.
-        # FIXME: we should add the above paths here as well but let's test
-        # the waters with media first.
-        paths += ['media']
-
-    paths += ['fast/canvas', 'canvas/philip']
-
-    if not paths:
-        # FIXME: This is a hack until we can turn off the webkit_gpu
-        # tests on the bots. If paths is empty, port.tests()
-        # finds *everything*. However, we have to return something,
-        # or NRWT thinks there's something wrong. So, we return a single
-        # short directory. See https://bugs.webkit.org/show_bug.cgi?id=72498.
-        paths = ['fast/html']
-
-    return paths
+    return ['fast/canvas', 'canvas/philip']
 
 
 class ChromiumGpuAndroidPort(chromium_android.ChromiumAndroidPort):

Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py

@@ -109,25 +109,22 @@ def test_default_tests_paths(self):
         def test_paths(port_name):
             return chromium_gpu._default_tests_paths(PortFactory(MockSystemHost()).get(port_name))
 
-        self.assertEqual(test_paths('chromium-gpu-linux'), ['media', 'fast/canvas', 'canvas/philip'])
-        self.assertEqual(test_paths('chromium-gpu-mac-leopard'), ['fast/canvas', 'canvas/philip'])
+        self.assertEqual(test_paths('chromium-gpu-linux'), ['fast/canvas', 'canvas/philip'])
 
     def test_test_files(self):
         host = MockSystemHost()
         files = {
             '/mock-checkout/LayoutTests/canvas/philip/test.html': '',
             '/mock-checkout/LayoutTests/fast/canvas/test.html': '',
             '/mock-checkout/LayoutTests/fast/html/test.html': '',
-            '/mock-checkout/LayoutTests/media/test.html': '',
             '/mock-checkout/LayoutTests/foo/bar.html': '',
         }
         host.filesystem = MockFileSystem(files)
 
         def test_paths(port_name):
             return PortFactory(host).get(port_name).tests([])
 
-        self.assertEqual(test_paths('chromium-gpu-linux'), set(['canvas/philip/test.html', 'fast/canvas/test.html', 'media/test.html']))
-        self.assertEqual(test_paths('chromium-gpu-mac-leopard'), set(['canvas/philip/test.html', 'fast/canvas/test.html']))
+        self.assertEqual(test_paths('chromium-gpu-linux'), set(['canvas/philip/test.html', 'fast/canvas/test.html']))
 
 
 if __name__ == '__main__':