Commit d312f223 authored by Sunny Sachanandani's avatar Sunny Sachanandani Committed by Commit Bot

gpu: Merge gpu_ipc_service_unittests into gpu_unittests

These were separate initially because they depended on content. Since
that's not the case any more, it makes sense to merge these into the
main gpu_unittests.

R=piman,kbr
BUG=NONE

Cq-Include-Trybots: luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Ic9a4894f7e2287055571e60597442f585fa3cbb3
Reviewed-on: https://chromium-review.googlesource.com/976983Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Reviewed-by: default avatarAntoine Labour <piman@chromium.org>
Commit-Queue: Sunny Sachanandani <sunnyps@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545982}
parent da0138b3
......@@ -156,7 +156,6 @@ group("gn_all") {
"//content/test:content_perftests",
"//content/test:content_unittests",
"//gpu:gpu_unittests",
"//gpu/ipc/service:gpu_ipc_service_unittests",
"//ipc:ipc_tests",
"//media:media_unittests",
"//media/midi:midi_unittests",
......
......@@ -1015,7 +1015,6 @@ V8_FYI_WATERFALL = {
"gfx_unittests",
"gn_unittests",
"google_apis_unittests",
"gpu_ipc_service_unittests",
"gpu_unittests",
"interactive_ui_tests",
"ipc_tests",
......
......@@ -150,6 +150,7 @@ static_library("test_support") {
"command_buffer/service/gles2_cmd_decoder_mock.h",
"command_buffer/service/raster_decoder_mock.cc",
"command_buffer/service/raster_decoder_mock.h",
"ipc/service/gpu_memory_buffer_factory_test_template.h",
]
public_deps = [
......@@ -159,9 +160,12 @@ static_library("test_support") {
]
deps = [
"//gpu/command_buffer/common",
"//gpu/ipc/common",
"//gpu/ipc/service",
"//testing/gmock",
"//testing/gtest",
"//ui/gl:gl_unittest_utils",
"//ui/gl:test_support",
]
}
......@@ -387,18 +391,32 @@ test("gpu_unittests") {
"ipc/common/gpu_preferences_util_unittest.cc",
"ipc/common/struct_traits_unittest.cc",
"ipc/host/shader_disk_cache_unittest.cc",
"ipc/service/gpu_channel_manager_unittest.cc",
"ipc/service/gpu_channel_test_common.cc",
"ipc/service/gpu_channel_test_common.h",
"ipc/service/gpu_channel_unittest.cc",
]
if (is_mac) {
sources += [ "ipc/common/gpu_memory_buffer_impl_io_surface_unittest.cc" ]
sources += [
"ipc/common/gpu_memory_buffer_impl_io_surface_unittest.cc",
"ipc/service/gpu_memory_buffer_factory_io_surface_unittest.cc",
]
}
if (is_linux) {
sources += [ "ipc/common/gpu_memory_buffer_impl_native_pixmap_unittest.cc" ]
sources += [
"ipc/common/gpu_memory_buffer_impl_native_pixmap_unittest.cc",
"ipc/service/gpu_memory_buffer_factory_native_pixmap_unittest.cc",
]
}
if (is_win) {
sources += [ "ipc/common/gpu_memory_buffer_impl_dxgi_unittest.cc" ]
sources += [
"ipc/common/gpu_memory_buffer_impl_dxgi_unittest.cc",
"ipc/service/gpu_memory_buffer_factory_dxgi_unittest.cc",
"ipc/service/gpu_vsync_provider_unittest_win.cc",
]
}
if (is_android) {
......@@ -436,25 +454,32 @@ test("gpu_unittests") {
"//gpu/command_buffer/client:gles2_c_lib",
"//gpu/command_buffer/client:gles2_implementation",
"//gpu/command_buffer/client:raster",
"//gpu/command_buffer/common",
"//gpu/command_buffer/common:gles2_utils",
"//gpu/command_buffer/service",
"//gpu/ipc:gl_in_process_context",
"//gpu/ipc/client",
"//gpu/ipc/common",
"//gpu/ipc/common:gpu_preferences_util",
"//gpu/ipc/common:test_interfaces",
"//gpu/ipc/host",
"//gpu/ipc/service",
"//ipc:test_support",
"//mojo/edk",
"//mojo/public/cpp/bindings",
"//net:test_support",
"//skia",
"//testing/gmock",
"//testing/gtest",
"//third_party/angle:translator",
"//third_party/mesa:mesa_headers",
"//ui/gfx",
"//ui/gfx:test_support",
"//ui/gfx/geometry",
"//ui/gl",
"//ui/gl:gl_unittest_utils",
"//ui/gl:test_support",
"//url",
]
if (is_android) {
......
......@@ -152,50 +152,3 @@ source_set("test_support") {
"//ui/gl:test_support",
]
}
test("gpu_ipc_service_unittests") {
configs += [ "//build/config:precompiled_headers" ]
sources = [
"gpu_channel_manager_unittest.cc",
"gpu_channel_test_common.cc",
"gpu_channel_test_common.h",
"gpu_channel_unittest.cc",
"gpu_vsync_provider_unittest_win.cc",
]
deps = [
":service",
":test_support",
"//base",
"//base/test:test_support",
"//gpu/command_buffer/common",
"//gpu/command_buffer/service",
"//gpu/config",
"//gpu/ipc/common",
"//ipc:run_all_unittests",
"//ipc:test_support",
"//skia",
"//testing/gmock",
"//testing/gtest",
"//third_party/mesa:mesa_headers",
"//ui/gfx:test_support",
"//ui/gl:gl_unittest_utils",
"//ui/gl:test_support",
"//url",
]
libs = []
if (is_android) {
deps += [ "//ui/android:ui_java" ]
}
if (is_mac) {
sources += [ "gpu_memory_buffer_factory_io_surface_unittest.cc" ]
}
if (is_linux) {
sources += [ "gpu_memory_buffer_factory_native_pixmap_unittest.cc" ]
}
if (is_win) {
sources += [ "gpu_memory_buffer_factory_dxgi_unittest.cc" ]
}
if (use_ozone) {
deps += [ "//ui/ozone" ]
}
}
......@@ -695,12 +695,6 @@
},
"test": "gl_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
......@@ -878,12 +872,6 @@
},
"test": "gl_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
......@@ -1413,32 +1401,6 @@
},
"test": "gl_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"gpu_ipc_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_os": "LMY47W",
"device_type": "sprout"
}
],
"expiration": 14400
},
"test": "gpu_ipc_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
......@@ -2620,50 +2582,6 @@
},
"test": "gl_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"gpu_ipc_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "NRD91N",
"device_type": "bullhead"
}
],
"expiration": 10800,
"hard_timeout": 960,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "gpu_ipc_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
......@@ -3462,12 +3380,6 @@
},
"test": "gl_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
......@@ -3656,12 +3568,6 @@
},
"test": "gl_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
......@@ -4337,30 +4243,6 @@
},
"test": "google_apis_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"gpu_ipc_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "coho"
}
]
},
"test": "gpu_ipc_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
......@@ -5277,30 +5159,6 @@
},
"test": "gl_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"gpu_ipc_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "gce_x86"
}
]
},
"test": "gpu_ipc_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
......
This diff is collapsed.
......@@ -178,12 +178,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -576,12 +570,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -1096,12 +1084,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......
This diff is collapsed.
......@@ -515,12 +515,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -898,12 +892,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -1261,12 +1249,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
......@@ -1657,12 +1639,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
......@@ -2007,12 +1983,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -2454,12 +2424,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -2822,12 +2786,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -3088,12 +3046,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -3347,12 +3299,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -4767,17 +4713,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
]
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true,
......@@ -6361,17 +6296,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "coho"
}
]
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true,
......@@ -6766,12 +6690,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -7147,12 +7065,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -7488,12 +7400,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -8092,12 +7998,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
......@@ -8875,12 +8775,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -9170,12 +9064,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......
......@@ -106,12 +106,6 @@
},
"test": "crypto_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -321,12 +315,6 @@
},
"test": "crypto_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -976,12 +964,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -1775,12 +1757,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......
......@@ -177,12 +177,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -644,12 +638,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -1087,12 +1075,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -1555,12 +1537,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -2011,12 +1987,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......
......@@ -281,18 +281,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_type": "bullhead"
}
]
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true,
......@@ -815,16 +803,6 @@
},
"test": "google_apis_unittests"
},
{
"args": [
"--test-launcher-batch-limit=1",
"--test-launcher-print-test-stdio=always"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"args": [
"--test-launcher-batch-limit=1",
......@@ -1305,12 +1283,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -1682,12 +1654,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -2032,12 +1998,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -2350,12 +2310,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -2661,12 +2615,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -2915,12 +2863,6 @@
},
"test": "gcm_unit_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......
......@@ -237,12 +237,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -839,12 +833,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -1369,12 +1357,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -2035,12 +2017,6 @@
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -2616,12 +2592,6 @@
},
"test": "gn_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_ipc_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......
......@@ -1123,7 +1123,6 @@
"gfx_unittests",
"gn_unittests",
"google_apis_unittests",
"gpu_ipc_service_unittests",
"gpu_unittests",
"interactive_ui_tests",
"ipc_tests",
......
......@@ -587,10 +587,6 @@
"label": "//google_apis:google_apis_unittests",
"type": "console_test_launcher",
},
"gpu_ipc_service_unittests": {
"label": "//gpu/ipc/service:gpu_ipc_service_unittests",
"type": "windowed_test_launcher",
},
"gpu_unittests": {
"label": "//gpu:gpu_unittests",
"type": "windowed_test_launcher",
......
......@@ -1853,28 +1853,6 @@
'Win7 Tests (dbg)(1)',
],
},
'gpu_ipc_service_unittests': {
'remove_from': [
# chromium.clang
'CrWinClngLLD64dbg',
# chromium.fyi
'Win 10 Fast Ring',
# chromium.linux
'Linux Tests (dbg)(1)(32)',
],
'modifications': {
'KitKat Tablet Tester': {
'swarming': {
'hard_timeout': 120,
},
},
'Marshmallow Tablet Tester': {
'swarming': {
'hard_timeout': 120,
},
},
},
},
'headless_browsertests': {
'remove_from': [
'Linux Tests (dbg)(1)(32)',
......
......@@ -417,7 +417,6 @@
},
'crypto_unittests': {},
'google_apis_unittests': {},
'gpu_ipc_service_unittests': {},
'gpu_unittests': {
'android_swarming': {
'hard_timeout': 960,
......
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