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

Side by Side Diff: gpu/config/gpu_test_expectations_parser_unittest.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_expectations_parser.cc ('k') | no next file » | 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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include "base/format_macros.h" 7 #include "base/format_macros.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "gpu/config/gpu_test_expectations_parser.h" 10 #include "gpu/config/gpu_test_expectations_parser.h"
(...skipping 18 matching lines...) Expand all
29 { { "WIN7", GPUTestConfig::kOsWin7 }, kOsFamilyWin }, 29 { { "WIN7", GPUTestConfig::kOsWin7 }, kOsFamilyWin },
30 { { "WIN8", GPUTestConfig::kOsWin8 }, kOsFamilyWin }, 30 { { "WIN8", GPUTestConfig::kOsWin8 }, kOsFamilyWin },
31 { { "WIN10", GPUTestConfig::kOsWin10 }, kOsFamilyWin }, 31 { { "WIN10", GPUTestConfig::kOsWin10 }, kOsFamilyWin },
32 { { "LEOPARD", GPUTestConfig::kOsMacLeopard }, kOsFamilyMac }, 32 { { "LEOPARD", GPUTestConfig::kOsMacLeopard }, kOsFamilyMac },
33 { { "SNOWLEOPARD", GPUTestConfig::kOsMacSnowLeopard }, kOsFamilyMac }, 33 { { "SNOWLEOPARD", GPUTestConfig::kOsMacSnowLeopard }, kOsFamilyMac },
34 { { "LION", GPUTestConfig::kOsMacLion }, kOsFamilyMac }, 34 { { "LION", GPUTestConfig::kOsMacLion }, kOsFamilyMac },
35 { { "MOUNTAINLION", GPUTestConfig::kOsMacMountainLion }, kOsFamilyMac }, 35 { { "MOUNTAINLION", GPUTestConfig::kOsMacMountainLion }, kOsFamilyMac },
36 { { "MAVERICKS", GPUTestConfig::kOsMacMavericks }, kOsFamilyMac }, 36 { { "MAVERICKS", GPUTestConfig::kOsMacMavericks }, kOsFamilyMac },
37 { { "YOSEMITE", GPUTestConfig::kOsMacYosemite }, kOsFamilyMac }, 37 { { "YOSEMITE", GPUTestConfig::kOsMacYosemite }, kOsFamilyMac },
38 { { "ELCAPITAN", GPUTestConfig::kOsMacElCapitan }, kOsFamilyMac }, 38 { { "ELCAPITAN", GPUTestConfig::kOsMacElCapitan }, kOsFamilyMac },
39 { { "SIERRA", GPUTestConfig::kOsMacSierra }, kOsFamilyMac },
39 { { "LINUX", GPUTestConfig::kOsLinux }, 40 { { "LINUX", GPUTestConfig::kOsLinux },
40 { "LINUX", GPUTestConfig::kOsLinux } }, 41 { "LINUX", GPUTestConfig::kOsLinux } },
41 { { "CHROMEOS", GPUTestConfig::kOsChromeOS }, 42 { { "CHROMEOS", GPUTestConfig::kOsChromeOS },
42 { "CHROMEOS", GPUTestConfig::kOsChromeOS } }, 43 { "CHROMEOS", GPUTestConfig::kOsChromeOS } },
43 { { "ANDROID", GPUTestConfig::kOsAndroid }, 44 { { "ANDROID", GPUTestConfig::kOsAndroid },
44 { "ANDROID", GPUTestConfig::kOsAndroid } } 45 { "ANDROID", GPUTestConfig::kOsAndroid } }
45 }; 46 };
46 47
47 TestOSEntry GetUnrelatedOS(const TestOSEntry& os) { 48 TestOSEntry GetUnrelatedOS(const TestOSEntry& os) {
48 return (os.os & kOsFamilyWin.os) ? kOsFamilyMac : kOsFamilyWin; 49 return (os.os & kOsFamilyWin.os) ? kOsFamilyMac : kOsFamilyWin;
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 EXPECT_FALSE(parser.LoadTestExpectations(text)); 344 EXPECT_FALSE(parser.LoadTestExpectations(text));
344 EXPECT_NE(0u, parser.GetErrorMessages().size()); 345 EXPECT_NE(0u, parser.GetErrorMessages().size());
345 } 346 }
346 347
347 INSTANTIATE_TEST_CASE_P(GPUTestExpectationsParser, 348 INSTANTIATE_TEST_CASE_P(GPUTestExpectationsParser,
348 GPUTestExpectationsParserParamTest, 349 GPUTestExpectationsParserParamTest,
349 ::testing::ValuesIn(kOSVersionsWithFamily)); 350 ::testing::ValuesIn(kOSVersionsWithFamily));
350 351
351 } // namespace gpu 352 } // namespace gpu
352 353
OLDNEW
« no previous file with comments | « 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