summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authordpranke <dpranke@chromium.org>2015-08-12 14:18:18 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-12 21:18:58 +0000
commitdbdd9d8a60cde386ab1ccab51bd2d818c5b45657 (patch)
treeb35e936d7aebc4dcdfef390e5fdeba83dd1d15db /gpu
parent47fa58e5f440daecb1e81ed407224042611bb562 (diff)
downloadchromium_src-dbdd9d8a60cde386ab1ccab51bd2d818c5b45657.zip
chromium_src-dbdd9d8a60cde386ab1ccab51bd2d818c5b45657.tar.gz
chromium_src-dbdd9d8a60cde386ab1ccab51bd2d818c5b45657.tar.bz2
Add various GPU isolates for GN.
This adds support for some of test binaries needed in the 'archive_gpu_tests=true' config of a GYP build: - content_gl_tests - gles2_conform_tests - gl_tests - tab_capture_end2end_tests There is still more work to be done (telemetry_gpu_tests, angle_end2end_tests, angle_deqp_*_tests). R=brettw@chromium.org BUG=519778 Review URL: https://codereview.chromium.org/1285063002 Cr-Commit-Position: refs/heads/master@{#343095}
Diffstat (limited to 'gpu')
-rw-r--r--gpu/BUILD.gn7
-rw-r--r--gpu/gles2_conform_support/BUILD.gn21
-rw-r--r--gpu/gpu.gyp2
3 files changed, 29 insertions, 1 deletions
diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn
index 865ae8b..1f7f5fe 100644
--- a/gpu/BUILD.gn
+++ b/gpu/BUILD.gn
@@ -69,6 +69,13 @@ source_set("test_support") {
]
}
+group("gl_tests_run") {
+ testonly = true
+ deps = [
+ ":gl_tests",
+ ]
+}
+
test("gl_tests") {
sources = [
"command_buffer/tests/compressed_texture_test.cc",
diff --git a/gpu/gles2_conform_support/BUILD.gn b/gpu/gles2_conform_support/BUILD.gn
index 1151443..a0874a7 100644
--- a/gpu/gles2_conform_support/BUILD.gn
+++ b/gpu/gles2_conform_support/BUILD.gn
@@ -2,6 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+declare_args() {
+ # Set to true to compile with the OpenGL ES 2.0 conformance tests.
+ internal_gles2_conform_tests = false
+}
+
import("//build/config/allocator.gni")
import("//testing/test.gni")
@@ -153,6 +158,15 @@ if (internal_gles2_conform_tests) {
}
}
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("gles2_conform_test_run") {
+ testonly = true
+ deps = [
+ ":gles2_conform_test",
+ ]
+}
+
test("gles2_conform_test") {
sources = [
"gles2_conform_test.cc",
@@ -162,7 +176,14 @@ test("gles2_conform_test") {
"//gpu/config",
"//testing/gtest",
]
+
+ data = [
+ "gles2_conform_test_expectations.txt",
+ ]
+
if (internal_gles2_conform_tests) {
deps += [ "gles2_conform_test_windowless" ]
+
+ data_deps = [ "//third_party/gles2_conform/GTF_ES/" ]
}
}
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index c32d64e..bffaf94 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -711,7 +711,7 @@
['OS == "win" or (OS == "linux" and use_x11==1)', {
'targets': [
{
- # TODO(kbr): port this target to the GN build.
+ # TODO(crbug.com/519834): port this target to the GN build.
'target_name': 'angle_end2end_tests',
'type': '<(gtest_target_type)',
'dependencies': [