| 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 376af18dd4ffbfee6f28a3626ded046eff76208c..309166e2b004dd3531a9887e47021f974c19bef5 100644
|
| --- a/content/test/gpu/gpu_tests/pixel_integration_test.py
|
| +++ b/content/test/gpu/gpu_tests/pixel_integration_test.py
|
| @@ -5,7 +5,6 @@ import glob
|
| import logging
|
| import os
|
| import re
|
| -import sys
|
|
|
| from gpu_tests import cloud_storage_integration_test_base
|
| from gpu_tests import pixel_expectations
|
| @@ -113,20 +112,8 @@ class PixelIntegrationTest(
|
| def GenerateGpuTests(cls, options):
|
| cls.SetParsedCommandLineOptions(options)
|
| name = 'Pixel'
|
| - pages = pixel_test_pages.ES2AndES3Pages(name)
|
| + pages = pixel_test_pages.DefaultPages(name)
|
| pages += pixel_test_pages.ExperimentalCanvasFeaturesPages(name)
|
| - if sys.platform.startswith('darwin'):
|
| - # TOOD(kbr): replace this with CopyPagesWithNewBrowserArgsAndPrefix,
|
| - # and removeCopyPagesWithNewBrowserArgsAndSuffix. This renaming
|
| - # will cause all of the ES3 tests to be run back-to-back,
|
| - # reducing the number of browser restarts and speeding up the
|
| - # tests. Note that this will require all the ES3 tests to be
|
| - # temporarily marked failing on macOS, and is too big a change
|
| - # to do along with the port to the new harness.
|
| - pages += pixel_test_pages.CopyPagesWithNewBrowserArgsAndSuffix(
|
| - pixel_test_pages.ES2AndES3Pages(name),
|
| - ['--enable-unsafe-es3-apis'], 'ES3')
|
| - pages += pixel_test_pages.MacSpecificPages(name)
|
| for p in pages:
|
| yield(p.name, p.url, (p))
|
|
|
|
|