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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

Issue 457813002: Put GPU isolate targets under archive_gpu_tests=1 GYP variable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 299ac6656113f705d23340957c76b26893355592..3a8c6dede4e06774ace6d3df420877fed5b25c0e 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2827,20 +2827,6 @@
['test_isolation_mode != "noop"', {
'targets': [
{
- 'target_name': 'angle_unittests_run',
- 'type': 'none',
- 'dependencies': [
- '../gpu/gpu.gyp:angle_unittests',
- ],
- 'includes': [
- '../build/isolate.gypi',
- 'angle_unittests.isolate',
- ],
- 'sources': [
- 'angle_unittests.isolate',
- ],
- },
- {
'target_name': 'browser_tests_run',
'type': 'none',
'dependencies': [
@@ -2864,35 +2850,6 @@
],
},
{
- 'target_name': 'content_gl_tests_run',
- 'type': 'none',
- 'dependencies': [
- '../content/content_shell_and_tests.gyp:content_gl_tests',
- 'chrome_run',
- ],
- 'includes': [
- '../build/isolate.gypi',
- 'content_gl_tests.isolate',
- ],
- 'sources': [
- 'content_gl_tests.isolate',
- ],
- },
- {
- 'target_name': 'gl_tests_run',
- 'type': 'none',
- 'dependencies': [
- '../gpu/gpu.gyp:gl_tests',
- ],
- 'includes': [
- '../build/isolate.gypi',
- 'gl_tests.isolate',
- ],
- 'sources': [
- 'gl_tests.isolate',
- ],
- },
- {
'target_name': 'interactive_ui_tests_run',
'type': 'none',
'dependencies': [
@@ -2935,20 +2892,6 @@
],
},
{
- 'target_name': 'tab_capture_end2end_tests_run',
- 'type': 'none',
- 'dependencies': [
- 'browser_tests_run',
- ],
- 'includes': [
- '../build/isolate.gypi',
- 'tab_capture_end2end_tests.isolate',
- ],
- 'sources': [
- 'tab_capture_end2end_tests.isolate',
- ],
- },
- {
'target_name': 'tab_capture_performance_tests_run',
'type': 'none',
'dependencies': [
@@ -2963,39 +2906,104 @@
'tab_capture_performance_tests.isolate',
],
},
- {
- 'target_name': 'telemetry_gpu_test_run',
- 'type': 'none',
- 'dependencies': [
- 'chrome_run',
- '../tools/telemetry/telemetry.gyp:bitmaptools#host',
- ],
- 'includes': [
- '../build/isolate.gypi',
- 'telemetry_gpu_test.isolate',
- ],
- 'sources': [
- 'telemetry_gpu_test.isolate',
- ],
- },
],
- }],
- ['test_isolation_mode != "noop" and internal_gles2_conform_tests==1', {
- 'targets': [
- {
- 'target_name': 'gles2_conform_test_run',
- 'type': 'none',
- 'dependencies': [
- '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test',
- ],
- 'includes': [
- '../build/isolate.gypi',
- 'gles2_conform_test.isolate',
+ 'conditions': [
+ ['archive_gpu_tests==1', {
+ 'targets': [
+ {
+ 'target_name': 'angle_unittests_run',
+ 'type': 'none',
+ 'dependencies': [
+ '../gpu/gpu.gyp:angle_unittests',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ 'angle_unittests.isolate',
+ ],
+ 'sources': [
+ 'angle_unittests.isolate',
+ ],
+ },
+ {
+ 'target_name': 'content_gl_tests_run',
+ 'type': 'none',
+ 'dependencies': [
+ '../content/content_shell_and_tests.gyp:content_gl_tests',
+ 'chrome_run',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ 'content_gl_tests.isolate',
+ ],
+ 'sources': [
+ 'content_gl_tests.isolate',
+ ],
+ },
+ {
+ 'target_name': 'gl_tests_run',
+ 'type': 'none',
+ 'dependencies': [
+ '../gpu/gpu.gyp:gl_tests',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ 'gl_tests.isolate',
+ ],
+ 'sources': [
+ 'gl_tests.isolate',
+ ],
+ },
+ {
+ 'target_name': 'tab_capture_end2end_tests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'browser_tests_run',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ 'tab_capture_end2end_tests.isolate',
+ ],
+ 'sources': [
+ 'tab_capture_end2end_tests.isolate',
+ ],
+ },
+ {
+ 'target_name': 'telemetry_gpu_test_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'chrome_run',
+ '../tools/telemetry/telemetry.gyp:bitmaptools#host',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ 'telemetry_gpu_test.isolate',
+ ],
+ 'sources': [
+ 'telemetry_gpu_test.isolate',
+ ],
+ },
],
- 'sources': [
- 'gles2_conform_test.isolate',
+ 'conditions': [
+ ['internal_gles2_conform_tests==1', {
+ 'targets': [
+ {
+ 'target_name': 'gles2_conform_test_run',
+ 'type': 'none',
+ 'dependencies': [
+ '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ 'gles2_conform_test.isolate',
+ ],
+ 'sources': [
+ 'gles2_conform_test.isolate',
+ ],
+ },
+ ],
+ }],
],
- },
+ }],
],
}],
[ 'enable_mdns == 1', {
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698