diff options
| -rw-r--r-- | build/android/gtest_filter/content_unittests_disabled | 2 | ||||
| -rw-r--r-- | content/test/gpu/gpu_test_expectations_parser.cc | 5 | ||||
| -rw-r--r-- | content/test/gpu/gpu_test_expectations_parser_unittest.cc | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/build/android/gtest_filter/content_unittests_disabled b/build/android/gtest_filter/content_unittests_disabled index 0b92c86..f347cff 100644 --- a/build/android/gtest_filter/content_unittests_disabled +++ b/build/android/gtest_filter/content_unittests_disabled @@ -36,8 +36,6 @@ AudioRendererHostTest.CreatePlayAndShutdown AudioRendererHostTest.CreatePlayPauseAndShutdown AudioRendererHostTest.SimulateError AudioRendererHostTest.SimulateErrorAndClose -# crbug.com/118542 -GPUTestExpectationsParserTest.WebGLTestExpectationsValidation # crbug.com/104950 DeviceOrientationProviderTest.ObserverNotRemoved DeviceOrientationProviderTest.StartFailing diff --git a/content/test/gpu/gpu_test_expectations_parser.cc b/content/test/gpu/gpu_test_expectations_parser.cc index bc14b72..8caedc7 100644 --- a/content/test/gpu/gpu_test_expectations_parser.cc +++ b/content/test/gpu/gpu_test_expectations_parser.cc @@ -37,6 +37,7 @@ enum Token { kConfigMac, kConfigLinux, kConfigChromeOS, + kConfigAndroid, // gpu vendor kConfigNVidia, kConfigAMD, @@ -79,6 +80,7 @@ const TokenInfo kTokenData[] = { { "mac", GPUTestConfig::kOsMac }, { "linux", GPUTestConfig::kOsLinux }, { "chromeos", GPUTestConfig::kOsChromeOS }, + { "android", GPUTestConfig::kOsAndroid }, { "nvidia", 0x10DE }, { "amd", 0x1002 }, { "intel", 0x8086 }, @@ -234,6 +236,7 @@ bool GPUTestExpectationsParser::ParseConfig( case kConfigMac: case kConfigLinux: case kConfigChromeOS: + case kConfigAndroid: case kConfigNVidia: case kConfigAMD: case kConfigIntel: @@ -281,6 +284,7 @@ bool GPUTestExpectationsParser::ParseLine( case kConfigMac: case kConfigLinux: case kConfigChromeOS: + case kConfigAndroid: case kConfigNVidia: case kConfigAMD: case kConfigIntel: @@ -391,6 +395,7 @@ bool GPUTestExpectationsParser::UpdateTestConfig( case kConfigMac: case kConfigLinux: case kConfigChromeOS: + case kConfigAndroid: if ((config->os() & kTokenData[token].flag) != 0) { PushErrorMessage(kErrorMessage[kErrorEntryWithOsConflicts], line_number); diff --git a/content/test/gpu/gpu_test_expectations_parser_unittest.cc b/content/test/gpu/gpu_test_expectations_parser_unittest.cc index d034797..cee17b7 100644 --- a/content/test/gpu/gpu_test_expectations_parser_unittest.cc +++ b/content/test/gpu/gpu_test_expectations_parser_unittest.cc @@ -89,7 +89,7 @@ TEST_F(GPUTestExpectationsParserTest, ValidUnrelatedTestEntry) { TEST_F(GPUTestExpectationsParserTest, AllModifiers) { const std::string text = - "BUG12345 XP VISTA WIN7 LEOPARD SNOWLEOPARD LION LINUX CHROMEOS " + "BUG12345 XP VISTA WIN7 LEOPARD SNOWLEOPARD LION LINUX CHROMEOS ANDROID " "NVIDIA INTEL AMD VMWARE RELEASE DEBUG : MyTest = " "PASS FAIL FLAKY TIMEOUT SKIP"; @@ -115,7 +115,7 @@ TEST_F(GPUTestExpectationsParserTest, DuplicateModifiers) { TEST_F(GPUTestExpectationsParserTest, AllModifiersLowerCase) { const std::string text = - "BUG12345 xp vista win7 leopard snowleopard lion linux chromeos " + "BUG12345 xp vista win7 leopard snowleopard lion linux chromeos android " "nvidia intel amd vmware release debug : MyTest = " "pass fail flaky timeout skip"; |