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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/nacl_integration.isolate

Issue 1240513002: Create nacl_integration.isolate. Base URL: https://chromium.googlesource.com/a/chromium/src.git@4_chrome
Patch Set: Cleaned up Created 5 years, 5 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 | « chrome/chrome_tests.gypi ('k') | chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py » ('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/xvfb.py',
10 '<(PRODUCT_DIR)/chromedriver_unittests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)',
11 '--test-launcher-bot-mode', 11 '../testing/scripts/nacl_integration.py',
12 '--asan=<(asan)', 12 '--build-config-fs',
13 '--msan=<(msan)', 13 '<(CONFIGURATION_NAME)',
14 '--tsan=<(tsan)', 14 '--use-src-side-runtest-py',
15 'run',
15 ], 16 ],
16 }, 17 },
17 }], 18 }],
18 ['use_x11==1', { 19 ['use_x11==1', {
19 'variables': { 20 'variables': {
20 'command': [ 21 'command': [
21 '../testing/xvfb.py', 22 '../testing/xvfb.py',
22 '<(PRODUCT_DIR)', 23 '<(PRODUCT_DIR)',
23 '<(PRODUCT_DIR)/chromedriver_unittests<(EXECUTABLE_SUFFIX)', 24 '../testing/scripts/nacl_integration.py',
24 '--test-launcher-bot-mode', 25 '--build-config-fs',
25 '--asan=<(asan)', 26 '<(CONFIGURATION_NAME)',
26 '--msan=<(msan)', 27 '--use-src-side-runtest-py',
27 '--tsan=<(tsan)', 28 'run',
28 ], 29 ],
29 'files': [ 30 'files': [
30 '../testing/xvfb.py', 31 '../testing/xvfb.py',
31 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 32 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
32 ], 33 ],
33 }, 34 },
34 }], 35 }],
35 ['OS=="linux" or OS=="mac" or OS=="win"', { 36 ['OS=="linux" or OS=="mac" or OS=="win"', {
36 'variables': { 37 'variables': {
37 'files': [ 38 'files': [
39 '../native_client/',
40 '../third_party/scons-2.0.1/engine/',
41 '../build/detect_host_arch.py',
42 '../testing/scripts/common.py',
43 '../testing/scripts/nacl_integration.py',
38 '../testing/test_env.py', 44 '../testing/test_env.py',
39 '<(PRODUCT_DIR)/chromedriver_unittests<(EXECUTABLE_SUFFIX)', 45 'test/nacl_test_injection/',
40 'test/data/chromedriver/',
41 ], 46 ],
42 }, 47 },
43 }], 48 }],
44 ], 49 ],
45 'includes': [ 50 'includes': [
46 '../base/base.isolate', 51 'chrome.isolate',
47 ], 52 ],
48 } 53 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698