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

Side by Side Diff: trunk/src/content/content_browsertests.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
« no previous file with comments | « trunk/src/chrome/unit_tests.isolate ('k') | trunk/src/content/content_unittests.isolate » ('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 (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 'variables': { 5 'variables': {
6 'isolate_dependency_tracked': [ 6 'isolate_dependency_tracked': [
7 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', 7 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
8 ], 8 ],
9 'isolate_dependency_untracked': [ 9 'isolate_dependency_untracked': [
10 'test/data/', 10 'test/data/',
(...skipping 11 matching lines...) Expand all
22 'variables': { 22 'variables': {
23 'command': [ 23 'command': [
24 '../testing/xvfb.py', 24 '../testing/xvfb.py',
25 '<(PRODUCT_DIR)', 25 '<(PRODUCT_DIR)',
26 '../tools/swarm_client/run_test_cases.py', 26 '../tools/swarm_client/run_test_cases.py',
27 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', 27 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
28 ], 28 ],
29 'isolate_dependency_tracked': [ 29 'isolate_dependency_tracked': [
30 '<(PRODUCT_DIR)/content_shell.pak', 30 '<(PRODUCT_DIR)/content_shell.pak',
31 '<(PRODUCT_DIR)/fonts.conf', 31 '<(PRODUCT_DIR)/fonts.conf',
32 '<(PRODUCT_DIR)/lib/libpeerconnection.so',
33 '<(PRODUCT_DIR)/libclearkeycdm.so', 32 '<(PRODUCT_DIR)/libclearkeycdm.so',
34 '<(PRODUCT_DIR)/libclearkeycdmadapter.so', 33 '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
35 '<(PRODUCT_DIR)/libffmpegsumo.so', 34 '<(PRODUCT_DIR)/libffmpegsumo.so',
36 '<(PRODUCT_DIR)/plugins/libnpapi_test_plugin.so', 35 '<(PRODUCT_DIR)/plugins/libnpapi_test_plugin.so',
37 '<(PRODUCT_DIR)/plugins/libTestNetscapePlugin.so', 36 '<(PRODUCT_DIR)/plugins/libTestNetscapePlugin.so',
38 ], 37 ],
39 }, 38 },
40 }], 39 }],
41 ['OS=="mac" or OS=="win"', { 40 ['OS=="mac" or OS=="win"', {
42 'variables': { 41 'variables': {
43 'command': [ 42 'command': [
44 '../testing/test_env.py', 43 '../testing/test_env.py',
45 '../tools/swarm_client/run_test_cases.py', 44 '../tools/swarm_client/run_test_cases.py',
46 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', 45 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
47 ], 46 ],
48 }, 47 },
49 }], 48 }],
50 ['OS=="mac"', { 49 ['OS=="mac"', {
51 'variables': { 50 'variables': {
52 'isolate_dependency_untracked': [ 51 'isolate_dependency_untracked': [
53 '<(PRODUCT_DIR)/clearkeycdmadapter.plugin', 52 '<(PRODUCT_DIR)/clearkeycdmadapter.plugin',
53 '<(PRODUCT_DIR)/content_resources.pak',
54 '<(PRODUCT_DIR)/Content Shell.app/', 54 '<(PRODUCT_DIR)/Content Shell.app/',
55 '<(PRODUCT_DIR)/content_resources.pak',
56 '<(PRODUCT_DIR)/ffmpegsumo.so', 55 '<(PRODUCT_DIR)/ffmpegsumo.so',
57 '<(PRODUCT_DIR)/libpeerconnection.so',
58 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin', 56 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin',
59 '<(PRODUCT_DIR)/plugins/TestNestscapePlugin.plugin', 57 '<(PRODUCT_DIR)/plugins/TestNestscapePlugin.plugin',
60 ], 58 ],
61 }, 59 },
62 }], 60 }],
63 ['OS=="win"', { 61 ['OS=="win"', {
64 'variables': { 62 'variables': {
65 'isolate_dependency_tracked': [ 63 'isolate_dependency_tracked': [
66 '<(PRODUCT_DIR)/ffmpegsumo.dll', 64 '<(PRODUCT_DIR)/ffmpegsumo.dll',
67 '<(PRODUCT_DIR)/libpeerconnection.dll',
68 ], 65 ],
69 'isolate_dependency_untracked': [ 66 'isolate_dependency_untracked': [
70 # The two directories below are only needed for 67 # The two directories below are only needed for
71 # WorkerXHRHttpLayoutTest.Tests which are currently disabled. 68 # WorkerXHRHttpLayoutTest.Tests which are currently disabled.
72 #'../third_party/cygwin/', 69 #'../third_party/cygwin/',
73 #'../third_party/perl/perl/', 70 #'../third_party/perl/perl/',
74 '../third_party/python_26/', 71 '../third_party/python_26/',
75 '<(PRODUCT_DIR)/chrome_100_percent.pak', 72 '<(PRODUCT_DIR)/chrome_100_percent.pak',
76 '<(PRODUCT_DIR)/clearkeycdm.dll', 73 '<(PRODUCT_DIR)/clearkeycdm.dll',
77 '<(PRODUCT_DIR)/clearkeycdmadapter.dll', 74 '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
78 '<(PRODUCT_DIR)/content_shell.pak', 75 '<(PRODUCT_DIR)/content_shell.pak',
79 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll', 76 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
80 '<(PRODUCT_DIR)/plugins/npTestNetscapePlugIn.dll', 77 '<(PRODUCT_DIR)/plugins/npTestNetscapePlugIn.dll',
81 ], 78 ],
82 }, 79 },
83 }], 80 }],
84 ], 81 ],
85 } 82 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/unit_tests.isolate ('k') | trunk/src/content/content_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698