Adding swiftshader unittests to GPU FYI bots

BUG=630728
CQ_INCLUDE_TRYBOTS=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;master.tryserver.chromium.android:android_optional_gpu_tests_rel

Review-Url: https://codereview.chromium.org/2618933002
Cr-Commit-Position: refs/heads/master@{#443248}

DEPS

@@ -60,7 +60,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
-  'swiftshader_revision': '3ea9295f5b2f4a1dfa022d58dc53299e02fbbea1',
+  'swiftshader_revision': '5615fd03603ea9059bcc21a338932cd322fcb4a3',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling PDFium
   # and whatever else without interference from each other.

content/test/gpu/generate_buildbot_json.py

@@ -1105,6 +1105,15 @@ COMMON_GTESTS = {
     ],
     'test': 'gles2_conform_test',
   },
+  'swiftshader_unittests': {
+    'tester_configs': [
+      {
+        'fyi_only': True,
+        # Run this on the optional tryservers.
+        'run_on_optional': True,
+      },
+    ],
+  },
   'tab_capture_end2end_tests': {
     'tester_configs': [
       {

gpu/DEPS

@@ -3,6 +3,7 @@ include_rules = [
   "+third_party/amd",
   "+third_party/re2",
   "+third_party/smhasher",
+  "+third_party/swiftshader",
   "+third_party/protbuf",
   "+crypto",
   "+ui/gfx",

gpu/swiftshader_tests_main.cc

+// Copyright 2017 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/at_exit.h"
+#include "base/bind.h"
+#include "base/command_line.h"
+#include "base/message_loop/message_loop.h"
+#include "base/test/launcher/unit_test_launcher.h"
+#include "base/test/test_suite.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/swiftshader/tests/unittests/SwiftShaderTest.h"
+
+namespace {
+
+int RunHelper(base::TestSuite* test_suite) {
+  base::MessageLoop message_loop;
+  return test_suite->Run();
+}
+
+}  // namespace
+
+int main(int argc, char** argv) {
+  base::CommandLine::Init(argc, argv);
+  testing::InitGoogleMock(&argc, argv);
+  testing::AddGlobalTestEnvironment(new SwiftShaderTestEnvironment());
+  base::TestSuite test_suite(argc, argv);
+  int rt = base::LaunchUnitTestsWithOptions(
+      argc, argv,
+      1,     // Run tests serially.
+      0,     // Disable batching.
+      true,  // Use job objects.
+      base::Bind(&RunHelper, base::Unretained(&test_suite)));
+  return rt;
+}

testing/buildbot/gn_isolate_map.pyl

@@ -774,6 +774,11 @@
     "label": "//storage/browser:storage_unittests",
     "type": "console_test_launcher",
   },
+  "swiftshader_unittests": {
+    "label": "//third_party/swiftshader/tests/unittests:swiftshader_unittests",
+    "type": "raw",
+    "args": [],
+  },
   "sync_integration_tests": {
     "label": "//chrome/test:sync_integration_tests",
     "type": "windowed_test_launcher",