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

Side by Side Diff: ui/wm/wm_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/touch_selection/ui_touch_selection_unittests.isolate ('k') | url/url_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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 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 ['use_x11==0', { 6 ['use_x11==0', {
7 'variables': { 7 'variables': {
8 'command': [ 8 'command': [
9 '../../testing/test_env.py', 9 '../../testing/test_env.py',
10 '<(PRODUCT_DIR)/wm_unittests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/wm_unittests<(EXECUTABLE_SUFFIX)',
(...skipping 21 matching lines...) Expand all
32 '../../testing/xvfb.py', 32 '../../testing/xvfb.py',
33 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 33 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
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 '<(PRODUCT_DIR)/ui_test.pak', 41 '<(PRODUCT_DIR)/ui_test.pak',
42 '<(PRODUCT_DIR)/wm_unittests<(EXECUTABLE_SUFFIX)',
42 ], 43 ],
43 }, 44 },
44 }], 45 }],
45 ['OS=="linux"', { 46 ['OS=="linux"', {
46 'variables': { 47 'variables': {
47 'files': [ 48 'files': [
48 '<(PRODUCT_DIR)/libosmesa.so', 49 '<(PRODUCT_DIR)/libosmesa.so',
49 ], 50 ],
50 }, 51 },
51 }], 52 }],
52 ['OS=="mac"', { 53 ['OS=="mac"', {
53 'variables': { 54 'variables': {
54 'files': [ 55 'files': [
55 '<(PRODUCT_DIR)/osmesa.so', 56 '<(PRODUCT_DIR)/osmesa.so',
56 ], 57 ],
57 }, 58 },
58 }], 59 }],
59 ['OS=="win"', { 60 ['OS=="win"', {
60 'variables': { 61 'variables': {
61 'files': [ 62 'files': [
62 '<(PRODUCT_DIR)/osmesa.dll', 63 '<(PRODUCT_DIR)/osmesa.dll',
63 ], 64 ],
64 }, 65 },
65 }], 66 }],
66 ], 67 ],
67 'includes': [ 68 'includes': [
68 '../../base/base.isolate', 69 '../../base/base.isolate',
69 ], 70 ],
70 } 71 }
OLDNEW
« no previous file with comments | « ui/touch_selection/ui_touch_selection_unittests.isolate ('k') | url/url_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698