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

Side by Side Diff: gpu/config/gpu_test_expectations_parser.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/config/gpu_test_expectations_parser.h" 5 #include "gpu/config/gpu_test_expectations_parser.h"
6 6
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/string_split.h" 10 #include "base/strings/string_split.h"
(...skipping 13 matching lines...) Expand all
24 kLineParserEqual, 24 kLineParserEqual,
25 kLineParserExpectations, 25 kLineParserExpectations,
26 }; 26 };
27 27
28 enum Token { 28 enum Token {
29 // os 29 // os
30 kConfigWinXP = 0, 30 kConfigWinXP = 0,
31 kConfigWinVista, 31 kConfigWinVista,
32 kConfigWin7, 32 kConfigWin7,
33 kConfigWin8, 33 kConfigWin8,
34 kConfigWin10,
34 kConfigWin, 35 kConfigWin,
35 kConfigMacLeopard, 36 kConfigMacLeopard,
36 kConfigMacSnowLeopard, 37 kConfigMacSnowLeopard,
37 kConfigMacLion, 38 kConfigMacLion,
38 kConfigMacMountainLion, 39 kConfigMacMountainLion,
39 kConfigMacMavericks, 40 kConfigMacMavericks,
40 kConfigMacYosemite, 41 kConfigMacYosemite,
41 kConfigMac, 42 kConfigMac,
42 kConfigLinux, 43 kConfigLinux,
43 kConfigChromeOS, 44 kConfigChromeOS,
(...skipping 27 matching lines...) Expand all
71 struct TokenInfo { 72 struct TokenInfo {
72 const char* name; 73 const char* name;
73 int32 flag; 74 int32 flag;
74 }; 75 };
75 76
76 const TokenInfo kTokenData[] = { 77 const TokenInfo kTokenData[] = {
77 { "xp", GPUTestConfig::kOsWinXP }, 78 { "xp", GPUTestConfig::kOsWinXP },
78 { "vista", GPUTestConfig::kOsWinVista }, 79 { "vista", GPUTestConfig::kOsWinVista },
79 { "win7", GPUTestConfig::kOsWin7 }, 80 { "win7", GPUTestConfig::kOsWin7 },
80 { "win8", GPUTestConfig::kOsWin8 }, 81 { "win8", GPUTestConfig::kOsWin8 },
82 { "win10", GPUTestConfig::kOsWin10 },
81 { "win", GPUTestConfig::kOsWin }, 83 { "win", GPUTestConfig::kOsWin },
82 { "leopard", GPUTestConfig::kOsMacLeopard }, 84 { "leopard", GPUTestConfig::kOsMacLeopard },
83 { "snowleopard", GPUTestConfig::kOsMacSnowLeopard }, 85 { "snowleopard", GPUTestConfig::kOsMacSnowLeopard },
84 { "lion", GPUTestConfig::kOsMacLion }, 86 { "lion", GPUTestConfig::kOsMacLion },
85 { "mountainlion", GPUTestConfig::kOsMacMountainLion }, 87 { "mountainlion", GPUTestConfig::kOsMacMountainLion },
86 { "mavericks", GPUTestConfig::kOsMacMavericks }, 88 { "mavericks", GPUTestConfig::kOsMacMavericks },
87 { "yosemite", GPUTestConfig::kOsMacYosemite }, 89 { "yosemite", GPUTestConfig::kOsMacYosemite },
88 { "mac", GPUTestConfig::kOsMac }, 90 { "mac", GPUTestConfig::kOsMac },
89 { "linux", GPUTestConfig::kOsLinux }, 91 { "linux", GPUTestConfig::kOsLinux },
90 { "chromeos", GPUTestConfig::kOsChromeOS }, 92 { "chromeos", GPUTestConfig::kOsChromeOS },
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 std::vector<std::string> tokens; 226 std::vector<std::string> tokens;
225 base::SplitStringAlongWhitespace(config_data, &tokens); 227 base::SplitStringAlongWhitespace(config_data, &tokens);
226 228
227 for (size_t i = 0; i < tokens.size(); ++i) { 229 for (size_t i = 0; i < tokens.size(); ++i) {
228 Token token = ParseToken(tokens[i]); 230 Token token = ParseToken(tokens[i]);
229 switch (token) { 231 switch (token) {
230 case kConfigWinXP: 232 case kConfigWinXP:
231 case kConfigWinVista: 233 case kConfigWinVista:
232 case kConfigWin7: 234 case kConfigWin7:
233 case kConfigWin8: 235 case kConfigWin8:
236 case kConfigWin10:
234 case kConfigWin: 237 case kConfigWin:
235 case kConfigMacLeopard: 238 case kConfigMacLeopard:
236 case kConfigMacSnowLeopard: 239 case kConfigMacSnowLeopard:
237 case kConfigMacLion: 240 case kConfigMacLion:
238 case kConfigMacMountainLion: 241 case kConfigMacMountainLion:
239 case kConfigMacMavericks: 242 case kConfigMacMavericks:
240 case kConfigMacYosemite: 243 case kConfigMacYosemite:
241 case kConfigMac: 244 case kConfigMac:
242 case kConfigLinux: 245 case kConfigLinux:
243 case kConfigChromeOS: 246 case kConfigChromeOS:
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 for (size_t i = 0; i < tokens.size() && !comments_encountered; ++i) { 279 for (size_t i = 0; i < tokens.size() && !comments_encountered; ++i) {
277 Token token = ParseToken(tokens[i]); 280 Token token = ParseToken(tokens[i]);
278 switch (token) { 281 switch (token) {
279 case kTokenComment: 282 case kTokenComment:
280 comments_encountered = true; 283 comments_encountered = true;
281 break; 284 break;
282 case kConfigWinXP: 285 case kConfigWinXP:
283 case kConfigWinVista: 286 case kConfigWinVista:
284 case kConfigWin7: 287 case kConfigWin7:
285 case kConfigWin8: 288 case kConfigWin8:
289 case kConfigWin10:
286 case kConfigWin: 290 case kConfigWin:
287 case kConfigMacLeopard: 291 case kConfigMacLeopard:
288 case kConfigMacSnowLeopard: 292 case kConfigMacSnowLeopard:
289 case kConfigMacLion: 293 case kConfigMacLion:
290 case kConfigMacMountainLion: 294 case kConfigMacMountainLion:
291 case kConfigMacMavericks: 295 case kConfigMacMavericks:
292 case kConfigMacYosemite: 296 case kConfigMacYosemite:
293 case kConfigMac: 297 case kConfigMac:
294 case kConfigLinux: 298 case kConfigLinux:
295 case kConfigChromeOS: 299 case kConfigChromeOS:
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 } 395 }
392 396
393 bool GPUTestExpectationsParser::UpdateTestConfig( 397 bool GPUTestExpectationsParser::UpdateTestConfig(
394 GPUTestConfig* config, int32 token, size_t line_number) { 398 GPUTestConfig* config, int32 token, size_t line_number) {
395 DCHECK(config); 399 DCHECK(config);
396 switch (token) { 400 switch (token) {
397 case kConfigWinXP: 401 case kConfigWinXP:
398 case kConfigWinVista: 402 case kConfigWinVista:
399 case kConfigWin7: 403 case kConfigWin7:
400 case kConfigWin8: 404 case kConfigWin8:
405 case kConfigWin10:
401 case kConfigWin: 406 case kConfigWin:
402 case kConfigMacLeopard: 407 case kConfigMacLeopard:
403 case kConfigMacSnowLeopard: 408 case kConfigMacSnowLeopard:
404 case kConfigMacLion: 409 case kConfigMacLion:
405 case kConfigMacMountainLion: 410 case kConfigMacMountainLion:
406 case kConfigMacMavericks: 411 case kConfigMacMavericks:
407 case kConfigMacYosemite: 412 case kConfigMacYosemite:
408 case kConfigMac: 413 case kConfigMac:
409 case kConfigLinux: 414 case kConfigLinux:
410 case kConfigChromeOS: 415 case kConfigChromeOS:
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 message.c_str())); 508 message.c_str()));
504 } 509 }
505 510
506 GPUTestExpectationsParser:: GPUTestExpectationEntry::GPUTestExpectationEntry() 511 GPUTestExpectationsParser:: GPUTestExpectationEntry::GPUTestExpectationEntry()
507 : test_expectation(0), 512 : test_expectation(0),
508 line_number(0) { 513 line_number(0) {
509 } 514 }
510 515
511 } // namespace gpu 516 } // namespace gpu
512 517
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698