Apply the bot config api based on the command line arguments.

gpu/gles2_conform_support/gles2_conform_test.cc

 // Copyright (c) 2013 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/gles2_conform_support/gles2_conform_test.h"
 
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
@@ skipping 26 matching lines @@
   gpu::GPUTestExpectationsParser test_expectations;
   if (!test_expectations.LoadTestExpectations(test_expectations_path)) {
     LOG(ERROR) << "Fail to load gles2_conform_test_expectations.txt";
     return false;
   }
   gpu::GPUTestBotConfig bot_config;
   if (!bot_config.LoadCurrentConfig(NULL)) {
     LOG(ERROR) << "Fail to load bot configuration";
     return false;
   }
+
+  // Set the bot config api based on the OS and command line
+  base::CommandLine* currentCmdLine = base::CommandLine::ForCurrentProcess();

[Zhenyao Mo, 2015/08/18 13:36:01]

current_cmd_line

[Geoff Lang, 2015/08/18 14:06:09]

Whoops, fixed.

+  int32 config_os = bot_config.os();
+  if ((config_os & gpu::GPUTestConfig::kOsWin) != 0) {
+    std::string angle_renderer =
+        currentCmdLine->HasSwitch("use-angle")
+            ? currentCmdLine->GetSwitchValueASCII("use-angle")
+            : "d3d11";
+    if (angle_renderer == "d3d11") {
+      bot_config.set_api(gpu::GPUTestConfig::kAPID3D11);
+    } else if (angle_renderer == "d3d9") {
+      bot_config.set_api(gpu::GPUTestConfig::kAPID3D9);
+    } else if (angle_renderer == "gl") {
+      bot_config.set_api(gpu::GPUTestConfig::kAPIGLDesktop);
+    } else if (angle_renderer == "gles") {
+      bot_config.set_api(gpu::GPUTestConfig::kAPIGLES);
+    } else {
+      bot_config.set_api(gpu::GPUTestConfig::kAPIUnknown);
+    }
+  } else if ((config_os & gpu::GPUTestConfig::kOsMac) != 0 ||
+             config_os == gpu::GPUTestConfig::kOsLinux) {
+    bot_config.set_api(gpu::GPUTestConfig::kAPIGLDesktop);
+  } else if (config_os == gpu::GPUTestConfig::kOsChromeOS ||
+             config_os == gpu::GPUTestConfig::kOsAndroid) {
+    bot_config.set_api(gpu::GPUTestConfig::kAPIGLES);
+  } else {
+    bot_config.set_api(gpu::GPUTestConfig::kAPIUnknown);
+  }
+
   if (!bot_config.IsValid()) {
     LOG(ERROR) << "Invalid bot configuration";
     return false;
   }
   std::string path_string(path);
   std::string test_name;
   base::ReplaceChars(path_string, "\\/.", "_", &test_name);
   int32 expectation =
     test_expectations.GetTestExpectation(test_name, bot_config);
   if (expectation != gpu::GPUTestExpectationsParser::kGpuTestPass) {
     LOG(WARNING) << "Test " << test_name << " is bypassed";
     return true;
   }
 
   base::FilePath test_path;
   PathService::Get(base::DIR_EXE, &test_path);
   base::FilePath program(test_path.Append(FILE_PATH_LITERAL(
       "gles2_conform_test_windowless")));
 
-  base::CommandLine* currentCmdLine = base::CommandLine::ForCurrentProcess();
   base::CommandLine cmdline(program);
   cmdline.AppendArguments(*currentCmdLine, false);
   cmdline.AppendSwitch(std::string("--"));
   cmdline.AppendArg(std::string("-run=") + path);
 
   std::string output;
   bool success = base::GetAppOutput(cmdline, &output);
   if (success) {
     size_t success_index = output.find("Conformance PASSED all");
     size_t failed_index = output.find("FAILED");
@@ skipping 11 matching lines @@
   base::CommandLine::Init(argc, argv);
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool pool;
 #endif
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }