Commit ff6293cd authored by Christopher Cameron's avatar Christopher Cameron Committed by Commit Bot

Add GPUTestConfig::kOsMacBigSur

This is causing the test GPUTestConfigTest.LoadCurrentConfig to fail.

Bug: 1101436
Change-Id: I3b3c80de68e222f19d7aa7fc7b9eaf1aac8a4437
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2285339
Commit-Queue: ccameron <ccameron@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786532}
parent c809a8b3
...@@ -52,31 +52,39 @@ GPUTestConfig::OS GetCurrentOS() { ...@@ -52,31 +52,39 @@ GPUTestConfig::OS GetCurrentOS() {
int32_t bugfix_version = 0; int32_t bugfix_version = 0;
base::SysInfo::OperatingSystemVersionNumbers( base::SysInfo::OperatingSystemVersionNumbers(
&major_version, &minor_version, &bugfix_version); &major_version, &minor_version, &bugfix_version);
if (major_version == 10) { switch (major_version) {
switch (minor_version) { case 10:
case 5: switch (minor_version) {
return GPUTestConfig::kOsMacLeopard; case 5:
case 6: return GPUTestConfig::kOsMacLeopard;
return GPUTestConfig::kOsMacSnowLeopard; case 6:
case 7: return GPUTestConfig::kOsMacSnowLeopard;
return GPUTestConfig::kOsMacLion; case 7:
case 8: return GPUTestConfig::kOsMacLion;
return GPUTestConfig::kOsMacMountainLion; case 8:
case 9: return GPUTestConfig::kOsMacMountainLion;
return GPUTestConfig::kOsMacMavericks; case 9:
case 10: return GPUTestConfig::kOsMacMavericks;
return GPUTestConfig::kOsMacYosemite; case 10:
case 11: return GPUTestConfig::kOsMacYosemite;
return GPUTestConfig::kOsMacElCapitan; case 11:
case 12: return GPUTestConfig::kOsMacElCapitan;
return GPUTestConfig::kOsMacSierra; case 12:
case 13: return GPUTestConfig::kOsMacSierra;
return GPUTestConfig::kOsMacHighSierra; case 13:
case 14: return GPUTestConfig::kOsMacHighSierra;
return GPUTestConfig::kOsMacMojave; case 14:
case 15: return GPUTestConfig::kOsMacMojave;
return GPUTestConfig::kOsMacCatalina; case 15:
} return GPUTestConfig::kOsMacCatalina;
}
break;
case 11:
switch (minor_version) {
case 0:
return GPUTestConfig::kOsMacBigSur;
}
break;
} }
return GPUTestConfig::kOsUnknown; return GPUTestConfig::kOsUnknown;
#elif defined(OS_ANDROID) #elif defined(OS_ANDROID)
......
...@@ -39,10 +39,11 @@ class GPU_EXPORT GPUTestConfig { ...@@ -39,10 +39,11 @@ class GPU_EXPORT GPUTestConfig {
kOsMacHighSierra = 1 << 18, kOsMacHighSierra = 1 << 18,
kOsMacMojave = 1 << 19, kOsMacMojave = 1 << 19,
kOsMacCatalina = 1 << 20, kOsMacCatalina = 1 << 20,
kOsMacBigSur = 1 << 21,
kOsMac = kOsMacLeopard | kOsMacSnowLeopard | kOsMacLion | kOsMac = kOsMacLeopard | kOsMacSnowLeopard | kOsMacLion |
kOsMacMountainLion | kOsMacMavericks | kOsMacYosemite | kOsMacMountainLion | kOsMacMavericks | kOsMacYosemite |
kOsMacElCapitan | kOsMacSierra | kOsMacHighSierra | kOsMacMojave | kOsMacElCapitan | kOsMacSierra | kOsMacHighSierra | kOsMacMojave |
kOsMacCatalina, kOsMacCatalina | kOsMacBigSur,
// Jump over a few bits for future OSX versions. // Jump over a few bits for future OSX versions.
kOsLinux = 1 << 25, kOsLinux = 1 << 25,
kOsChromeOS = 1 << 26, kOsChromeOS = 1 << 26,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment