Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(245)

Unified Diff: gpu/config/gpu_test_config.cc

Issue 299113003: Add win8.1 support to GPUBotConfig (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/config/gpu_info_collector_x11.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/config/gpu_test_config.cc
diff --git a/gpu/config/gpu_test_config.cc b/gpu/config/gpu_test_config.cc
index 944a3e20637396639cacaa60647ec703bfc94e44..e3d489c25fa656bfdedfcdd7dc89309924743b0c 100644
--- a/gpu/config/gpu_test_config.cc
+++ b/gpu/config/gpu_test_config.cc
@@ -37,7 +37,7 @@ GPUTestConfig::OS GetCurrentOS() {
return GPUTestConfig::kOsWinVista;
if (major_version == 6 && minor_version == 1)
return GPUTestConfig::kOsWin7;
- if (major_version == 6 && minor_version == 2)
+ if (major_version == 6 && (minor_version == 2 || minor_version == 3))
return GPUTestConfig::kOsWin8;
Ken Russell (switch to Gerrit) 2014/05/23 02:37:58 We might need to add a win81 or win8_1 configurati
#elif defined(OS_MACOSX)
int32 major_version = 0;
@@ -237,6 +237,7 @@ bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo* gpu_info) {
result = CollectGpuID(&my_gpu_info.gpu.vendor_id,
&my_gpu_info.gpu.device_id);
if (result == kGpuIDNotSupported) {
+ LOG(ERROR) << "Fail to identify GPU";
DisableGPUInfoValidation();
rt = true;
} else {
@@ -246,8 +247,10 @@ bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo* gpu_info) {
rt = SetGPUInfo(*gpu_info);
}
set_os(GetCurrentOS());
- if (os() == kOsUnknown)
+ if (os() == kOsUnknown) {
+ LOG(ERROR) << "Unknown OS";
rt = false;
+ }
#if defined(NDEBUG)
set_build_type(kBuildTypeRelease);
#else
« no previous file with comments | « gpu/config/gpu_info_collector_x11.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698