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

Side by Side Diff: content/content_unittests.isolate

Issue 599863003: Fix ChromeOS Ozone build since it doesn't have xdisplaycheck. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
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 'test/data/', 10 'test/data/',
(...skipping 28 matching lines...) Expand all
39 '../testing/xvfb.py', 39 '../testing/xvfb.py',
40 '<(PRODUCT_DIR)', 40 '<(PRODUCT_DIR)',
41 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', 41 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
42 '--brave-new-test-launcher', 42 '--brave-new-test-launcher',
43 '--test-launcher-bot-mode', 43 '--test-launcher-bot-mode',
44 ], 44 ],
45 'isolate_dependency_tracked': [ 45 'isolate_dependency_tracked': [
46 '../testing/xvfb.py', 46 '../testing/xvfb.py',
47 '<(PRODUCT_DIR)/libffmpegsumo.so', 47 '<(PRODUCT_DIR)/libffmpegsumo.so',
48 '<(PRODUCT_DIR)/libosmesa.so', 48 '<(PRODUCT_DIR)/libosmesa.so',
49 ],
50 },
51 }],
52 ['OS=="linux" and use_ozone==0', {
53 'variables': {
54 'isolate_dependency_tracked': [
49 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 55 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
50 ], 56 ],
51 }, 57 },
52 }], 58 }],
53 ['OS=="mac"', { 59 ['OS=="mac"', {
54 'variables': { 60 'variables': {
55 'command': [ 61 'command': [
56 '../testing/test_env.py', 62 '../testing/test_env.py',
57 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', 63 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
58 '--brave-new-test-launcher', 64 '--brave-new-test-launcher',
(...skipping 24 matching lines...) Expand all
83 'isolate_dependency_untracked': [ 89 'isolate_dependency_untracked': [
84 '<(PRODUCT_DIR)/content_unittests.exe.pdb', 90 '<(PRODUCT_DIR)/content_unittests.exe.pdb',
85 ], 91 ],
86 }, 92 },
87 }], 93 }],
88 ], 94 ],
89 'includes': [ 95 'includes': [
90 '../third_party/icu/icu.isolate', 96 '../third_party/icu/icu.isolate',
91 ], 97 ],
92 } 98 }
OLDNEW
« no previous file with comments | « content/content_browsertests.isolate ('k') | testing/chromoting/chromoting_integration_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698