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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: gpu/config/gpu_test_expectations_parser.cc

Issue 1068813002: Add MacOS X 10.10 Yosemite support to GPUTestBotConfig. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restrict access to GPUTestExpectationsParserTest::bot_config_ member. Created 5 years, 8 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
« no previous file with comments | « gpu/config/gpu_test_config.cc ('k') | gpu/config/gpu_test_expectations_parser_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 19 matching lines...) Expand all
30 kConfigWinXP = 0, 30 kConfigWinXP = 0,
31 kConfigWinVista, 31 kConfigWinVista,
32 kConfigWin7, 32 kConfigWin7,
33 kConfigWin8, 33 kConfigWin8,
34 kConfigWin, 34 kConfigWin,
35 kConfigMacLeopard, 35 kConfigMacLeopard,
36 kConfigMacSnowLeopard, 36 kConfigMacSnowLeopard,
37 kConfigMacLion, 37 kConfigMacLion,
38 kConfigMacMountainLion, 38 kConfigMacMountainLion,
39 kConfigMacMavericks, 39 kConfigMacMavericks,
40 kConfigMacYosemite,
40 kConfigMac, 41 kConfigMac,
41 kConfigLinux, 42 kConfigLinux,
42 kConfigChromeOS, 43 kConfigChromeOS,
43 kConfigAndroid, 44 kConfigAndroid,
44 // gpu vendor 45 // gpu vendor
45 kConfigNVidia, 46 kConfigNVidia,
46 kConfigAMD, 47 kConfigAMD,
47 kConfigIntel, 48 kConfigIntel,
48 kConfigVMWare, 49 kConfigVMWare,
49 // build type 50 // build type
(...skipping 26 matching lines...) Expand all
76 { "xp", GPUTestConfig::kOsWinXP }, 77 { "xp", GPUTestConfig::kOsWinXP },
77 { "vista", GPUTestConfig::kOsWinVista }, 78 { "vista", GPUTestConfig::kOsWinVista },
78 { "win7", GPUTestConfig::kOsWin7 }, 79 { "win7", GPUTestConfig::kOsWin7 },
79 { "win8", GPUTestConfig::kOsWin8 }, 80 { "win8", GPUTestConfig::kOsWin8 },
80 { "win", GPUTestConfig::kOsWin }, 81 { "win", GPUTestConfig::kOsWin },
81 { "leopard", GPUTestConfig::kOsMacLeopard }, 82 { "leopard", GPUTestConfig::kOsMacLeopard },
82 { "snowleopard", GPUTestConfig::kOsMacSnowLeopard }, 83 { "snowleopard", GPUTestConfig::kOsMacSnowLeopard },
83 { "lion", GPUTestConfig::kOsMacLion }, 84 { "lion", GPUTestConfig::kOsMacLion },
84 { "mountainlion", GPUTestConfig::kOsMacMountainLion }, 85 { "mountainlion", GPUTestConfig::kOsMacMountainLion },
85 { "mavericks", GPUTestConfig::kOsMacMavericks }, 86 { "mavericks", GPUTestConfig::kOsMacMavericks },
87 { "yosemite", GPUTestConfig::kOsMacYosemite },
86 { "mac", GPUTestConfig::kOsMac }, 88 { "mac", GPUTestConfig::kOsMac },
87 { "linux", GPUTestConfig::kOsLinux }, 89 { "linux", GPUTestConfig::kOsLinux },
88 { "chromeos", GPUTestConfig::kOsChromeOS }, 90 { "chromeos", GPUTestConfig::kOsChromeOS },
89 { "android", GPUTestConfig::kOsAndroid }, 91 { "android", GPUTestConfig::kOsAndroid },
90 { "nvidia", 0x10DE }, 92 { "nvidia", 0x10DE },
91 { "amd", 0x1002 }, 93 { "amd", 0x1002 },
92 { "intel", 0x8086 }, 94 { "intel", 0x8086 },
93 { "vmware", 0x15ad }, 95 { "vmware", 0x15ad },
94 { "release", GPUTestConfig::kBuildTypeRelease }, 96 { "release", GPUTestConfig::kBuildTypeRelease },
95 { "debug", GPUTestConfig::kBuildTypeDebug }, 97 { "debug", GPUTestConfig::kBuildTypeDebug },
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 case kConfigWinXP: 230 case kConfigWinXP:
229 case kConfigWinVista: 231 case kConfigWinVista:
230 case kConfigWin7: 232 case kConfigWin7:
231 case kConfigWin8: 233 case kConfigWin8:
232 case kConfigWin: 234 case kConfigWin:
233 case kConfigMacLeopard: 235 case kConfigMacLeopard:
234 case kConfigMacSnowLeopard: 236 case kConfigMacSnowLeopard:
235 case kConfigMacLion: 237 case kConfigMacLion:
236 case kConfigMacMountainLion: 238 case kConfigMacMountainLion:
237 case kConfigMacMavericks: 239 case kConfigMacMavericks:
240 case kConfigMacYosemite:
238 case kConfigMac: 241 case kConfigMac:
239 case kConfigLinux: 242 case kConfigLinux:
240 case kConfigChromeOS: 243 case kConfigChromeOS:
241 case kConfigAndroid: 244 case kConfigAndroid:
242 case kConfigNVidia: 245 case kConfigNVidia:
243 case kConfigAMD: 246 case kConfigAMD:
244 case kConfigIntel: 247 case kConfigIntel:
245 case kConfigVMWare: 248 case kConfigVMWare:
246 case kConfigRelease: 249 case kConfigRelease:
247 case kConfigDebug: 250 case kConfigDebug:
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 case kConfigWinXP: 282 case kConfigWinXP:
280 case kConfigWinVista: 283 case kConfigWinVista:
281 case kConfigWin7: 284 case kConfigWin7:
282 case kConfigWin8: 285 case kConfigWin8:
283 case kConfigWin: 286 case kConfigWin:
284 case kConfigMacLeopard: 287 case kConfigMacLeopard:
285 case kConfigMacSnowLeopard: 288 case kConfigMacSnowLeopard:
286 case kConfigMacLion: 289 case kConfigMacLion:
287 case kConfigMacMountainLion: 290 case kConfigMacMountainLion:
288 case kConfigMacMavericks: 291 case kConfigMacMavericks:
292 case kConfigMacYosemite:
289 case kConfigMac: 293 case kConfigMac:
290 case kConfigLinux: 294 case kConfigLinux:
291 case kConfigChromeOS: 295 case kConfigChromeOS:
292 case kConfigAndroid: 296 case kConfigAndroid:
293 case kConfigNVidia: 297 case kConfigNVidia:
294 case kConfigAMD: 298 case kConfigAMD:
295 case kConfigIntel: 299 case kConfigIntel:
296 case kConfigVMWare: 300 case kConfigVMWare:
297 case kConfigRelease: 301 case kConfigRelease:
298 case kConfigDebug: 302 case kConfigDebug:
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 case kConfigWinXP: 397 case kConfigWinXP:
394 case kConfigWinVista: 398 case kConfigWinVista:
395 case kConfigWin7: 399 case kConfigWin7:
396 case kConfigWin8: 400 case kConfigWin8:
397 case kConfigWin: 401 case kConfigWin:
398 case kConfigMacLeopard: 402 case kConfigMacLeopard:
399 case kConfigMacSnowLeopard: 403 case kConfigMacSnowLeopard:
400 case kConfigMacLion: 404 case kConfigMacLion:
401 case kConfigMacMountainLion: 405 case kConfigMacMountainLion:
402 case kConfigMacMavericks: 406 case kConfigMacMavericks:
407 case kConfigMacYosemite:
403 case kConfigMac: 408 case kConfigMac:
404 case kConfigLinux: 409 case kConfigLinux:
405 case kConfigChromeOS: 410 case kConfigChromeOS:
406 case kConfigAndroid: 411 case kConfigAndroid:
407 if ((config->os() & kTokenData[token].flag) != 0) { 412 if ((config->os() & kTokenData[token].flag) != 0) {
408 PushErrorMessage(kErrorMessage[kErrorEntryWithOsConflicts], 413 PushErrorMessage(kErrorMessage[kErrorEntryWithOsConflicts],
409 line_number); 414 line_number);
410 return false; 415 return false;
411 } 416 }
412 config->set_os(config->os() | kTokenData[token].flag); 417 config->set_os(config->os() | kTokenData[token].flag);
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 message.c_str())); 503 message.c_str()));
499 } 504 }
500 505
501 GPUTestExpectationsParser:: GPUTestExpectationEntry::GPUTestExpectationEntry() 506 GPUTestExpectationsParser:: GPUTestExpectationEntry::GPUTestExpectationEntry()
502 : test_expectation(0), 507 : test_expectation(0),
503 line_number(0) { 508 line_number(0) {
504 } 509 }
505 510
506 } // namespace gpu 511 } // namespace gpu
507 512
OLDNEW
« no previous file with comments | « gpu/config/gpu_test_config.cc ('k') | gpu/config/gpu_test_expectations_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698