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

Side by Side Diff: ash/ash_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 | « no previous file | base/base_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) 2014 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2014 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)/ash_unittests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)',
(...skipping 12 matching lines...) Expand all
23 'files': [ 23 'files': [
24 '../testing/xvfb.py', 24 '../testing/xvfb.py',
25 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 25 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
26 ], 26 ],
27 }, 27 },
28 }], 28 }],
29 ['OS=="win" or chromeos==1', { 29 ['OS=="win" or chromeos==1', {
30 'variables': { 30 'variables': {
31 'files': [ 31 'files': [
32 '../testing/test_env.py', 32 '../testing/test_env.py',
33 '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)',
33 '<(PRODUCT_DIR)/chrome_100_percent.pak', 34 '<(PRODUCT_DIR)/chrome_100_percent.pak',
34 '<(PRODUCT_DIR)/chrome_200_percent.pak', 35 '<(PRODUCT_DIR)/chrome_200_percent.pak',
35 '<(PRODUCT_DIR)/locales/en-US.pak', 36 '<(PRODUCT_DIR)/locales/en-US.pak',
36 '<(PRODUCT_DIR)/keyboard_resources.pak', 37 '<(PRODUCT_DIR)/keyboard_resources.pak',
37 ], 38 ],
38 }, 39 },
39 }], 40 }],
40 ['OS=="linux"', { 41 ['OS=="linux"', {
41 'variables': { 42 'variables': {
42 'files': [ 43 'files': [
(...skipping 14 matching lines...) Expand all
57 '<(PRODUCT_DIR)/ash_unittests.exe.pdb', 58 '<(PRODUCT_DIR)/ash_unittests.exe.pdb',
58 ], 59 ],
59 }, 60 },
60 }], 61 }],
61 ], 62 ],
62 'includes': [ 63 'includes': [
63 '../base/base.isolate', 64 '../base/base.isolate',
64 '../ui/gl/gl.isolate', 65 '../ui/gl/gl.isolate',
65 ], 66 ],
66 } 67 }
OLDNEW
« no previous file with comments | « no previous file | base/base_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698