Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "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" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 43 variant != "Vista" && | 43 variant != "Vista" && |
| 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 != "" && | 49 if (variant != "" && |
| 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 return false; | 55 return false; |
| 55 } | 56 } |
| 56 } else if (name == "Linux") { | 57 } else if (name == "Linux") { |
| 57 if (variant != "" && | 58 if (variant != "" && |
| 58 variant != "32" && | 59 variant != "32" && |
| 59 variant != "64") { | 60 variant != "64") { |
| 60 return false; | 61 return false; |
| 61 } | 62 } |
| 62 } else if (name == "ChromeOS") { | 63 } else if (name == "ChromeOS") { |
| 63 // TODO(rsesek): Figure out what ChromeOS needs. | 64 // TODO(rsesek): Figure out what ChromeOS needs. |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 104 #elif defined(OS_MACOSX) | 105 #elif defined(OS_MACOSX) |
| 105 platform.name = "Mac"; | 106 platform.name = "Mac"; |
| 106 if (base::mac::IsOSSnowLeopard()) | 107 if (base::mac::IsOSSnowLeopard()) |
| 107 platform.variant = "10.6"; | 108 platform.variant = "10.6"; |
| 108 else if (base::mac::IsOSLion()) | 109 else if (base::mac::IsOSLion()) |
| 109 platform.variant = "10.7"; | 110 platform.variant = "10.7"; |
| 110 else if (base::mac::IsOSMountainLion()) | 111 else if (base::mac::IsOSMountainLion()) |
| 111 platform.variant = "10.8"; | 112 platform.variant = "10.8"; |
| 112 else if (base::mac::IsOSMavericks()) | 113 else if (base::mac::IsOSMavericks()) |
| 113 platform.variant = "10.9"; | 114 platform.variant = "10.9"; |
| 115 else if (base::mac::IsOSYosemite()) | |
| 116 platform.variant = "10.9"; | |
|
Mark Mentovai
2014/06/12 18:00:27
Fix this.
Avi (use Gerrit)
2014/06/12 18:04:35
Done.
| |
| 114 #elif defined(OS_CHROMEOS) | 117 #elif defined(OS_CHROMEOS) |
| 115 platform.name = "ChromeOS"; | 118 platform.name = "ChromeOS"; |
| 116 #elif defined(OS_ANDROID) | 119 #elif defined(OS_ANDROID) |
| 117 platform.name = "Android"; | 120 platform.name = "Android"; |
| 118 #elif defined(OS_LINUX) | 121 #elif defined(OS_LINUX) |
| 119 platform.name = "Linux"; | 122 platform.name = "Linux"; |
| 120 std::string arch = base::SysInfo::OperatingSystemArchitecture(); | 123 std::string arch = base::SysInfo::OperatingSystemArchitecture(); |
| 121 if (arch == "x86") | 124 if (arch == "x86") |
| 122 platform.variant = "32"; | 125 platform.variant = "32"; |
| 123 else if (arch == "x86_64") | 126 else if (arch == "x86_64") |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 149 } | 152 } |
| 150 | 153 |
| 151 Expectation::Expectation() | 154 Expectation::Expectation() |
| 152 : configuration(CONFIGURATION_UNSPECIFIED), | 155 : configuration(CONFIGURATION_UNSPECIFIED), |
| 153 result(RESULT_PASS) { | 156 result(RESULT_PASS) { |
| 154 } | 157 } |
| 155 | 158 |
| 156 Expectation::~Expectation() {} | 159 Expectation::~Expectation() {} |
| 157 | 160 |
| 158 } // namespace test_expectations | 161 } // namespace test_expectations |
| OLD | NEW |