Run future autogenerated unittests.

The autogenerated service side tests are sharded out. New extensions
were added and those tests spilled over into a new shard 4.  However,
there was no driver for the 4th shard and these tests were never run.

This CL does 2 things:

(1) adds a simple driver so that any new autogen tests in the 4th shard
will be run

(2) disables the service side tests for the CHROMIUM extensions

Bug: none
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Ibb3fbb89a6fd648804559d3c7be2cb946db7f4ba
Reviewed-on: https://chromium-review.googlesource.com/886648
Commit-Queue: Jonathan Backer <backer@chromium.org>
Reviewed-by: Antoine Labour <piman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#531957}

gpu/BUILD.gn

@@ -313,6 +313,8 @@ test("gpu_unittests") {
     "command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h",
     "command_buffer/service/gles2_cmd_decoder_unittest_3.cc",
     "command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h",
+    "command_buffer/service/gles2_cmd_decoder_unittest_4.cc",
+    "command_buffer/service/gles2_cmd_decoder_unittest_4_autogen.h",
     "command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc",
     "command_buffer/service/gles2_cmd_decoder_unittest_base.cc",
     "command_buffer/service/gles2_cmd_decoder_unittest_base.h",

gpu/command_buffer/build_gles2_cmd_buffer.py

@@ -3581,6 +3581,7 @@ _FUNCTION_INFO = {
     'decoder_func': 'DoSwapBuffersWithBoundsCHROMIUM',
     'impl_func': False,
     'client_test': False,
+    'unit_test': False,
     'extension': True,
   },
   'SwapInterval': {
@@ -4489,10 +4490,12 @@ _FUNCTION_INFO = {
   },
   'SetDrawRectangleCHROMIUM': {
     'decoder_func': 'DoSetDrawRectangleCHROMIUM',
+    'unit_test': False,
     'extension': 'CHROMIUM_set_draw_rectangle',
   },
   'SetEnableDCLayersCHROMIUM': {
     'decoder_func': 'DoSetEnableDCLayersCHROMIUM',
+    'unit_test': False,
     'extension': 'CHROMIUM_dc_layers',
   },
   'InitializeDiscardableTextureCHROMIUM': {
@@ -4555,6 +4558,7 @@ _FUNCTION_INFO = {
     'internal': True,
     'impl_func': True,
     'client_test': False,
+    'unit_test': False,
     'extension': True,
   },
   'DeleteTransferCacheEntryINTERNAL': {
@@ -4563,6 +4567,7 @@ _FUNCTION_INFO = {
     'internal': True,
     'impl_func': True,
     'client_test': False,
+    'unit_test': False,
     'extension': True,
   },
   'UnlockTransferCacheEntryINTERNAL': {
@@ -4571,6 +4576,7 @@ _FUNCTION_INFO = {
     'internal': True,
     'impl_func': True,
     'client_test': False,
+    'unit_test': False,
     'extension': True,
   },
   'TexStorage2DImageCHROMIUM': {

gpu/command_buffer/service/gles2_cmd_decoder_unittest_4.cc

+// Copyright 2018 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/command_buffer/service/gles2_cmd_decoder.h"
+
+#include <stdint.h>
+
+#include "base/command_line.h"
+#include "gpu/command_buffer/common/gles2_cmd_format.h"
+#include "gpu/command_buffer/common/gles2_cmd_utils.h"
+#include "gpu/command_buffer/service/context_group.h"
+#include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
+#include "gpu/command_buffer/service/program_manager.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_mock.h"
+
+using ::gl::MockGLInterface;
+using ::testing::_;
+using ::testing::DoAll;
+using ::testing::InSequence;
+using ::testing::MatcherCast;
+using ::testing::Pointee;
+using ::testing::Return;
+using ::testing::SetArrayArgument;
+using ::testing::SetArgPointee;
+using ::testing::StrEq;
+
+namespace gpu {
+namespace gles2 {
+
+using namespace cmds;
+
+class GLES2DecoderTest4 : public GLES2DecoderTestBase {
+ public:
+  GLES2DecoderTest4() = default;
+};
+
+class GLES3DecoderTest4 : public GLES2DecoderTest4 {
+ public:
+  GLES3DecoderTest4() { shader_language_version_ = 300; }
+
+ protected:
+  void SetUp() override {
+    InitState init;
+    init.gl_version = "OpenGL ES 3.0";
+    init.bind_generates_resource = true;
+    init.context_type = CONTEXT_TYPE_OPENGLES3;
+    InitDecoder(init);
+  }
+};
+
+INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderTest4, ::testing::Bool());
+INSTANTIATE_TEST_CASE_P(Service, GLES3DecoderTest4, ::testing::Bool());
+
+#include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_4_autogen.h"
+
+}  // namespace gles2
+}  // namespace gpu

gpu/command_buffer/service/gles2_cmd_decoder_unittest_4_autogen.h

@@ -12,61 +12,4 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_4_AUTOGEN_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_4_AUTOGEN_H_
 
-TEST_P(GLES2DecoderTest4, SwapBuffersWithBoundsCHROMIUMImmediateValidArgs) {
-  cmds::SwapBuffersWithBoundsCHROMIUMImmediate& cmd =
-      *GetImmediateAs<cmds::SwapBuffersWithBoundsCHROMIUMImmediate>();
-  SpecializedSetup<cmds::SwapBuffersWithBoundsCHROMIUMImmediate, 0>(true);
-  GLint temp[4 * 2] = {
-      0,
-  };
-  EXPECT_CALL(*gl_, SwapBuffersWithBoundsCHROMIUM(1, PointsToArray(temp, 4)));
-  cmd.Init(1, &temp[0]);
-  EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp)));
-  EXPECT_EQ(GL_NO_ERROR, GetGLError());
-}
-
-TEST_P(GLES2DecoderTest4, SetDrawRectangleCHROMIUMValidArgs) {
-  EXPECT_CALL(*gl_, SetDrawRectangleCHROMIUM(1, 2, 3, 4));
-  SpecializedSetup<cmds::SetDrawRectangleCHROMIUM, 0>(true);
-  cmds::SetDrawRectangleCHROMIUM cmd;
-  cmd.Init(1, 2, 3, 4);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  EXPECT_EQ(GL_NO_ERROR, GetGLError());
-}
-
-TEST_P(GLES2DecoderTest4, SetEnableDCLayersCHROMIUMValidArgs) {
-  EXPECT_CALL(*gl_, SetEnableDCLayersCHROMIUM(true));
-  SpecializedSetup<cmds::SetEnableDCLayersCHROMIUM, 0>(true);
-  cmds::SetEnableDCLayersCHROMIUM cmd;
-  cmd.Init(true);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  EXPECT_EQ(GL_NO_ERROR, GetGLError());
-}
-
-TEST_P(GLES2DecoderTest4, CreateTransferCacheEntryINTERNALValidArgs) {
-  EXPECT_CALL(*gl_, CreateTransferCacheEntryINTERNAL(1, 2, 3, 4, 5, 6, 7));
-  SpecializedSetup<cmds::CreateTransferCacheEntryINTERNAL, 0>(true);
-  cmds::CreateTransferCacheEntryINTERNAL cmd;
-  cmd.Init(1, 2, 3, 4, 5, 6, 7);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  EXPECT_EQ(GL_NO_ERROR, GetGLError());
-}
-
-TEST_P(GLES2DecoderTest4, DeleteTransferCacheEntryINTERNALValidArgs) {
-  EXPECT_CALL(*gl_, DeleteTransferCacheEntryINTERNAL(1, 2));
-  SpecializedSetup<cmds::DeleteTransferCacheEntryINTERNAL, 0>(true);
-  cmds::DeleteTransferCacheEntryINTERNAL cmd;
-  cmd.Init(1, 2);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  EXPECT_EQ(GL_NO_ERROR, GetGLError());
-}
-
-TEST_P(GLES2DecoderTest4, UnlockTransferCacheEntryINTERNALValidArgs) {
-  EXPECT_CALL(*gl_, UnlockTransferCacheEntryINTERNAL(1, 2));
-  SpecializedSetup<cmds::UnlockTransferCacheEntryINTERNAL, 0>(true);
-  cmds::UnlockTransferCacheEntryINTERNAL cmd;
-  cmd.Init(1, 2);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  EXPECT_EQ(GL_NO_ERROR, GetGLError());
-}
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_4_AUTOGEN_H_