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

Side by Side Diff: ui/compositor/compositor_unittests.isolate

Issue 1329783003: Revert of Fix sbox_validation_tests & Make isolate_driver.py include the executable itself (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@2_process
Patch Set: Created 5 years, 3 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 | « ui/base/ui_base_unittests.isolate ('k') | ui/display/display_unittests.isolate » ('j') | 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) 2015 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2015 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 'conditions': [ 5 'conditions': [
6 ['(OS=="linux" or OS=="mac" or OS=="win") and use_x11==0', { 6 ['(OS=="linux" or OS=="mac" or OS=="win") and use_x11==0', {
7 'variables': { 7 'variables': {
8 'command': [ 8 'command': [
9 '../../testing/test_env.py', 9 '../../testing/test_env.py',
10 '<(PRODUCT_DIR)/compositor_unittests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/compositor_unittests<(EXECUTABLE_SUFFIX)',
(...skipping 21 matching lines...) Expand all
32 '../../testing/xvfb.py', 32 '../../testing/xvfb.py',
33 '<(PRODUCT_DIR)/xdisplaycheck', 33 '<(PRODUCT_DIR)/xdisplaycheck',
34 ], 34 ],
35 }, 35 },
36 }], 36 }],
37 ['OS=="linux" or OS=="mac" or OS=="win"', { 37 ['OS=="linux" or OS=="mac" or OS=="win"', {
38 'variables': { 38 'variables': {
39 'files': [ 39 'files': [
40 '../../testing/test_env.py', 40 '../../testing/test_env.py',
41 '../gfx/test/data/compositor/', 41 '../gfx/test/data/compositor/',
42 '<(PRODUCT_DIR)/compositor_unittests<(EXECUTABLE_SUFFIX)',
42 ], 43 ],
43 }, 44 },
44 }], 45 }],
45 ['OS=="linux"', { 46 ['OS=="linux"', {
46 'variables': { 'files': [ '<(PRODUCT_DIR)/libosmesa.so' ] }, 47 'variables': { 'files': [ '<(PRODUCT_DIR)/libosmesa.so' ] },
47 }], 48 }],
48 ['OS=="mac"', { 49 ['OS=="mac"', {
49 'variables': { 'files': [ '<(PRODUCT_DIR)/osmesa.so' ] }, 50 'variables': { 'files': [ '<(PRODUCT_DIR)/osmesa.so' ] },
50 }], 51 }],
51 ['OS=="win"', { 52 ['OS=="win"', {
52 'variables': { 'files': [ '<(PRODUCT_DIR)/osmesa.dll' ] }, 53 'variables': { 'files': [ '<(PRODUCT_DIR)/osmesa.dll' ] },
53 }], 54 }],
54 ], 55 ],
55 'includes': [ 56 'includes': [
56 '../../base/base.isolate', 57 '../../base/base.isolate',
57 ], 58 ],
58 } 59 }
OLDNEW
« no previous file with comments | « ui/base/ui_base_unittests.isolate ('k') | ui/display/display_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698