Improve GPU tests to fail when GPU drawing fails

chrome/test/gpu/gpu_feature_browsertest.cc

 // Copyright (c) 2011 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 "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/test/trace_event_analyzer.h"
 #include "base/version.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/tracing.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/gpu/gpu_blacklist.h"
 #include "content/browser/gpu/gpu_data_manager.h"
 #include "net/base/net_util.h"
 
 namespace {
 
+typedef uint32 GpuResultFlags;
+#define EXPECT_NO_GPU_PROCESS GpuResultFlags(0)
+#define EXPECT_GPU_PROCESS GpuResultFlags(1<<0)
+#define EXPECT_GPU_SWAP_BUFFERS GpuResultFlags(1<<1)
+
 class GpuFeatureTest : public InProcessBrowserTest {
  public:
   GpuFeatureTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) {
     // This enables DOM automation for tab contents.
     EnableDOMAutomation();
   }
 
   void SetupBlacklist(const std::string& json_blacklist) {
     scoped_ptr<Version> os_version(Version::GetVersionFromString("1.0"));
     GpuBlacklist* blacklist = new GpuBlacklist("1.0");
 
     ASSERT_TRUE(blacklist->LoadGpuBlacklist(
         json_blacklist, GpuBlacklist::kAllOs));
     GpuDataManager::GetInstance()->SetBuiltInGpuBlacklist(blacklist);
   }
 
-  void RunTest(const FilePath& url, bool expect_gpu_process) {
+  void RunTest(const FilePath& url, GpuResultFlags expectations) {
     using namespace trace_analyzer;
 
+    bool expect_gpu_process = (expectations & EXPECT_GPU_PROCESS);
+    bool expect_gpu_swap = (expectations & EXPECT_GPU_SWAP_BUFFERS);
+
     FilePath test_path;
     PathService::Get(chrome::DIR_TEST_DATA, &test_path);
     test_path = test_path.Append(FILE_PATH_LITERAL("gpu"));
     test_path = test_path.Append(url);
 
     ASSERT_TRUE(file_util::PathExists(test_path))
         << "Missing test file: " << test_path.value();
 
     ASSERT_TRUE(tracing::BeginTracing("test_gpu"));
 
     ui_test_utils::DOMMessageQueue message_queue;
     // Have to use a new tab for the blacklist to work.
     ui_test_utils::NavigateToURLWithDisposition(
         browser(), net::FilePathToFileURL(test_path), NEW_FOREGROUND_TAB,
         ui_test_utils::BROWSER_TEST_NONE);
     // Wait for message indicating the test has finished running.
     ASSERT_TRUE(message_queue.WaitForMessage(NULL));
 
     std::string json_events;
     ASSERT_TRUE(tracing::EndTracing(&json_events));
 
     scoped_ptr<TraceAnalyzer> analyzer(TraceAnalyzer::Create(json_events));
     EXPECT_EQ(expect_gpu_process, analyzer->FindOneEvent(
         Query(EVENT_NAME) == Query::String("GpuProcessLaunched")) != NULL);
+    if (expect_gpu_swap) {
+      EXPECT_TRUE(analyzer->FindOneEvent(
+          Query(EVENT_NAME) == Query::String("SwapBuffers")) != NULL);
+    }

[Zhenyao Mo, 2011/11/30 18:58:47]

This should match the previous line EXPECT_EQ style (or the previous one
matching this).

[jbates, 2011/11/30 20:21:52]

Done.

   }
 };
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, AcceleratedCompositingAllowed) {
   GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags();
   EXPECT_EQ(flags.flags(), 0u);
 
-  const bool expect_gpu_process = true;
   const FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
-  RunTest(url, expect_gpu_process);
+  RunTest(url, EXPECT_GPU_PROCESS | EXPECT_GPU_SWAP_BUFFERS);
 }
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, AcceleratedCompositingBlocked) {
   const std::string json_blacklist =
       "{\n"
       "  \"name\": \"gpu blacklist\",\n"
       "  \"version\": \"1.0\",\n"
       "  \"entries\": [\n"
       "    {\n"
       "      \"id\": 1,\n"
       "      \"blacklist\": [\n"
       "        \"accelerated_compositing\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
   SetupBlacklist(json_blacklist);
   GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags();
   EXPECT_EQ(
       flags.flags(),
       static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAcceleratedCompositing));
 
-  const bool expect_gpu_process = false;
   const FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
-  RunTest(url, expect_gpu_process);
+  RunTest(url, EXPECT_NO_GPU_PROCESS);
 }
 
-#if defined(OS_LINUX)
-// http://crbug.com/104142
-#define MAYBE_WebGLAllowed DISABLED_WebGLAllowed
-#else
-#define MAYBE_WebGLAllowed WebGLAllowed
-#endif

[jbates, 2011/11/30 02:24:35]

Let's see if this works now...

-IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_WebGLAllowed) {
+IN_PROC_BROWSER_TEST_F(GpuFeatureTest, FLAKY_WebGLAllowed) {
   GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags();
   EXPECT_EQ(flags.flags(), 0u);
 
-  const bool expect_gpu_process = true;
   const FilePath url(FILE_PATH_LITERAL("feature_webgl.html"));
-  RunTest(url, expect_gpu_process);
+  RunTest(url, EXPECT_GPU_PROCESS | EXPECT_GPU_SWAP_BUFFERS);
 }
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) {
   const std::string json_blacklist =
       "{\n"
       "  \"name\": \"gpu blacklist\",\n"
       "  \"version\": \"1.0\",\n"
       "  \"entries\": [\n"
       "    {\n"
       "      \"id\": 1,\n"
       "      \"blacklist\": [\n"
       "        \"webgl\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
   SetupBlacklist(json_blacklist);
   GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags();
   EXPECT_EQ(
       flags.flags(),
       static_cast<uint32>(GpuFeatureFlags::kGpuFeatureWebgl));
 
-  const bool expect_gpu_process = false;
   const FilePath url(FILE_PATH_LITERAL("feature_webgl.html"));
-  RunTest(url, expect_gpu_process);
+  RunTest(url, EXPECT_NO_GPU_PROCESS);
 }
 
 #if defined(OS_LINUX)
 // http://crbug.com/104142
 #define Canvas2DAllowed FLAKY_Canvas2DAllowed
 #endif
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DAllowed) {
   GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags();
   EXPECT_EQ(flags.flags(), 0u);
 
 #if defined(OS_MACOSX)
   // TODO(zmo): enabling Mac when skia backend is enabled.
-  const bool expect_gpu_process = false;
+  const GpuResultFlags expectations = EXPECT_NO_GPU_PROCESS;
 #else
-  const bool expect_gpu_process = true;
+  const GpuResultFlags expectations = EXPECT_GPU_PROCESS |
+                                      EXPECT_GPU_SWAP_BUFFERS;
 #endif
   const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
-  RunTest(url, expect_gpu_process);
+  RunTest(url, expectations);
 }
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DBlocked) {
   const std::string json_blacklist =
       "{\n"
       "  \"name\": \"gpu blacklist\",\n"
       "  \"version\": \"1.0\",\n"
       "  \"entries\": [\n"
       "    {\n"
       "      \"id\": 1,\n"
       "      \"blacklist\": [\n"
       "        \"accelerated_2d_canvas\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
   SetupBlacklist(json_blacklist);
   GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags();
   EXPECT_EQ(
       flags.flags(),
       static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas));
 
-  const bool expect_gpu_process = false;
   const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
-  RunTest(url, expect_gpu_process);
+  RunTest(url, EXPECT_NO_GPU_PROCESS);
 }
 
 }  // namespace anonymous