OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
Robert Sesek
2015/07/21 21:15:15
FYI this file is deleted
| |
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 "base/test/expectations/expectation.h" | 5 #include "base/test/expectations/expectation.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 | 8 |
9 #if defined(OS_WIN) | 9 #if defined(OS_WIN) |
10 #include "base/win/windows_version.h" | 10 #include "base/win/windows_version.h" |
11 #elif defined(OS_MACOSX) && !defined(OS_IOS) | 11 #elif defined(OS_MACOSX) && !defined(OS_IOS) |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
44 variant != "7" && | 44 variant != "7" && |
45 variant != "8") { | 45 variant != "8") { |
46 return false; | 46 return false; |
47 } | 47 } |
48 } else if (name == "Mac") { | 48 } else if (name == "Mac") { |
49 if (!variant.empty() && | 49 if (!variant.empty() && |
50 variant != "10.6" && | 50 variant != "10.6" && |
51 variant != "10.7" && | 51 variant != "10.7" && |
52 variant != "10.8" && | 52 variant != "10.8" && |
53 variant != "10.9" && | 53 variant != "10.9" && |
54 variant != "10.10") { | 54 variant != "10.10" && |
55 variant != "10.11") { | |
55 return false; | 56 return false; |
56 } | 57 } |
57 } else if (name == "Linux") { | 58 } else if (name == "Linux") { |
58 if (!variant.empty() && | 59 if (!variant.empty() && |
59 variant != "32" && | 60 variant != "32" && |
60 variant != "64") { | 61 variant != "64") { |
61 return false; | 62 return false; |
62 } | 63 } |
63 } else if (name == "ChromeOS") { | 64 } else if (name == "ChromeOS") { |
64 // TODO(rsesek): Figure out what ChromeOS needs. | 65 // TODO(rsesek): Figure out what ChromeOS needs. |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
107 if (base::mac::IsOSSnowLeopard()) | 108 if (base::mac::IsOSSnowLeopard()) |
108 platform.variant = "10.6"; | 109 platform.variant = "10.6"; |
109 else if (base::mac::IsOSLion()) | 110 else if (base::mac::IsOSLion()) |
110 platform.variant = "10.7"; | 111 platform.variant = "10.7"; |
111 else if (base::mac::IsOSMountainLion()) | 112 else if (base::mac::IsOSMountainLion()) |
112 platform.variant = "10.8"; | 113 platform.variant = "10.8"; |
113 else if (base::mac::IsOSMavericks()) | 114 else if (base::mac::IsOSMavericks()) |
114 platform.variant = "10.9"; | 115 platform.variant = "10.9"; |
115 else if (base::mac::IsOSYosemite()) | 116 else if (base::mac::IsOSYosemite()) |
116 platform.variant = "10.10"; | 117 platform.variant = "10.10"; |
118 else if (base::mac::IsOSElCapitan()) | |
119 platform.variant = "10.11"; | |
117 #elif defined(OS_CHROMEOS) | 120 #elif defined(OS_CHROMEOS) |
118 platform.name = "ChromeOS"; | 121 platform.name = "ChromeOS"; |
119 #elif defined(OS_ANDROID) | 122 #elif defined(OS_ANDROID) |
120 platform.name = "Android"; | 123 platform.name = "Android"; |
121 #elif defined(OS_LINUX) | 124 #elif defined(OS_LINUX) |
122 platform.name = "Linux"; | 125 platform.name = "Linux"; |
123 std::string arch = base::SysInfo::OperatingSystemArchitecture(); | 126 std::string arch = base::SysInfo::OperatingSystemArchitecture(); |
124 if (arch == "x86") | 127 if (arch == "x86") |
125 platform.variant = "32"; | 128 platform.variant = "32"; |
126 else if (arch == "x86_64") | 129 else if (arch == "x86_64") |
(...skipping 25 matching lines...) Expand all Loading... | |
152 } | 155 } |
153 | 156 |
154 Expectation::Expectation() | 157 Expectation::Expectation() |
155 : configuration(CONFIGURATION_UNSPECIFIED), | 158 : configuration(CONFIGURATION_UNSPECIFIED), |
156 result(RESULT_PASS) { | 159 result(RESULT_PASS) { |
157 } | 160 } |
158 | 161 |
159 Expectation::~Expectation() {} | 162 Expectation::~Expectation() {} |
160 | 163 |
161 } // namespace test_expectations | 164 } // namespace test_expectations |
OLD | NEW |