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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2172693002: Fix GPUTestConfigTest.LoadCurrentConfig on macOS Sierra. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« 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 <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 25 matching lines...) Expand all
36 kConfigWin8, 36 kConfigWin8,
37 kConfigWin10, 37 kConfigWin10,
38 kConfigWin, 38 kConfigWin,
39 kConfigMacLeopard, 39 kConfigMacLeopard,
40 kConfigMacSnowLeopard, 40 kConfigMacSnowLeopard,
41 kConfigMacLion, 41 kConfigMacLion,
42 kConfigMacMountainLion, 42 kConfigMacMountainLion,
43 kConfigMacMavericks, 43 kConfigMacMavericks,
44 kConfigMacYosemite, 44 kConfigMacYosemite,
45 kConfigMacElCapitan, 45 kConfigMacElCapitan,
46 kConfigMacSierra,
46 kConfigMac, 47 kConfigMac,
47 kConfigLinux, 48 kConfigLinux,
48 kConfigChromeOS, 49 kConfigChromeOS,
49 kConfigAndroid, 50 kConfigAndroid,
50 // gpu vendor 51 // gpu vendor
51 kConfigNVidia, 52 kConfigNVidia,
52 kConfigAMD, 53 kConfigAMD,
53 kConfigIntel, 54 kConfigIntel,
54 kConfigVMWare, 55 kConfigVMWare,
55 // build type 56 // build type
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 {"win8", GPUTestConfig::kOsWin8}, 91 {"win8", GPUTestConfig::kOsWin8},
91 {"win10", GPUTestConfig::kOsWin10}, 92 {"win10", GPUTestConfig::kOsWin10},
92 {"win", GPUTestConfig::kOsWin}, 93 {"win", GPUTestConfig::kOsWin},
93 {"leopard", GPUTestConfig::kOsMacLeopard}, 94 {"leopard", GPUTestConfig::kOsMacLeopard},
94 {"snowleopard", GPUTestConfig::kOsMacSnowLeopard}, 95 {"snowleopard", GPUTestConfig::kOsMacSnowLeopard},
95 {"lion", GPUTestConfig::kOsMacLion}, 96 {"lion", GPUTestConfig::kOsMacLion},
96 {"mountainlion", GPUTestConfig::kOsMacMountainLion}, 97 {"mountainlion", GPUTestConfig::kOsMacMountainLion},
97 {"mavericks", GPUTestConfig::kOsMacMavericks}, 98 {"mavericks", GPUTestConfig::kOsMacMavericks},
98 {"yosemite", GPUTestConfig::kOsMacYosemite}, 99 {"yosemite", GPUTestConfig::kOsMacYosemite},
99 {"elcapitan", GPUTestConfig::kOsMacElCapitan}, 100 {"elcapitan", GPUTestConfig::kOsMacElCapitan},
101 {"sierra", GPUTestConfig::kOsMacSierra},
100 {"mac", GPUTestConfig::kOsMac}, 102 {"mac", GPUTestConfig::kOsMac},
101 {"linux", GPUTestConfig::kOsLinux}, 103 {"linux", GPUTestConfig::kOsLinux},
102 {"chromeos", GPUTestConfig::kOsChromeOS}, 104 {"chromeos", GPUTestConfig::kOsChromeOS},
103 {"android", GPUTestConfig::kOsAndroid}, 105 {"android", GPUTestConfig::kOsAndroid},
104 {"nvidia", 0x10DE}, 106 {"nvidia", 0x10DE},
105 {"amd", 0x1002}, 107 {"amd", 0x1002},
106 {"intel", 0x8086}, 108 {"intel", 0x8086},
107 {"vmware", 0x15ad}, 109 {"vmware", 0x15ad},
108 {"release", GPUTestConfig::kBuildTypeRelease}, 110 {"release", GPUTestConfig::kBuildTypeRelease},
109 {"debug", GPUTestConfig::kBuildTypeDebug}, 111 {"debug", GPUTestConfig::kBuildTypeDebug},
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 case kConfigWin8: 254 case kConfigWin8:
253 case kConfigWin10: 255 case kConfigWin10:
254 case kConfigWin: 256 case kConfigWin:
255 case kConfigMacLeopard: 257 case kConfigMacLeopard:
256 case kConfigMacSnowLeopard: 258 case kConfigMacSnowLeopard:
257 case kConfigMacLion: 259 case kConfigMacLion:
258 case kConfigMacMountainLion: 260 case kConfigMacMountainLion:
259 case kConfigMacMavericks: 261 case kConfigMacMavericks:
260 case kConfigMacYosemite: 262 case kConfigMacYosemite:
261 case kConfigMacElCapitan: 263 case kConfigMacElCapitan:
264 case kConfigMacSierra:
262 case kConfigMac: 265 case kConfigMac:
263 case kConfigLinux: 266 case kConfigLinux:
264 case kConfigChromeOS: 267 case kConfigChromeOS:
265 case kConfigAndroid: 268 case kConfigAndroid:
266 case kConfigNVidia: 269 case kConfigNVidia:
267 case kConfigAMD: 270 case kConfigAMD:
268 case kConfigIntel: 271 case kConfigIntel:
269 case kConfigVMWare: 272 case kConfigVMWare:
270 case kConfigRelease: 273 case kConfigRelease:
271 case kConfigDebug: 274 case kConfigDebug:
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 case kConfigWin8: 314 case kConfigWin8:
312 case kConfigWin10: 315 case kConfigWin10:
313 case kConfigWin: 316 case kConfigWin:
314 case kConfigMacLeopard: 317 case kConfigMacLeopard:
315 case kConfigMacSnowLeopard: 318 case kConfigMacSnowLeopard:
316 case kConfigMacLion: 319 case kConfigMacLion:
317 case kConfigMacMountainLion: 320 case kConfigMacMountainLion:
318 case kConfigMacMavericks: 321 case kConfigMacMavericks:
319 case kConfigMacYosemite: 322 case kConfigMacYosemite:
320 case kConfigMacElCapitan: 323 case kConfigMacElCapitan:
324 case kConfigMacSierra:
321 case kConfigMac: 325 case kConfigMac:
322 case kConfigLinux: 326 case kConfigLinux:
323 case kConfigChromeOS: 327 case kConfigChromeOS:
324 case kConfigAndroid: 328 case kConfigAndroid:
325 case kConfigNVidia: 329 case kConfigNVidia:
326 case kConfigAMD: 330 case kConfigAMD:
327 case kConfigIntel: 331 case kConfigIntel:
328 case kConfigVMWare: 332 case kConfigVMWare:
329 case kConfigRelease: 333 case kConfigRelease:
330 case kConfigDebug: 334 case kConfigDebug:
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 case kConfigWin8: 437 case kConfigWin8:
434 case kConfigWin10: 438 case kConfigWin10:
435 case kConfigWin: 439 case kConfigWin:
436 case kConfigMacLeopard: 440 case kConfigMacLeopard:
437 case kConfigMacSnowLeopard: 441 case kConfigMacSnowLeopard:
438 case kConfigMacLion: 442 case kConfigMacLion:
439 case kConfigMacMountainLion: 443 case kConfigMacMountainLion:
440 case kConfigMacMavericks: 444 case kConfigMacMavericks:
441 case kConfigMacYosemite: 445 case kConfigMacYosemite:
442 case kConfigMacElCapitan: 446 case kConfigMacElCapitan:
447 case kConfigMacSierra:
443 case kConfigMac: 448 case kConfigMac:
444 case kConfigLinux: 449 case kConfigLinux:
445 case kConfigChromeOS: 450 case kConfigChromeOS:
446 case kConfigAndroid: 451 case kConfigAndroid:
447 if ((config->os() & kTokenData[token].flag) != 0) { 452 if ((config->os() & kTokenData[token].flag) != 0) {
448 PushErrorMessage(kErrorMessage[kErrorEntryWithOsConflicts], 453 PushErrorMessage(kErrorMessage[kErrorEntryWithOsConflicts],
449 line_number); 454 line_number);
450 return false; 455 return false;
451 } 456 }
452 config->set_os(config->os() | kTokenData[token].flag); 457 config->set_os(config->os() | kTokenData[token].flag);
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 message.c_str())); 553 message.c_str()));
549 } 554 }
550 555
551 GPUTestExpectationsParser:: GPUTestExpectationEntry::GPUTestExpectationEntry() 556 GPUTestExpectationsParser:: GPUTestExpectationEntry::GPUTestExpectationEntry()
552 : test_expectation(0), 557 : test_expectation(0),
553 line_number(0) { 558 line_number(0) {
554 } 559 }
555 560
556 } // namespace gpu 561 } // namespace gpu
557 562
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