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

Side by Side Diff: gpu/gpu_unittests.isolate

Issue 1001833005: Update from https://crrev.com/320343 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Supress Created 5 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
« no previous file with comments | « gpu/gpu.gyp ('k') | gpu/perftests/texture_upload_perftest.cc » ('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 ['OS=="linux" or OS=="mac" or OS=="win"', { 6 ['use_x11==0', {
7 'variables': { 7 'variables': {
8 'files': [ 8 'command': [
9 '../testing/test_env.py', 9 '../testing/test_env.py',
10 '<(PRODUCT_DIR)/gpu_unittests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/gpu_unittests<(EXECUTABLE_SUFFIX)',
11 '--brave-new-test-launcher',
12 '--test-launcher-bot-mode',
13 '--asan=<(asan)',
14 '--msan=<(msan)',
15 '--tsan=<(tsan)',
11 ], 16 ],
12 }, 17 },
13 }], 18 }],
14 ['OS=="linux"', { 19 ['use_x11==1', {
15 'variables': { 20 'variables': {
16 'command': [ 21 'command': [
17 '../testing/xvfb.py', 22 '../testing/xvfb.py',
18 '<(PRODUCT_DIR)', 23 '<(PRODUCT_DIR)',
19 '<(PRODUCT_DIR)/gpu_unittests', 24 '<(PRODUCT_DIR)/gpu_unittests',
20 '--brave-new-test-launcher', 25 '--brave-new-test-launcher',
21 '--test-launcher-bot-mode', 26 '--test-launcher-bot-mode',
22 '--asan=<(asan)', 27 '--asan=<(asan)',
23 '--msan=<(msan)', 28 '--msan=<(msan)',
24 '--tsan=<(tsan)', 29 '--tsan=<(tsan)',
25 ], 30 ],
26 'files': [ 31 'files': [
27 '../testing/xvfb.py', 32 '../testing/xvfb.py',
28 '<(PRODUCT_DIR)/xdisplaycheck', 33 '<(PRODUCT_DIR)/xdisplaycheck',
29 ], 34 ],
30 }, 35 },
31 }], 36 }],
32 ['OS=="mac"', { 37 ['OS=="linux" or OS=="mac" or OS=="win"', {
33 'variables': { 38 'variables': {
34 'command': [ 39 'files': [
35 '../testing/test_env.py', 40 '../testing/test_env.py',
36 '<(PRODUCT_DIR)/gpu_unittests', 41 '<(PRODUCT_DIR)/gpu_unittests<(EXECUTABLE_SUFFIX)',
37 '--brave-new-test-launcher',
38 '--test-launcher-bot-mode',
39 '--asan=<(asan)',
40 '--msan=<(msan)',
41 '--tsan=<(tsan)',
42 ], 42 ],
43 }, 43 },
44 }], 44 }],
45 ['OS=="win"', {
46 'variables': {
47 'command': [
48 '../testing/test_env.py',
49 '<(PRODUCT_DIR)/gpu_unittests.exe',
50 '--brave-new-test-launcher',
51 '--test-launcher-bot-mode',
52 '--asan=<(asan)',
53 '--msan=<(msan)',
54 '--tsan=<(tsan)',
55 ],
56 },
57 }],
58 ['OS=="mac" and asan==1 and fastbuild==0', { 45 ['OS=="mac" and asan==1 and fastbuild==0', {
59 'variables': { 46 'variables': {
60 'files': [ 47 'files': [
61 '<(PRODUCT_DIR)/gpu_unittests.dSYM/', 48 '<(PRODUCT_DIR)/gpu_unittests.dSYM/',
62 ], 49 ],
63 }, 50 },
64 }], 51 }],
65 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 52 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
66 'variables': { 53 'variables': {
67 'files': [ 54 'files': [
68 '<(PRODUCT_DIR)/gpu_unittests.exe.pdb', 55 '<(PRODUCT_DIR)/gpu_unittests.exe.pdb',
69 ], 56 ],
70 }, 57 },
71 }], 58 }],
72 ], 59 ],
73 'includes': [ 60 'includes': [
74 '../base/base.isolate', 61 '../base/base.isolate',
62 '../third_party/angle/angle.isolate',
75 ], 63 ],
76 } 64 }
OLDNEW
« no previous file with comments | « gpu/gpu.gyp ('k') | gpu/perftests/texture_upload_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698