diff options
| -rw-r--r-- | build/isolate.gypi | 4 | ||||
| -rw-r--r-- | chrome/angle_unittests.isolate | 17 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 72 | ||||
| -rw-r--r-- | chrome/content_gl_tests.isolate | 23 | ||||
| -rw-r--r-- | chrome/gl_tests.isolate | 17 | ||||
| -rw-r--r-- | chrome/gles2_conform_test.isolate | 39 | ||||
| -rw-r--r-- | chrome/tab_capture_performance_tests.isolate | 29 |
7 files changed, 201 insertions, 0 deletions
diff --git a/build/isolate.gypi b/build/isolate.gypi index 2c667de..0f2a301 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -70,6 +70,10 @@ # like '0' or '1', aren't stripped out by GYP. '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ', '--config-variable', 'OS=<(OS)', + # TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run + # once support for user-defined config variables is added. + '--config-variable', + 'internal_gles2_conform_tests=<(internal_gles2_conform_tests)', '--result', '<@(_outputs)', '--isolate', '<(RULE_INPUT_PATH)', ], diff --git a/chrome/angle_unittests.isolate b/chrome/angle_unittests.isolate new file mode 100644 index 0000000..9d8c4f1 --- /dev/null +++ b/chrome/angle_unittests.isolate @@ -0,0 +1,17 @@ +# Copyright 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'conditions': [ + ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '<(PRODUCT_DIR)/angle_unittests<(EXECUTABLE_SUFFIX)', + ], + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/angle_unittests<(EXECUTABLE_SUFFIX)', + ], + }, + }], + ], +} diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 3317fa1a..68461e7 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -3015,6 +3015,20 @@ ['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': [ @@ -3031,6 +3045,49 @@ ], }, { + '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': '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', + ], + }, + { + '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': [ @@ -3073,6 +3130,21 @@ ], }, { + 'target_name': 'tab_capture_performance_tests_run', + 'type': 'none', + 'dependencies': [ + 'performance_browser_tests', + 'chrome_run', + ], + 'includes': [ + '../build/isolate.gypi', + 'tab_capture_performance_tests.isolate', + ], + 'sources': [ + 'tab_capture_performance_tests.isolate', + ], + }, + { 'target_name': 'telemetry_gpu_test_run', 'type': 'none', 'dependencies': [ diff --git a/chrome/content_gl_tests.isolate b/chrome/content_gl_tests.isolate new file mode 100644 index 0000000..cc78a68 --- /dev/null +++ b/chrome/content_gl_tests.isolate @@ -0,0 +1,23 @@ +# Copyright 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + # TODO(kbr): including all of chrome.isolate is overkill -- the only + # real dependency is on ffmpegsumo. However, wait to refactor + # chrome.isolate (perhaps adding a media.isolate) for the moment. + 'includes': [ + 'chrome.isolate', + ], + 'conditions': [ + ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '<(PRODUCT_DIR)/content_gl_tests<(EXECUTABLE_SUFFIX)', + ], + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/content_gl_tests<(EXECUTABLE_SUFFIX)', + ], + }, + }], + ], +} diff --git a/chrome/gl_tests.isolate b/chrome/gl_tests.isolate new file mode 100644 index 0000000..bd96664 --- /dev/null +++ b/chrome/gl_tests.isolate @@ -0,0 +1,17 @@ +# Copyright 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'conditions': [ + ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '<(PRODUCT_DIR)/gl_tests<(EXECUTABLE_SUFFIX)', + ], + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/gl_tests<(EXECUTABLE_SUFFIX)', + ], + }, + }], + ], +} diff --git a/chrome/gles2_conform_test.isolate b/chrome/gles2_conform_test.isolate new file mode 100644 index 0000000..b2711bb --- /dev/null +++ b/chrome/gles2_conform_test.isolate @@ -0,0 +1,39 @@ +# Copyright 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'conditions': [ + # TODO(kbr): add Android when these tests are run on those bots. + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '<(PRODUCT_DIR)/gles2_conform_test<(EXECUTABLE_SUFFIX)', + ], + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/gles2_conform_test<(EXECUTABLE_SUFFIX)', + '../gpu/gles2_conform_support/gles2_conform_test_expectations.txt', + ], + }, + }], + # .isolate format doesn't support nested conditions. + ['(OS=="linux" or OS=="mac" or OS=="win") and internal_gles2_conform_tests==1', { + 'variables': { + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/gles2_conform_test_windowless<(EXECUTABLE_SUFFIX)', + # Could add gles2_conform_test_angle or + # gles2_conform_test_chromeos if the bots were testing those. + ], + 'isolate_dependency_untracked': [ + '../third_party/gles2_conform/GTF_ES/', + ], + }, + }], + # This no-op branch should not be necessary but seems to be. + ['(OS=="linux" or OS=="mac" or OS=="win") and internal_gles2_conform_tests==0', { + 'variables': { + 'isolate_dependency_tracked': [ + ], + }, + }], + ], +} diff --git a/chrome/tab_capture_performance_tests.isolate b/chrome/tab_capture_performance_tests.isolate new file mode 100644 index 0000000..1a09650 --- /dev/null +++ b/chrome/tab_capture_performance_tests.isolate @@ -0,0 +1,29 @@ +# Copyright 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'includes': [ + 'chrome.isolate', + ], + 'conditions': [ + ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '<(PRODUCT_DIR)/performance_browser_tests<(EXECUTABLE_SUFFIX)', + # These arguments were copied from the GPU recipe at + # tools/build/scripts/slave/recipe_modules/gpu/api.py. + '--enable-gpu', + '--test-launcher-jobs=1', + '--test-launcher-print-test-stdio=always', + '--gtest_filter=TabCapturePerformanceTest*', + ], + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/performance_browser_tests<(EXECUTABLE_SUFFIX)', + ], + 'isolate_dependency_untracked': [ + 'test/data/extensions/api_test/tab_capture/', + ], + }, + }], + ], +} |