| Index: content/test/gpu/gpu_tests/cloud_storage_integration_test_base.py
|
| diff --git a/content/test/gpu/gpu_tests/cloud_storage_integration_test_base.py b/content/test/gpu/gpu_tests/cloud_storage_integration_test_base.py
|
| index 56230326be9bfc36c0396294131f3728cf210065..142fbc70cbc088ed18934d6a8d29731b6ed6e138 100644
|
| --- a/content/test/gpu/gpu_tests/cloud_storage_integration_test_base.py
|
| +++ b/content/test/gpu/gpu_tests/cloud_storage_integration_test_base.py
|
| @@ -247,9 +247,12 @@ class CloudStorageIntegrationTestBase(gpu_integration_test.GpuIntegrationTest):
|
| params = cls._reference_image_parameters
|
| msaa_string = '_msaa' if params.msaa else '_non_msaa'
|
| if params.vendor_id:
|
| + os_type = cls.GetParsedCommandLineOptions().os_type
|
| + if str(cls.browser.platform.GetOSVersionName()).lower() == "win10":
|
| + # Allow separate baselines for Windows 10 and Windows 7.
|
| + os_type = "win10"
|
| return '%s_%04x_%04x%s' % (
|
| - cls.GetParsedCommandLineOptions().os_type, params.vendor_id,
|
| - params.device_id, msaa_string)
|
| + os_type, params.vendor_id, params.device_id, msaa_string)
|
| else:
|
| # This is the code path for Android devices. Include the model
|
| # name (e.g. "Nexus 9") in the GPU string to disambiguate
|
|
|