Skip to content

GitLab

T
tangled
Commit c9c93b5a authored by sugoi's avatar sugoi Committed by Commit bot
Browse files
Options

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}
parent ff1de2a1
Hide whitespace changes
Inline Side-by-side
Showing with 597 additions and 1 deletion
DEPS
View file @ c9c93b5a
......@@ -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
View file @ c9c93b5a
......@@ -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
View file @ c9c93b5a
......@@ -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 0 → 100644
View file @ c9c93b5a
// 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/chromium.gpu.fyi.json
View file @ c9c93b5a
......@@ -2185,6 +2185,19 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:1912",
"os": "Linux"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -2539,6 +2552,19 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:104a",
"os": "Linux"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -2893,6 +2919,19 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0412",
"os": "Linux"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -3260,6 +3299,19 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6779",
"os": "Linux"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -3653,6 +3705,19 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6613",
"os": "Linux"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -4046,6 +4111,19 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:041a",
"os": "Linux"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -4439,6 +4517,19 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:1912",
"os": "Linux"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -4858,6 +4949,19 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:0f02",
"os": "Linux"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -5296,6 +5400,19 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:104a",
"os": "Linux"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"override_compile_targets": [
"tab_capture_end2end_tests_run"
......@@ -5746,6 +5863,19 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0412",
"os": "Linux"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -6152,6 +6282,19 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:679e",
"os": "Mac-10.10"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -6483,6 +6626,19 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -6827,6 +6983,19 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:679e",
"os": "Mac-10.10"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -7185,6 +7354,19 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"override_compile_targets": [
"tab_capture_end2end_tests_run"
......@@ -7563,6 +7745,20 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -7910,6 +8106,20 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"override_compile_targets": [
"tab_capture_end2end_tests_run"
......@@ -8312,6 +8522,20 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -8710,6 +8934,24 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12"
},
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"override_compile_targets": [
"tab_capture_end2end_tests_run"
......@@ -9143,6 +9385,20 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:0fe9",
"hidpi": "1",
"os": "Mac"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -9490,6 +9746,20 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:0fe9",
"hidpi": "1",
"os": "Mac"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"override_compile_targets": [
"tab_capture_end2end_tests_run"
......@@ -9827,6 +10097,19 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:104a",
"os": "Linux"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -9931,6 +10214,19 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -9998,6 +10294,20 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -10066,6 +10376,20 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:0fe9",
"hidpi": "1",
"os": "Mac"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -10188,6 +10512,19 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6613",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -10371,6 +10708,19 @@
},
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:104a",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
}
],
"isolated_scripts": [
......@@ -10624,6 +10974,19 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:1912",
"os": "Windows-10"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"args": [
"--use-test-data-path"
......@@ -11077,6 +11440,19 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:104a",
"os": "Windows-10"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"args": [
"--use-test-data-path"
......@@ -11530,6 +11906,19 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0412",
"os": "Windows-10"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"args": [
"--use-test-data-path"
......@@ -11996,6 +12385,19 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:1912",
"os": "Windows-10"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"args": [
"--use-test-data-path"
......@@ -12475,6 +12877,19 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:104a",
"os": "Windows-10"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"override_compile_targets": [
"tab_capture_end2end_tests_run"
......@@ -12983,6 +13398,19 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0412",
"os": "Windows-10"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"args": [
"--use-test-data-path"
......@@ -13462,6 +13890,19 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6613",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"args": [
"--use-test-data-path"
......@@ -13892,6 +14333,19 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:104a",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"args": [
"--use-test-data-path"
......@@ -14341,6 +14795,19 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6779",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"args": [
"--use-test-data-path"
......@@ -14835,6 +15302,19 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6613",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"override_compile_targets": [
"tab_capture_end2end_tests_run"
......@@ -15320,6 +15800,19 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:041a",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"args": [
"--use-test-data-path"
......@@ -15789,6 +16282,19 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:0f02",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"args": [
"--use-test-data-path"
......@@ -16360,6 +16866,19 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:104a",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"override_compile_targets": [
"tab_capture_end2end_tests_run"
......@@ -16871,6 +17390,19 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:104a",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"args": [
"--use-test-data-path"
......@@ -17359,6 +17891,19 @@
"test": "gles2_conform_test",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:104a",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "swiftshader_unittests",
"use_xvfb": false
},
{
"override_compile_targets": [
"tab_capture_end2end_tests_run"
......
testing/buildbot/gn_isolate_map.pyl
View file @ c9c93b5a
......@@ -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",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment