diff options
| author | stip <stip@chromium.org> | 2015-09-28 19:18:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-29 02:20:38 +0000 |
| commit | 7ccad76381159347a94d636d573ad35c0a51cba7 (patch) | |
| tree | d6885d11b2317822001ae4ee9379aca0c9369918 | |
| parent | 4af105635658e873e423486c4a14c4b89f30045e (diff) | |
| download | chromium_src-7ccad76381159347a94d636d573ad35c0a51cba7.zip chromium_src-7ccad76381159347a94d636d573ad35c0a51cba7.tar.gz chromium_src-7ccad76381159347a94d636d573ad35c0a51cba7.tar.bz2 | |
Isolate gl_tests and gpu_unittests.
BUG=525873
Review URL: https://codereview.chromium.org/1362733004
Cr-Commit-Position: refs/heads/master@{#351231}
| -rw-r--r-- | gpu/gl_tests_apk.isolate | 17 | ||||
| -rw-r--r-- | gpu/gpu.gyp | 34 | ||||
| -rw-r--r-- | gpu/gpu_unittests_apk.isolate | 17 |
3 files changed, 67 insertions, 1 deletions
diff --git a/gpu/gl_tests_apk.isolate b/gpu/gl_tests_apk.isolate new file mode 100644 index 0000000..8abb497 --- /dev/null +++ b/gpu/gl_tests_apk.isolate @@ -0,0 +1,17 @@ +# Copyright 2015 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': [ + '../build/android/android.isolate', + ], + 'variables': { + 'command': [ + '<(PRODUCT_DIR)/bin/run_gl_tests', + ], + 'files': [ + '<(PRODUCT_DIR)/bin/run_gl_tests', + '<(PRODUCT_DIR)/gl_tests_apk/', + ] + }, +} diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 15b62cd..930153a 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -847,6 +847,38 @@ ], }, ], - }] + }], + ['OS == "android" and test_isolation_mode != "noop"', + { + 'targets': [ + { + 'target_name': 'gl_tests_apk_run', + 'type': 'none', + 'dependencies': [ + 'gl_tests_apk', + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'gl_tests_apk.isolate', + ], + }, + { + 'target_name': 'gpu_unittests_apk_run', + 'type': 'none', + 'dependencies': [ + 'gpu_unittests_apk', + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'gpu_unittests_apk.isolate', + ], + }, + ], + }, + ], ], } diff --git a/gpu/gpu_unittests_apk.isolate b/gpu/gpu_unittests_apk.isolate new file mode 100644 index 0000000..94411b1 --- /dev/null +++ b/gpu/gpu_unittests_apk.isolate @@ -0,0 +1,17 @@ +# Copyright 2015 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': [ + '../build/android/android.isolate', + ], + 'variables': { + 'command': [ + '<(PRODUCT_DIR)/bin/run_gpu_unittests', + ], + 'files': [ + '<(PRODUCT_DIR)/bin/run_gpu_unittests', + '<(PRODUCT_DIR)/gpu_unittests_apk/', + ] + }, +} |