Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(342)

Side by Side Diff: gpu/gpu.gyp

Issue 1249693003: Rename angle_deqp_tests to angle_deqp_gles2_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include both expectations files temporarily Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'nacl_win64_target': 0, 7 'nacl_win64_target': 0,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'gpu_common.gypi', 10 'gpu_common.gypi',
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 }, 774 },
775 ], 775 ],
776 }], 776 }],
777 ['OS == "win" and archive_gpu_tests==1', { 777 ['OS == "win" and archive_gpu_tests==1', {
778 'targets': [ 778 'targets': [
779 { 779 {
780 # Only build dEQP on test configs. Note that dEQP is test-only code, 780 # Only build dEQP on test configs. Note that dEQP is test-only code,
781 # and is only a part of the Chromium build to allow easy integration 781 # and is only a part of the Chromium build to allow easy integration
782 # with the GPU bot waterfall. (Note that dEQP uses exceptions, and 782 # with the GPU bot waterfall. (Note that dEQP uses exceptions, and
783 # currently can't build with Clang on Windows) 783 # currently can't build with Clang on Windows)
784 'target_name': 'angle_deqp_tests', 784 'target_name': 'angle_deqp_gles2_tests',
785 'type': '<(gtest_target_type)', 785 'type': '<(gtest_target_type)',
786 'dependencies': [ 786 'dependencies': [
787 '../base/base.gyp:base', 787 '../base/base.gyp:base',
788 '../base/base.gyp:test_support_base', 788 '../base/base.gyp:test_support_base',
789 '../third_party/angle/src/tests/tests.gyp:angle_deqp_gtest_support', 789 '../third_party/angle/src/tests/tests.gyp:angle_deqp_gtest_support',
790 '../third_party/angle/src/tests/tests.gyp:angle_deqp_libgles2',
790 ], 791 ],
791 'includes': [ 792 'includes': [
792 '../third_party/angle/build/common_defines.gypi', 793 '../third_party/angle/build/common_defines.gypi',
793 ], 794 ],
794 'sources': [ 795 'sources': [
795 'angle_deqp_tests_main.cc', 796 'angle_deqp_tests_main.cc',
796 ], 797 ],
797 }, 798 },
798 ], 799 ],
799 }] 800 }]
800 ], 801 ],
801 } 802 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698