Extend the GPU test config to handle OSX 10.8 and Win8.

BUG=
TEST=content_unittests, (manually) run gpu_tests on Mac 10.8
Review URL: https://codereview.chromium.org/11412054

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168330 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 29 insertions, 9 deletions

diff --git a/content/test/gpu/gpu_test_config.cc b/content/test/gpu/gpu_test_config.cc
index 44d085a..5c93336 100644
--- a/content/test/gpu/gpu_test_config.cc
+++ b/content/test/gpu/gpu_test_config.cc
@@ -29,6 +29,8 @@ GPUTestConfig::OS GetCurrentOS() {
     return GPUTestConfig::kOsWinVista;
   if (major_version == 6 && minor_version == 1)
     return GPUTestConfig::kOsWin7;
+  if (major_version == 6 && minor_version == 2)
+    return GPUTestConfig::kOsWin8;
 #elif defined(OS_MACOSX)
   int32 major_version = 0;
   int32 minor_version = 0;
@@ -43,6 +45,8 @@ GPUTestConfig::OS GetCurrentOS() {
         return GPUTestConfig::kOsMacSnowLeopard;
       case 7:
         return GPUTestConfig::kOsMacLion;
+      case 8:
+        return GPUTestConfig::kOsMacMountainLion;
     }
   }
 #elif defined(OS_ANDROID)
@@ -144,9 +148,11 @@ bool GPUTestBotConfig::IsValid() const {
     case kOsWinXP:
     case kOsWinVista:
     case kOsWin7:
+    case kOsWin8:
     case kOsMacLeopard:
     case kOsMacSnowLeopard:
     case kOsMacLion:
+    case kOsMacMountainLion:
     case kOsLinux:
     case kOsChromeOS:
     case kOsAndroid:
diff --git a/content/test/gpu/gpu_test_config.h b/content/test/gpu/gpu_test_config.h
index 46725c4..c50c6b3 100644
--- a/content/test/gpu/gpu_test_config.h
+++ b/content/test/gpu/gpu_test_config.h
@@ -22,14 +22,17 @@ class GPUTestConfig {
     kOsWinXP = 1 << 0,
     kOsWinVista = 1 << 1,
     kOsWin7 = 1 << 2,
-    kOsWin = kOsWinXP | kOsWinVista | kOsWin7,
-    kOsMacLeopard = 1 << 3,
-    kOsMacSnowLeopard = 1 << 4,
-    kOsMacLion = 1 << 5,
-    kOsMac = kOsMacLeopard | kOsMacSnowLeopard | kOsMacLion,
-    kOsLinux = 1 << 6,
-    kOsChromeOS = 1 << 7,
-    kOsAndroid = 1 << 8,
+    kOsWin8 = 1 << 3,
+    kOsWin = kOsWinXP | kOsWinVista | kOsWin7 | kOsWin8,
+    kOsMacLeopard = 1 << 4,
+    kOsMacSnowLeopard = 1 << 5,
+    kOsMacLion = 1 << 6,
+    kOsMacMountainLion = 1 << 7,
+    kOsMac = kOsMacLeopard | kOsMacSnowLeopard | kOsMacLion |
+             kOsMacMountainLion,
+    kOsLinux = 1 << 8,
+    kOsChromeOS = 1 << 9,
+    kOsAndroid = 1 << 10,
   };
 
   enum BuildType {
diff --git a/content/test/gpu/gpu_test_expectations_parser.cc b/content/test/gpu/gpu_test_expectations_parser.cc
index 756239d..debcb79 100644
--- a/content/test/gpu/gpu_test_expectations_parser.cc
+++ b/content/test/gpu/gpu_test_expectations_parser.cc
@@ -31,10 +31,12 @@ enum Token {
   kConfigWinXP = 0,
   kConfigWinVista,
   kConfigWin7,
+  kConfigWin8,
   kConfigWin,
   kConfigMacLeopard,
   kConfigMacSnowLeopard,
   kConfigMacLion,
+  kConfigMacMountainLion,
   kConfigMac,
   kConfigLinux,
   kConfigChromeOS,
@@ -74,10 +76,12 @@ const TokenInfo kTokenData[] = {
   { "xp", GPUTestConfig::kOsWinXP },
   { "vista", GPUTestConfig::kOsWinVista },
   { "win7", GPUTestConfig::kOsWin7 },
+  { "win8", GPUTestConfig::kOsWin8 },
   { "win", GPUTestConfig::kOsWin },
   { "leopard", GPUTestConfig::kOsMacLeopard },
   { "snowleopard", GPUTestConfig::kOsMacSnowLeopard },
   { "lion", GPUTestConfig::kOsMacLion },
+  { "mountainlion", GPUTestConfig::kOsMacMountainLion },
   { "mac", GPUTestConfig::kOsMac },
   { "linux", GPUTestConfig::kOsLinux },
   { "chromeos", GPUTestConfig::kOsChromeOS },
@@ -230,10 +234,12 @@ bool GPUTestExpectationsParser::ParseConfig(
       case kConfigWinXP:
       case kConfigWinVista:
       case kConfigWin7:
+      case kConfigWin8:
       case kConfigWin:
       case kConfigMacLeopard:
       case kConfigMacSnowLeopard:
       case kConfigMacLion:
+      case kConfigMacMountainLion:
       case kConfigMac:
       case kConfigLinux:
       case kConfigChromeOS:
@@ -278,10 +284,12 @@ bool GPUTestExpectationsParser::ParseLine(
       case kConfigWinXP:
       case kConfigWinVista:
       case kConfigWin7:
+      case kConfigWin8:
       case kConfigWin:
       case kConfigMacLeopard:
       case kConfigMacSnowLeopard:
       case kConfigMacLion:
+      case kConfigMacMountainLion:
       case kConfigMac:
       case kConfigLinux:
       case kConfigChromeOS:
@@ -389,10 +397,12 @@ bool GPUTestExpectationsParser::UpdateTestConfig(
     case kConfigWinXP:
     case kConfigWinVista:
     case kConfigWin7:
+    case kConfigWin8:
     case kConfigWin:
     case kConfigMacLeopard:
     case kConfigMacSnowLeopard:
     case kConfigMacLion:
+    case kConfigMacMountainLion:
     case kConfigMac:
     case kConfigLinux:
     case kConfigChromeOS:
diff --git a/content/test/gpu/gpu_test_expectations_parser_unittest.cc b/content/test/gpu/gpu_test_expectations_parser_unittest.cc
index cee17b7..0651f24 100644
--- a/content/test/gpu/gpu_test_expectations_parser_unittest.cc
+++ b/content/test/gpu/gpu_test_expectations_parser_unittest.cc
@@ -89,7 +89,8 @@ TEST_F(GPUTestExpectationsParserTest, ValidUnrelatedTestEntry) {
 
 TEST_F(GPUTestExpectationsParserTest, AllModifiers) {
   const std::string text =
-      "BUG12345 XP VISTA WIN7 LEOPARD SNOWLEOPARD LION LINUX CHROMEOS ANDROID "
+      "BUG12345 XP VISTA WIN7 WIN8 LEOPARD SNOWLEOPARD LION MOUNTAINLION "
+      "LINUX CHROMEOS ANDROID "
       "NVIDIA INTEL AMD VMWARE RELEASE DEBUG : MyTest = "
       "PASS FAIL FLAKY TIMEOUT SKIP";