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

Unified Diff: gpu/config/gpu_test_expectations_parser_unittest.cc

Issue 1246203003: Add Windows 10 support to GPU config parser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
Index: gpu/config/gpu_test_expectations_parser_unittest.cc
diff --git a/gpu/config/gpu_test_expectations_parser_unittest.cc b/gpu/config/gpu_test_expectations_parser_unittest.cc
index 0639a776d8d6e45ae1e6fc12697230e76ab30de7..225dc96f42c5f8c7fc8a98f13279e490424f27ba 100644
--- a/gpu/config/gpu_test_expectations_parser_unittest.cc
+++ b/gpu/config/gpu_test_expectations_parser_unittest.cc
@@ -26,6 +26,7 @@ static const struct TestOsWithFamily {
{ { "VISTA", GPUTestConfig::kOsWinVista }, kOsFamilyWin },
{ { "WIN7", GPUTestConfig::kOsWin7 }, kOsFamilyWin },
{ { "WIN8", GPUTestConfig::kOsWin8 }, kOsFamilyWin },
+ { { "WIN10", GPUTestConfig::kOsWin10 }, kOsFamilyWin },
{ { "LEOPARD", GPUTestConfig::kOsMacLeopard }, kOsFamilyMac },
{ { "SNOWLEOPARD", GPUTestConfig::kOsMacSnowLeopard }, kOsFamilyMac },
{ { "LION", GPUTestConfig::kOsMacLion }, kOsFamilyMac },
@@ -165,7 +166,7 @@ TEST_F(GPUTestExpectationsParserTest, ValidUnrelatedTestEntry) {
TEST_F(GPUTestExpectationsParserTest, AllModifiers) {
const std::string text =
- "BUG12345 XP VISTA WIN7 WIN8 LEOPARD SNOWLEOPARD LION MOUNTAINLION "
+ "BUG12345 XP VISTA WIN7 WIN8 WIN10 LEOPARD SNOWLEOPARD LION MOUNTAINLION "
"MAVERICKS LINUX CHROMEOS ANDROID "
"NVIDIA INTEL AMD VMWARE RELEASE DEBUG : MyTest = "
"PASS FAIL FLAKY TIMEOUT SKIP";
@@ -194,8 +195,8 @@ TEST_P(GPUTestExpectationsParserParamTest, DuplicateModifiers) {
TEST_F(GPUTestExpectationsParserTest, AllModifiersLowerCase) {
const std::string text =
- "BUG12345 xp vista win7 leopard snowleopard lion linux chromeos android "
- "nvidia intel amd vmware release debug : MyTest = "
+ "BUG12345 xp vista win7 win8 win10 leopard snowleopard lion linux "
+ "chromeos android nvidia intel amd vmware release debug : MyTest = "
"pass fail flaky timeout skip";
GPUTestExpectationsParser parser;
« gpu/config/gpu_test_config.cc ('K') | « gpu/config/gpu_test_expectations_parser.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698