Fix skip EXTMultisampleCompatibilityTest.DrawAlphaOneAndResolve

gpu/config/gpu_test_config.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 "gpu/config/gpu_test_config.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/logging.h"
@@ skipping 96 matching lines @@
 void GPUTestConfig::set_build_type(int32_t build_type) {
   DCHECK_EQ(0, build_type & ~(kBuildTypeRelease | kBuildTypeDebug));
   build_type_ = build_type;
 }
 
 void GPUTestConfig::set_api(int32_t api) {
   DCHECK_EQ(0, api & ~(kAPID3D9 | kAPID3D11 | kAPIGLDesktop | kAPIGLES));
   api_ = api;
 }
 
+void GPUTestConfig::set_machine_model_name(
+    const std::string& machine_model_name) {
+  machine_model_name_ = machine_model_name;
+}
+
 bool GPUTestConfig::IsValid() const {
   if (!validate_gpu_info_)
     return true;
   if (gpu_device_id_ != 0 && (gpu_vendor_.size() != 1 || gpu_vendor_[0] == 0))
     return false;
   return true;
 }
 
 bool GPUTestConfig::OverlapsWith(const GPUTestConfig& config) const {
   DCHECK(IsValid());
@@ skipping 14 matching lines @@
     if (!shared)
       return false;
   }
   if (config.gpu_device_id_ != 0 && gpu_device_id_ != 0 &&
       gpu_device_id_ != config.gpu_device_id_)
     return false;
   if (config.build_type_ != kBuildTypeUnknown &&
       build_type_ != kBuildTypeUnknown &&
       (build_type_ & config.build_type_) == 0)
     return false;
+  if (!config.machine_model_name_.empty() && !machine_model_name_.empty() &&
+      config.machine_model_name_ != machine_model_name_)

[Zhenyao Mo, 2017/03/11 18:29:16]

Can you add a unit test for this?

+    return false;
   return true;
 }
 
 void GPUTestConfig::DisableGPUInfoValidation() {
   validate_gpu_info_ = false;
 }
 
 void GPUTestConfig::ClearGPUVendor() {
   gpu_vendor_.clear();
 }
 
 GPUTestBotConfig::~GPUTestBotConfig() {
 }
 
 void GPUTestBotConfig::AddGPUVendor(uint32_t gpu_vendor) {
   DCHECK_EQ(0u, GPUTestConfig::gpu_vendor().size());
   GPUTestConfig::AddGPUVendor(gpu_vendor);
 }
 
 bool GPUTestBotConfig::SetGPUInfo(const GPUInfo& gpu_info) {
   DCHECK(validate_gpu_info_);
   if (gpu_info.gpu.device_id == 0 || gpu_info.gpu.vendor_id == 0)
     return false;
   ClearGPUVendor();
   AddGPUVendor(gpu_info.gpu.vendor_id);
   set_gpu_device_id(gpu_info.gpu.device_id);
+  set_machine_model_name(gpu_info.machine_model_name);
   return true;
 }
 
 bool GPUTestBotConfig::IsValid() const {
   switch (os()) {
     case kOsWinXP:
     case kOsWinVista:
     case kOsWin7:
     case kOsWin8:
     case kOsWin10:
@@ skipping 45 matching lines @@
       return false;
   }
   if (config.gpu_device_id() != 0 &&
       gpu_device_id() != config.gpu_device_id())
     return false;
   if (config.build_type() != kBuildTypeUnknown &&
       (build_type() & config.build_type()) == 0)
     return false;
   if (config.api() != 0 && (api() & config.api()) == 0)
     return false;
+  if (!config.machine_model_name().empty() &&

[Zhenyao Mo, 2017/03/11 18:29:16]

Can you add a unit test for this?

+      machine_model_name() != config.machine_model_name())
+    return false;
   return true;
 }
 
 bool GPUTestBotConfig::Matches(const std::string& config_data) const {
   GPUTestExpectationsParser parser;
   GPUTestConfig config;
 
   if (!parser.ParseConfig(config_data, &config))
     return false;
   return Matches(config);
@@ skipping 54 matching lines @@
   // Blacklist rule #79 disables all Gpu acceleration before Windows 7.
   if (base::win::GetVersion() <= base::win::VERSION_VISTA) {
     return true;
   }
 #endif
   return false;
 }
 
 }  // namespace gpu