Add support for android in gpu test expections parser

content/test/gpu/gpu_test_expectations_parser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/test/gpu/gpu_test_expectations_parser.h"
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 19 matching lines @@
   kConfigWinXP = 0,
   kConfigWinVista,
   kConfigWin7,
   kConfigWin,
   kConfigMacLeopard,
   kConfigMacSnowLeopard,
   kConfigMacLion,
   kConfigMac,
   kConfigLinux,
   kConfigChromeOS,
+  kConfigAndroid,
   // gpu vendor
   kConfigNVidia,
   kConfigAMD,
   kConfigIntel,
   kConfigVMWare,
   // build type
   kConfigRelease,
   kConfigDebug,
   // expectation
   kExpectationPass,
@@ skipping 22 matching lines @@
   { "xp", GPUTestConfig::kOsWinXP },
   { "vista", GPUTestConfig::kOsWinVista },
   { "win7", GPUTestConfig::kOsWin7 },
   { "win", GPUTestConfig::kOsWin },
   { "leopard", GPUTestConfig::kOsMacLeopard },
   { "snowleopard", GPUTestConfig::kOsMacSnowLeopard },
   { "lion", GPUTestConfig::kOsMacLion },
   { "mac", GPUTestConfig::kOsMac },
   { "linux", GPUTestConfig::kOsLinux },
   { "chromeos", GPUTestConfig::kOsChromeOS },
+  { "android", GPUTestConfig::kOsAndroid },
   { "nvidia", 0x10DE },
   { "amd", 0x1002 },
   { "intel", 0x8086 },
   { "vmware", 0x15ad },
   { "release", GPUTestConfig::kBuildTypeRelease },
   { "debug", GPUTestConfig::kBuildTypeDebug },
   { "pass", GPUTestExpectationsParser::kGpuTestPass },
   { "fail", GPUTestExpectationsParser::kGpuTestFail },
   { "flaky", GPUTestExpectationsParser::kGpuTestFlaky },
   { "timeout", GPUTestExpectationsParser::kGpuTestTimeout },
@@ skipping 135 matching lines @@
       case kConfigWinXP:
       case kConfigWinVista:
       case kConfigWin7:
       case kConfigWin:
       case kConfigMacLeopard:
       case kConfigMacSnowLeopard:
       case kConfigMacLion:
       case kConfigMac:
       case kConfigLinux:
       case kConfigChromeOS:
+      case kConfigAndroid:
       case kConfigNVidia:
       case kConfigAMD:
       case kConfigIntel:
       case kConfigVMWare:
       case kConfigRelease:
       case kConfigDebug:
       case kConfigGPUDeviceID:
         if (token == kConfigGPUDeviceID) {
           if (!UpdateTestConfig(config, tokens[i], 0))
             return false;
@@ skipping 27 matching lines @@
       case kConfigWinXP:
       case kConfigWinVista:
       case kConfigWin7:
       case kConfigWin:
       case kConfigMacLeopard:
       case kConfigMacSnowLeopard:
       case kConfigMacLion:
       case kConfigMac:
       case kConfigLinux:
       case kConfigChromeOS:
+      case kConfigAndroid:
       case kConfigNVidia:
       case kConfigAMD:
       case kConfigIntel:
       case kConfigVMWare:
       case kConfigRelease:
       case kConfigDebug:
       case kConfigGPUDeviceID:
         // MODIFIERS, could be in any order, need at least one.
         if (stage != kLineParserConfigs && stage != kLineParserBugID) {
           PushErrorMessage(kErrorMessage[kErrorIllegalEntry],
@@ skipping 90 matching lines @@
     case kConfigWinXP:
     case kConfigWinVista:
     case kConfigWin7:
     case kConfigWin:
     case kConfigMacLeopard:
     case kConfigMacSnowLeopard:
     case kConfigMacLion:
     case kConfigMac:
     case kConfigLinux:
     case kConfigChromeOS:
+    case kConfigAndroid:
       if ((config->os() & kTokenData[token].flag) != 0) {
         PushErrorMessage(kErrorMessage[kErrorEntryWithOsConflicts],
                          line_number);
         return false;
       }
       config->set_os(config->os() | kTokenData[token].flag);
       break;
     case kConfigNVidia:
     case kConfigAMD:
     case kConfigIntel:
@@ skipping 104 matching lines @@
       DCHECK(false);
   }
   return rt;
 }
 
 GPUTestExpectationsParser:: GPUTestExpectationEntry::GPUTestExpectationEntry()
     : test_expectation(0),
       line_number(0) {
 }