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

Side by Side Diff: components/components_browsertests.isolate

Issue 1320793004: Fix sbox_validation_tests & Make isolate_driver.py include the executable itself (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: Fix for official build 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 | « chromeos/chromeos_unittests.isolate ('k') | components/components_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)/components_browsertests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
(...skipping 28 matching lines...) Expand all
39 'files': [ 39 'files': [
40 '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets/components_te sts_resources.pak', 40 '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets/components_te sts_resources.pak',
41 '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets/content_shell .pak', 41 '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets/content_shell .pak',
42 ], 42 ],
43 }, 43 },
44 }], 44 }],
45 ['OS=="linux" or OS=="mac" or OS=="win"', { 45 ['OS=="linux" or OS=="mac" or OS=="win"', {
46 'variables': { 46 'variables': {
47 'files': [ 47 'files': [
48 '../testing/test_env.py', 48 '../testing/test_env.py',
49 '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
50 '<(PRODUCT_DIR)/components_tests_resources.pak', 49 '<(PRODUCT_DIR)/components_tests_resources.pak',
51 '<(PRODUCT_DIR)/content_shell.pak', 50 '<(PRODUCT_DIR)/content_shell.pak',
52 ], 51 ],
53 }, 52 },
54 }], 53 }],
55 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 54 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
56 'variables': { 55 'variables': {
57 'files': [ 56 'files': [
58 'test/data/', 57 'test/data/',
59 'dom_distiller/core/javascript/', 58 'dom_distiller/core/javascript/',
(...skipping 25 matching lines...) Expand all
85 ], 84 ],
86 }, 85 },
87 }], 86 }],
88 ], 87 ],
89 'includes': [ 88 'includes': [
90 '../base/base.isolate', 89 '../base/base.isolate',
91 '../gin/v8.isolate', 90 '../gin/v8.isolate',
92 '../ui/gl/gl.isolate', 91 '../ui/gl/gl.isolate',
93 ], 92 ],
94 } 93 }
OLDNEW
« no previous file with comments | « chromeos/chromeos_unittests.isolate ('k') | components/components_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698