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

Side by Side Diff: components/components_unittests.isolate

Issue 1115033003: resources: Prevent including the same resource in multiple pack files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot-merge Created 5 years, 7 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 | « components/components_tests.gyp ('k') | components/test/run_all_unittests.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 ['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_unittests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)',
(...skipping 21 matching lines...) Expand all
32 '../testing/xvfb.py', 32 '../testing/xvfb.py',
33 '<(PRODUCT_DIR)/xdisplaycheck', 33 '<(PRODUCT_DIR)/xdisplaycheck',
34 ], 34 ],
35 }, 35 },
36 }], 36 }],
37 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 37 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
38 'variables': { 38 'variables': {
39 'files': [ 39 'files': [
40 'test/data/', 40 'test/data/',
41 '<(PRODUCT_DIR)/components_tests_resources.pak', 41 '<(PRODUCT_DIR)/components_tests_resources.pak',
42 '<(PRODUCT_DIR)/ui_test.pak',
42 ], 43 ],
43 }, 44 },
44 }], 45 }],
45 ['OS=="linux" or OS=="mac" or OS=="win"', { 46 ['OS=="linux" or OS=="mac" or OS=="win"', {
46 'variables': { 47 'variables': {
47 'files': [ 48 'files': [
48 '../testing/test_env.py', 49 '../testing/test_env.py',
49 '<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)', 50 '<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)',
50 ], 51 ],
51 }, 52 },
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 '<(PRODUCT_DIR)/osmesa.so.dSYM/', 91 '<(PRODUCT_DIR)/osmesa.so.dSYM/',
91 ], 92 ],
92 }, 93 },
93 }], 94 }],
94 ], 95 ],
95 'includes': [ 96 'includes': [
96 '../base/base.isolate', 97 '../base/base.isolate',
97 '../third_party/angle/angle.isolate', 98 '../third_party/angle/angle.isolate',
98 ], 99 ],
99 } 100 }
OLDNEW
« no previous file with comments | « components/components_tests.gyp ('k') | components/test/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698