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

Side by Side Diff: gpu/gpu.gyp

Issue 1201583002: Speed up angle_end2end_tests by running tests in larger batches. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove isolate change. Created 5 years, 6 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 | « gpu/angle_unittest_main.cc ('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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 'dependencies': [ 135 'dependencies': [
136 '../base/base.gyp:base', 136 '../base/base.gyp:base',
137 '../base/base.gyp:test_support_base', 137 '../base/base.gyp:test_support_base',
138 ], 138 ],
139 'include_dirs': [ 139 'include_dirs': [
140 '..', 140 '..',
141 '../third_party/angle/include', 141 '../third_party/angle/include',
142 ], 142 ],
143 'sources': [ 143 'sources': [
144 'angle_unittest_main.cc', 144 'angle_unittest_main.cc',
145 'angle_test_batcher.cc',
145 ], 146 ],
146 }, 147 },
147 { 148 {
148 # GN version: //gpu:gpu_unittests 149 # GN version: //gpu:gpu_unittests
149 'target_name': 'gpu_unittests', 150 'target_name': 'gpu_unittests',
150 'type': '<(gtest_target_type)', 151 'type': '<(gtest_target_type)',
151 'dependencies': [ 152 'dependencies': [
152 '../base/base.gyp:base', 153 '../base/base.gyp:base',
153 '../base/base.gyp:test_support_base', 154 '../base/base.gyp:test_support_base',
154 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 155 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 'dependencies': [ 716 'dependencies': [
716 '../base/base.gyp:base', 717 '../base/base.gyp:base',
717 '../base/base.gyp:test_support_base', 718 '../base/base.gyp:test_support_base',
718 ], 719 ],
719 'includes': [ 720 'includes': [
720 '../third_party/angle/build/common_defines.gypi', 721 '../third_party/angle/build/common_defines.gypi',
721 '../third_party/angle/src/tests/angle_end2end_tests.gypi', 722 '../third_party/angle/src/tests/angle_end2end_tests.gypi',
722 ], 723 ],
723 'sources': [ 724 'sources': [
724 'angle_end2end_tests_main.cc', 725 'angle_end2end_tests_main.cc',
726 'angle_test_batcher.cc',
725 ], 727 ],
726 }, 728 },
727 ], 729 ],
728 }], 730 }],
729 ['OS == "win"', { 731 ['OS == "win"', {
730 'targets': [ 732 'targets': [
731 { 733 {
732 # TODO(jmadill): port this target to the GN build. 734 # TODO(jmadill): port this target to the GN build.
733 'target_name': 'angle_perftests', 735 'target_name': 'angle_perftests',
734 'type': '<(gtest_target_type)', 736 'type': '<(gtest_target_type)',
735 'dependencies': [ 737 'dependencies': [
736 '../base/base.gyp:base', 738 '../base/base.gyp:base',
737 '../base/base.gyp:test_support_base', 739 '../base/base.gyp:test_support_base',
738 ], 740 ],
739 'includes': [ 741 'includes': [
740 '../third_party/angle/build/common_defines.gypi', 742 '../third_party/angle/build/common_defines.gypi',
741 '../third_party/angle/src/tests/angle_perftests.gypi', 743 '../third_party/angle/src/tests/angle_perftests.gypi',
742 ], 744 ],
743 'sources': [ 745 'sources': [
744 'angle_perftests_main.cc', 746 'angle_perftests_main.cc',
747 'angle_test_batcher.cc',
745 ], 748 ],
746 }, 749 },
747 ], 750 ],
748 }], 751 }],
749 ['test_isolation_mode != "noop"', { 752 ['test_isolation_mode != "noop"', {
750 'targets': [ 753 'targets': [
751 { 754 {
752 'target_name': 'gpu_unittests_run', 755 'target_name': 'gpu_unittests_run',
753 'type': 'none', 756 'type': 'none',
754 'dependencies': [ 757 'dependencies': [
(...skipping 12 matching lines...) Expand all
767 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 770 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
768 ], 771 ],
769 } 772 }
770 ], 773 ],
771 ], 774 ],
772 }, 775 },
773 ], 776 ],
774 }], 777 }],
775 ], 778 ],
776 } 779 }
OLDNEW
« no previous file with comments | « gpu/angle_unittest_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698