Add Mavericks to test config.

BUG=338160 TEST=gpu_unittests on 10.9 bots R=kbr@chromium.org Review URL: https://codereview.chromium.org/141753015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248647 0039d316-1c4b-4281-b951-d872f2087c98
qweri0p · Feb 4, 2014 · 710089b · 710089b
1 parent 099d672
commit 710089b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/gpu/config/gpu_test_config.cc b/gpu/config/gpu_test_config.cc
@@ -55,6 +55,8 @@ GPUTestConfig::OS GetCurrentOS() {
         return GPUTestConfig::kOsMacLion;
       case 8:
         return GPUTestConfig::kOsMacMountainLion;
+      case 9:
+        return GPUTestConfig::kOsMacMavericks;
     }
   }
 #elif defined(OS_ANDROID)
@@ -169,6 +171,7 @@ bool GPUTestBotConfig::IsValid() const {
     case kOsMacSnowLeopard:
     case kOsMacLion:
     case kOsMacMountainLion:
+    case kOsMacMavericks:
     case kOsLinux:
     case kOsChromeOS:
     case kOsAndroid:

diff --git a/gpu/config/gpu_test_config.h b/gpu/config/gpu_test_config.h
@@ -29,11 +29,12 @@ class GPU_EXPORT GPUTestConfig {
     kOsMacSnowLeopard = 1 << 5,
     kOsMacLion = 1 << 6,
     kOsMacMountainLion = 1 << 7,
+    kOsMacMavericks = 1 << 8,
     kOsMac = kOsMacLeopard | kOsMacSnowLeopard | kOsMacLion |
-             kOsMacMountainLion,
-    kOsLinux = 1 << 8,
-    kOsChromeOS = 1 << 9,
-    kOsAndroid = 1 << 10,
+             kOsMacMountainLion | kOsMacMavericks,
+    kOsLinux = 1 << 9,
+    kOsChromeOS = 1 << 10,
+    kOsAndroid = 1 << 11,
   };
 
   enum BuildType {

diff --git a/gpu/config/gpu_test_expectations_parser.cc b/gpu/config/gpu_test_expectations_parser.cc
@@ -36,6 +36,7 @@ enum Token {
   kConfigMacSnowLeopard,
   kConfigMacLion,
   kConfigMacMountainLion,
+  kConfigMacMavericks,
   kConfigMac,
   kConfigLinux,
   kConfigChromeOS,
@@ -81,6 +82,7 @@ const TokenInfo kTokenData[] = {
   { "snowleopard", GPUTestConfig::kOsMacSnowLeopard },
   { "lion", GPUTestConfig::kOsMacLion },
   { "mountainlion", GPUTestConfig::kOsMacMountainLion },
+  { "mavericks", GPUTestConfig::kOsMacMavericks },
   { "mac", GPUTestConfig::kOsMac },
   { "linux", GPUTestConfig::kOsLinux },
   { "chromeos", GPUTestConfig::kOsChromeOS },
@@ -232,6 +234,7 @@ bool GPUTestExpectationsParser::ParseConfig(
       case kConfigMacSnowLeopard:
       case kConfigMacLion:
       case kConfigMacMountainLion:
+      case kConfigMacMavericks:
       case kConfigMac:
       case kConfigLinux:
       case kConfigChromeOS:
@@ -282,6 +285,7 @@ bool GPUTestExpectationsParser::ParseLine(
       case kConfigMacSnowLeopard:
       case kConfigMacLion:
       case kConfigMacMountainLion:
+      case kConfigMacMavericks:
       case kConfigMac:
       case kConfigLinux:
       case kConfigChromeOS:
@@ -395,6 +399,7 @@ bool GPUTestExpectationsParser::UpdateTestConfig(
     case kConfigMacSnowLeopard:
     case kConfigMacLion:
     case kConfigMacMountainLion:
+    case kConfigMacMavericks:
     case kConfigMac:
     case kConfigLinux:
     case kConfigChromeOS:

diff --git a/gpu/config/gpu_test_expectations_parser_unittest.cc b/gpu/config/gpu_test_expectations_parser_unittest.cc
@@ -92,7 +92,7 @@ TEST_F(GPUTestExpectationsParserTest, ValidUnrelatedTestEntry) {
 TEST_F(GPUTestExpectationsParserTest, AllModifiers) {
   const std::string text =
       "BUG12345 XP VISTA WIN7 WIN8 LEOPARD SNOWLEOPARD LION MOUNTAINLION "
-      "LINUX CHROMEOS ANDROID "
+      "MAVERICKS LINUX CHROMEOS ANDROID "
       "NVIDIA INTEL AMD VMWARE RELEASE DEBUG : MyTest = "
       "PASS FAIL FLAKY TIMEOUT SKIP";