Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3230)

Unified Diff: content/test/gpu/gpu_tests/pixel_integration_test.py

Issue 2769063006: Add GPU integration pixel tests for VP9 and MP4 video. (Closed)
Patch Set: use media/test/data Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/gpu/gpu_tests/pixel_expectations.py ('k') | content/test/gpu/gpu_tests/pixel_test_pages.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/gpu/gpu_tests/pixel_integration_test.py
diff --git a/content/test/gpu/gpu_tests/pixel_integration_test.py b/content/test/gpu/gpu_tests/pixel_integration_test.py
index 83da9ab8b6565061d69772e9fd17b9dcdafbb966..8690d69d5005494ed91ec7d7363e2d859bfc19a8 100644
--- a/content/test/gpu/gpu_tests/pixel_integration_test.py
+++ b/content/test/gpu/gpu_tests/pixel_integration_test.py
@@ -9,17 +9,21 @@ import sys
from gpu_tests import gpu_integration_test
from gpu_tests import cloud_storage_integration_test_base
+from gpu_tests import path_util
from gpu_tests import pixel_expectations
from gpu_tests import pixel_test_pages
from py_utils import cloud_storage
from telemetry.util import image_util
+gpu_relative_path = "content/test/data/gpu/"
+gpu_data_dir = os.path.join(path_util.GetChromiumSrcDir(), gpu_relative_path)
-test_data_dir = os.path.abspath(os.path.join(
- os.path.dirname(__file__), '..', '..', 'data', 'gpu'))
+default_reference_image_dir = os.path.join(gpu_data_dir, 'gpu_reference')
-default_reference_image_dir = os.path.join(test_data_dir, 'gpu_reference')
+test_data_dirs = [gpu_data_dir,
+ os.path.join(
+ path_util.GetChromiumSrcDir(), 'media/test/data')]
test_harness_script = r"""
var domAutomationController = {};
@@ -68,7 +72,7 @@ class PixelIntegrationTest(
cls._original_finder_options = cls._finder_options.Copy()
cls.CustomizeBrowserArgs([])
cls.StartBrowser()
- cls.SetStaticServerDirs([test_data_dir])
+ cls.SetStaticServerDirs(test_data_dirs)
@classmethod
def CustomizeBrowserArgs(cls, browser_args):
@@ -119,7 +123,7 @@ class PixelIntegrationTest(
if sys.platform.startswith('darwin'):
pages += pixel_test_pages.MacSpecificPages(name)
for p in pages:
- yield(p.name, p.url, (p))
+ yield(p.name, gpu_relative_path + p.url, (p))
def RunActualGpuTest(self, test_path, *args):
page = args[0]
« no previous file with comments | « content/test/gpu/gpu_tests/pixel_expectations.py ('k') | content/test/gpu/gpu_tests/pixel_test_pages.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698