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

Side by Side Diff: trunk/src/content/content_unittests.isolate

Issue 14615011: Revert 198675 "Reland 198495 for Windows." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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 | 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=="linux"', { 6 ['OS=="linux"', {
7 'variables': { 7 'variables': {
8 'command': [ 8 'command': [
9 '../testing/xvfb.py', 9 '../testing/xvfb.py',
10 '<(PRODUCT_DIR)', 10 '<(PRODUCT_DIR)',
11 '../tools/swarm_client/run_test_cases.py', 11 '../tools/swarm_client/run_test_cases.py',
12 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', 12 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
13 ], 13 ],
14 'isolate_dependency_untracked': [ 14 'isolate_dependency_untracked': [
15 '<(PRODUCT_DIR)/lib/libpeerconnection.so',
16 '<(PRODUCT_DIR)/libffmpegsumo.so', 15 '<(PRODUCT_DIR)/libffmpegsumo.so',
17 '<(PRODUCT_DIR)/test_data/', 16 '<(PRODUCT_DIR)/test_data/',
18 ], 17 ],
19 }, 18 },
20 }], 19 }],
21 ['OS=="linux" or OS=="mac" or OS=="win"', { 20 ['OS=="linux" or OS=="mac" or OS=="win"', {
22 'variables': { 21 'variables': {
23 'isolate_dependency_tracked': [ 22 'isolate_dependency_tracked': [
24 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', 23 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
25 ], 24 ],
26 'isolate_dependency_untracked': [ 25 'isolate_dependency_untracked': [
27 '../third_party/hyphen/hyph_en_US.dic', 26 '../third_party/hyphen/hyph_en_US.dic',
28 '../webkit/data/', 27 '../webkit/data/',
29 'browser/gpu/gpu_driver_bug_list.json', 28 'browser/gpu/gpu_driver_bug_list.json',
30 'browser/gpu/gpu_switching_list.json', 29 'browser/gpu/gpu_switching_list.json',
31 'browser/gpu/software_rendering_list.json', 30 'browser/gpu/software_rendering_list.json',
32 'test/data/', 31 'test/data/',
33 ], 32 ],
34 }, 33 },
35 }], 34 }],
36 ['OS=="mac"', { 35 ['OS=="mac"', {
37 'variables': { 36 'variables': {
38 'isolate_dependency_untracked': [ 37 'isolate_dependency_untracked': [
39 '<(PRODUCT_DIR)/content_resources.pak', 38 '<(PRODUCT_DIR)/content_resources.pak',
40 '<(PRODUCT_DIR)/ffmpegsumo.so', 39 '<(PRODUCT_DIR)/ffmpegsumo.so',
41 '<(PRODUCT_DIR)/libpeerconnection.so',
42 ], 40 ],
43 }, 41 },
44 }], 42 }],
45 ['OS=="mac" or OS=="win"', { 43 ['OS=="mac" or OS=="win"', {
46 'variables': { 44 'variables': {
47 'command': [ 45 'command': [
48 '../testing/test_env.py', 46 '../testing/test_env.py',
49 '../tools/swarm_client/run_test_cases.py', 47 '../tools/swarm_client/run_test_cases.py',
50 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', 48 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
51 ], 49 ],
52 }, 50 },
53 }], 51 }],
54 ['OS=="win"', { 52 ['OS=="win"', {
55 'variables': { 53 'variables': {
56 'isolate_dependency_untracked': [ 54 'isolate_dependency_untracked': [
57 '<(PRODUCT_DIR)/ffmpegsumo.dll', 55 '<(PRODUCT_DIR)/ffmpegsumo.dll',
58 '<(PRODUCT_DIR)/icudt.dll', 56 '<(PRODUCT_DIR)/icudt.dll',
59 '<(PRODUCT_DIR)/libpeerconnection.dll',
60 ], 57 ],
61 }, 58 },
62 }], 59 }],
63 ], 60 ],
64 } 61 }
OLDNEW
« no previous file with comments | « trunk/src/content/content_browsertests.isolate ('k') | trunk/src/third_party/libjingle/libjingle.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698