diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 18:10:22 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 18:10:22 +0000 |
| commit | 5904806bfc6c3ab2497500f764ed3927c8af7c5a (patch) | |
| tree | 9a465fec4034bd42cc68f0a611eaeed99e4455b4 /gpu/gpu_common.gypi | |
| parent | f2c33c65320e1ec409184c8469ace54d9baaa499 (diff) | |
| download | chromium_src-5904806bfc6c3ab2497500f764ed3927c8af7c5a.zip chromium_src-5904806bfc6c3ab2497500f764ed3927c8af7c5a.tar.gz chromium_src-5904806bfc6c3ab2497500f764ed3927c8af7c5a.tar.bz2 | |
Make unit test to check glCopyTextureCHROMIUM works with deleted programs
TEST=unit tests
BUG=124720
Review URL: https://chromiumcodereview.appspot.com/10317034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu_common.gypi')
| -rw-r--r-- | gpu/gpu_common.gypi | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/gpu/gpu_common.gypi b/gpu/gpu_common.gypi index 2d13ec9..4d24613 100644 --- a/gpu/gpu_common.gypi +++ b/gpu/gpu_common.gypi @@ -196,28 +196,6 @@ ], }, { - 'target_name': 'gl_unittests', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - 'gles2_implementation_client_side_arrays', - ], - 'defines': [ - 'GLES2_C_LIB_IMPLEMENTATION', - 'GL_GLEXT_PROTOTYPES', - ], - 'sources': [ - 'command_buffer/tests/gl_test_utils.cc', - 'command_buffer/tests/gl_test_utils.h', - 'command_buffer/tests/gl_texture_mailbox_unittests.cc', - 'command_buffer/tests/gl_unittests.cc', - 'command_buffer/tests/occlusion_query_unittests.cc', - ], - }, - { 'target_name': 'gl_tests', 'type': 'executable', 'dependencies': [ @@ -235,17 +213,23 @@ 'gpu_unittest_utils', 'gles2_implementation_client_side_arrays', 'gles2_cmd_helper', - 'gl_unittests', + #'gl_unittests', ], 'defines': [ 'GLES2_C_LIB_IMPLEMENTATION', + 'GL_GLEXT_PROTOTYPES', ], 'sources': [ '<@(gles2_c_lib_source_files)', + 'command_buffer/tests/occlusion_query_unittests.cc', 'command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc', 'command_buffer/tests/gl_manager.cc', 'command_buffer/tests/gl_manager.h', 'command_buffer/tests/gl_tests_main.cc', + 'command_buffer/tests/gl_test_utils.cc', + 'command_buffer/tests/gl_test_utils.h', + 'command_buffer/tests/gl_texture_mailbox_unittests.cc', + 'command_buffer/tests/gl_unittests.cc', ], }, { |