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

Side by Side Diff: chrome/interactive_ui_tests.isolate

Issue 216443005: Reapply "Media Galleries API Metadata: Image metadata" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge origin/master Created 6 years, 8 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 | « chrome/installer/mini_installer/chrome.release ('k') | chrome/sync_integration_tests.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 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)',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 '<(PRODUCT_DIR)/locales/en-US.pak', 51 '<(PRODUCT_DIR)/locales/en-US.pak',
52 '<(PRODUCT_DIR)/locales/fr.pak', 52 '<(PRODUCT_DIR)/locales/fr.pak',
53 '<(PRODUCT_DIR)/ui_test.pak', 53 '<(PRODUCT_DIR)/ui_test.pak',
54 ], 54 ],
55 }, 55 },
56 }], 56 }],
57 ['OS=="mac"', { 57 ['OS=="mac"', {
58 'variables': { 58 'variables': {
59 'isolate_dependency_tracked': [ 59 'isolate_dependency_tracked': [
60 '<(PRODUCT_DIR)/ffmpegsumo.so', 60 '<(PRODUCT_DIR)/ffmpegsumo.so',
61 '<(PRODUCT_DIR)/libexif.dylib',
61 '<(PRODUCT_DIR)/osmesa.so', 62 '<(PRODUCT_DIR)/osmesa.so',
62 ], 63 ],
63 'isolate_dependency_untracked': [ 64 'isolate_dependency_untracked': [
64 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', 65 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
65 '<(PRODUCT_DIR)/<(mac_product_name).app/', 66 '<(PRODUCT_DIR)/<(mac_product_name).app/',
66 ], 67 ],
67 }, 68 },
68 }], 69 }],
69 ['OS=="mac" or OS=="win"', { 70 ['OS=="mac" or OS=="win"', {
70 'variables': { 71 'variables': {
71 'command': [ 72 'command': [
72 '../testing/test_env.py', 73 '../testing/test_env.py',
73 '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)', 74 '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
74 '--test-launcher-bot-mode', 75 '--test-launcher-bot-mode',
75 ], 76 ],
76 }, 77 },
77 }], 78 }],
78 ['OS=="win"', { 79 ['OS=="win"', {
79 'variables': { 80 'variables': {
80 'isolate_dependency_tracked': [ 81 'isolate_dependency_tracked': [
81 '../net/data/ssl/certificates/foaf.me.chromium-test-cert.der', 82 '../net/data/ssl/certificates/foaf.me.chromium-test-cert.der',
82 '../net/data/ssl/certificates/mit.davidben.der', 83 '../net/data/ssl/certificates/mit.davidben.der',
83 '<(PRODUCT_DIR)/chrome_elf.dll', 84 '<(PRODUCT_DIR)/chrome_elf.dll',
84 '<(PRODUCT_DIR)/d3dcompiler_46.dll', 85 '<(PRODUCT_DIR)/d3dcompiler_46.dll',
85 '<(PRODUCT_DIR)/ffmpegsumo.dll', 86 '<(PRODUCT_DIR)/ffmpegsumo.dll',
86 '<(PRODUCT_DIR)/libEGL.dll', 87 '<(PRODUCT_DIR)/libEGL.dll',
88 '<(PRODUCT_DIR)/libexif.dll',
87 '<(PRODUCT_DIR)/libGLESv2.dll', 89 '<(PRODUCT_DIR)/libGLESv2.dll',
88 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 90 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
89 '<(PRODUCT_DIR)/osmesa.dll', 91 '<(PRODUCT_DIR)/osmesa.dll',
90 ], 92 ],
91 'isolate_dependency_untracked': [ 93 'isolate_dependency_untracked': [
92 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll', 94 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
93 ], 95 ],
94 }, 96 },
95 }], 97 }],
96 ], 98 ],
97 'includes': [ 99 'includes': [
98 '../third_party/icu/icu.isolate', 100 '../third_party/icu/icu.isolate',
99 ], 101 ],
100 } 102 }
OLDNEW
« no previous file with comments | « chrome/installer/mini_installer/chrome.release ('k') | chrome/sync_integration_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698