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

Side by Side Diff: content/content_unittests.isolate

Issue 203963003: Turns on use_mojo=1 for linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos==0 Created 6 years, 9 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 6 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
7 'variables': { 7 'variables': {
8 'isolate_dependency_untracked': [ 8 'isolate_dependency_untracked': [
9 '../media/test/data/', 9 '../media/test/data/',
10 '../webkit/data/', 10 '../webkit/data/',
(...skipping 28 matching lines...) Expand all
39 '--brave-new-test-launcher', 39 '--brave-new-test-launcher',
40 '--test-launcher-bot-mode', 40 '--test-launcher-bot-mode',
41 ], 41 ],
42 'isolate_dependency_tracked': [ 42 'isolate_dependency_tracked': [
43 '../testing/xvfb.py', 43 '../testing/xvfb.py',
44 '<(PRODUCT_DIR)/libffmpegsumo.so', 44 '<(PRODUCT_DIR)/libffmpegsumo.so',
45 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 45 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
46 ], 46 ],
47 }, 47 },
48 }], 48 }],
49 ['OS=="linux" and use_mojo==1', {
50 'variables': {
51 'isolate_dependency_tracked': [
52 '<(PRODUCT_DIR)/lib/libmojo_system.so',
53 ],
54 },
55 }],
49 ['OS=="mac"', { 56 ['OS=="mac"', {
50 'variables': { 57 'variables': {
51 'command': [ 58 'command': [
52 '../testing/test_env.py', 59 '../testing/test_env.py',
53 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', 60 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
54 '--brave-new-test-launcher', 61 '--brave-new-test-launcher',
55 '--test-launcher-bot-mode', 62 '--test-launcher-bot-mode',
56 ], 63 ],
57 'isolate_dependency_tracked': [ 64 'isolate_dependency_tracked': [
58 '<(PRODUCT_DIR)/ffmpegsumo.so', 65 '<(PRODUCT_DIR)/ffmpegsumo.so',
(...skipping 12 matching lines...) Expand all
71 '<(PRODUCT_DIR)/ffmpegsumo.dll', 78 '<(PRODUCT_DIR)/ffmpegsumo.dll',
72 '<(PRODUCT_DIR)/ui_test.pak', 79 '<(PRODUCT_DIR)/ui_test.pak',
73 ], 80 ],
74 }, 81 },
75 }], 82 }],
76 ], 83 ],
77 'includes': [ 84 'includes': [
78 '../third_party/icu/icu.isolate', 85 '../third_party/icu/icu.isolate',
79 ], 86 ],
80 } 87 }
OLDNEW
« chrome/tools/build/linux/FILES.cfg ('K') | « content/content_browsertests.isolate ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698