diff options
| author | kbr <kbr@chromium.org> | 2016-01-12 19:39:25 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-13 03:41:00 +0000 |
| commit | 35e248abf1fa696021f1e764b15a1a4b13869da1 (patch) | |
| tree | 569fda37507d6a9546d3c32a146c779dc109ba68 /gpu/gles2_conform_support | |
| parent | 1aab4b748508ba1dbe7c6dcf9274b1ab3bbbb080 (diff) | |
| download | chromium_src-35e248abf1fa696021f1e764b15a1a4b13869da1.zip chromium_src-35e248abf1fa696021f1e764b15a1a4b13869da1.tar.gz chromium_src-35e248abf1fa696021f1e764b15a1a4b13869da1.tar.bz2 | |
Deploy angle_end2end_tests and gles2_conform_test more broadly.
Deploy angle_end2end_tests on Linux Release, and on the Windows Release
bot where it was accidentally missed. The D3D9 and GL variants on
Windows will follow once this is working.
Fix the gles2_conform_test isolate in the GN build, and deploy it on the
Linux and Windows bots.
BUG=542370, 573378
TBR=piman@chromium.org,phajdan.jr@chromium.org,jmadill@chromium.org
Review URL: https://codereview.chromium.org/1582633003
Cr-Commit-Position: refs/heads/master@{#369087}
Diffstat (limited to 'gpu/gles2_conform_support')
| -rw-r--r-- | gpu/gles2_conform_support/BUILD.gn | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gpu/gles2_conform_support/BUILD.gn b/gpu/gles2_conform_support/BUILD.gn index 4d1e26c2..cf6114f 100644 --- a/gpu/gles2_conform_support/BUILD.gn +++ b/gpu/gles2_conform_support/BUILD.gn @@ -200,11 +200,12 @@ test("gles2_conform_test") { ] if (internal_gles2_conform_tests) { - deps += [ - ":generate_gles2_conform_tests", + data_deps = [ ":gles2_conform_test_windowless", ] + deps += [ ":generate_gles2_conform_tests" ] sources += [ "$target_gen_dir/gles2_conform_test_autogen.cc" ] + data += [ "//third_party/gles2_conform/GTF_ES/" ] # TODO: Make these tests pull in the correct data dependencies once they # are exported in GN. Maybe from //third_party/gles2_conform/GTF_ES/ |