Commit 22312e7c authored by Avi Drissman's avatar Avi Drissman Committed by Commit Bot

Add GPUTestConfig::kOsMacBigSur to validity

Followup to https://crrev.com/c/2285339; the new constant
kOsMacBigSur should be considered valid.

Bug: 1101436
Change-Id: Ifa5872d186ffd9d4886d941485ef3538b090d200
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2354459
Commit-Queue: Avi Drissman <avi@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Reviewed-by: default avatarZhenyao Mo <zmo@chromium.org>
Auto-Submit: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797902}
parent 76152eea
...@@ -222,6 +222,7 @@ bool GPUTestBotConfig::IsValid() const { ...@@ -222,6 +222,7 @@ bool GPUTestBotConfig::IsValid() const {
case kOsMacHighSierra: case kOsMacHighSierra:
case kOsMacMojave: case kOsMacMojave:
case kOsMacCatalina: case kOsMacCatalina:
case kOsMacBigSur:
case kOsLinux: case kOsLinux:
case kOsChromeOS: case kOsChromeOS:
case kOsAndroid: case kOsAndroid:
......
...@@ -47,6 +47,7 @@ enum Token { ...@@ -47,6 +47,7 @@ enum Token {
kConfigMacHighSierra, kConfigMacHighSierra,
kConfigMacMojave, kConfigMacMojave,
kConfigMacCatalina, kConfigMacCatalina,
kConfigMacBigSur,
kConfigMac, kConfigMac,
kConfigLinux, kConfigLinux,
kConfigChromeOS, kConfigChromeOS,
...@@ -108,6 +109,7 @@ const TokenInfo kTokenData[] = { ...@@ -108,6 +109,7 @@ const TokenInfo kTokenData[] = {
{"highsierra", GPUTestConfig::kOsMacHighSierra}, {"highsierra", GPUTestConfig::kOsMacHighSierra},
{"mojave", GPUTestConfig::kOsMacMojave}, {"mojave", GPUTestConfig::kOsMacMojave},
{"catalina", GPUTestConfig::kOsMacCatalina}, {"catalina", GPUTestConfig::kOsMacCatalina},
{"bigsur", GPUTestConfig::kOsMacBigSur},
{"mac", GPUTestConfig::kOsMac}, {"mac", GPUTestConfig::kOsMac},
{"linux", GPUTestConfig::kOsLinux}, {"linux", GPUTestConfig::kOsLinux},
{"chromeos", GPUTestConfig::kOsChromeOS}, {"chromeos", GPUTestConfig::kOsChromeOS},
...@@ -277,6 +279,7 @@ bool GPUTestExpectationsParser::ParseConfig( ...@@ -277,6 +279,7 @@ bool GPUTestExpectationsParser::ParseConfig(
case kConfigMacHighSierra: case kConfigMacHighSierra:
case kConfigMacMojave: case kConfigMacMojave:
case kConfigMacCatalina: case kConfigMacCatalina:
case kConfigMacBigSur:
case kConfigMac: case kConfigMac:
case kConfigLinux: case kConfigLinux:
case kConfigChromeOS: case kConfigChromeOS:
...@@ -342,6 +345,7 @@ bool GPUTestExpectationsParser::ParseLine( ...@@ -342,6 +345,7 @@ bool GPUTestExpectationsParser::ParseLine(
case kConfigMacHighSierra: case kConfigMacHighSierra:
case kConfigMacMojave: case kConfigMacMojave:
case kConfigMacCatalina: case kConfigMacCatalina:
case kConfigMacBigSur:
case kConfigMac: case kConfigMac:
case kConfigLinux: case kConfigLinux:
case kConfigChromeOS: case kConfigChromeOS:
...@@ -470,6 +474,7 @@ bool GPUTestExpectationsParser::UpdateTestConfig(GPUTestConfig* config, ...@@ -470,6 +474,7 @@ bool GPUTestExpectationsParser::UpdateTestConfig(GPUTestConfig* config,
case kConfigMacHighSierra: case kConfigMacHighSierra:
case kConfigMacMojave: case kConfigMacMojave:
case kConfigMacCatalina: case kConfigMacCatalina:
case kConfigMacBigSur:
case kConfigMac: case kConfigMac:
case kConfigLinux: case kConfigLinux:
case kConfigChromeOS: case kConfigChromeOS:
......
...@@ -39,6 +39,7 @@ static const struct TestOsWithFamily { ...@@ -39,6 +39,7 @@ static const struct TestOsWithFamily {
{{"HIGHSIERRA", GPUTestConfig::kOsMacHighSierra}, kOsFamilyMac}, {{"HIGHSIERRA", GPUTestConfig::kOsMacHighSierra}, kOsFamilyMac},
{{"MOJAVE", GPUTestConfig::kOsMacMojave}, kOsFamilyMac}, {{"MOJAVE", GPUTestConfig::kOsMacMojave}, kOsFamilyMac},
{{"CATALINA", GPUTestConfig::kOsMacCatalina}, kOsFamilyMac}, {{"CATALINA", GPUTestConfig::kOsMacCatalina}, kOsFamilyMac},
{{"BIGSUR", GPUTestConfig::kOsMacBigSur}, kOsFamilyMac},
{{"LINUX", GPUTestConfig::kOsLinux}, {"LINUX", GPUTestConfig::kOsLinux}}, {{"LINUX", GPUTestConfig::kOsLinux}, {"LINUX", GPUTestConfig::kOsLinux}},
{{"CHROMEOS", GPUTestConfig::kOsChromeOS}, {{"CHROMEOS", GPUTestConfig::kOsChromeOS},
{"CHROMEOS", GPUTestConfig::kOsChromeOS}}, {"CHROMEOS", GPUTestConfig::kOsChromeOS}},
......
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