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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 10837207: Add NaCl smoke test to browser_tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge + GYP tweak. Created 8 years, 4 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 | « no previous file | chrome/test/base/ui_test_utils.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'pyautolib_sources': [ 6 'pyautolib_sources': [
7 'app/chrome_command_ids.h', 7 'app/chrome_command_ids.h',
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/automation_constants.h', 9 'common/automation_constants.h',
10 'common/pref_names.cc', 10 'common/pref_names.cc',
(...skipping 3075 matching lines...) Expand 10 before | Expand all | Expand 10 after
3086 'browser/ui/gtk/one_click_signin_bubble_gtk_browsertest.cc', 3086 'browser/ui/gtk/one_click_signin_bubble_gtk_browsertest.cc',
3087 'browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc', 3087 'browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc',
3088 ] 3088 ]
3089 }], 3089 }],
3090 ['disable_nacl==0', { 3090 ['disable_nacl==0', {
3091 'sources':[ 3091 'sources':[
3092 'browser/extensions/extension_nacl_browsertest.cc', 3092 'browser/extensions/extension_nacl_browsertest.cc',
3093 ], 3093 ],
3094 'conditions': [ 3094 'conditions': [
3095 ['disable_nacl_untrusted==0', { 3095 ['disable_nacl_untrusted==0', {
3096 'sources': [
3097 'test/nacl/nacl_browsertest.cc',
3098 ],
3096 'dependencies': [ 3099 'dependencies': [
3097 '../ppapi/ppapi_untrusted.gyp:ppapi_nacl_tests', 3100 'test/data/nacl/nacl_test_data.gyp:nacl_tests',
3101 '../ppapi/ppapi_untrusted.gyp:ppapi_nacl_tests',
3098 ], 3102 ],
3099 }], 3103 }],
3100 ['OS=="win" or OS=="linux"', { 3104 ['OS=="win" or OS=="linux"', {
3101 'sources': [ 3105 'sources': [
3102 'browser/nacl_host/test/nacl_gdb_browsertest.cc', 3106 'browser/nacl_host/test/nacl_gdb_browsertest.cc',
3103 ], 3107 ],
3104 'dependencies': [ 3108 'dependencies': [
3105 'browser/nacl_host/test/mock_nacl_gdb.gyp:mock_nacl_gdb', 3109 'browser/nacl_host/test/mock_nacl_gdb.gyp:mock_nacl_gdb',
3106 ], 3110 ],
3107 }], 3111 }],
(...skipping 1571 matching lines...) Expand 10 before | Expand all | Expand 10 after
4679 '--result', '<@(_outputs)', 4683 '--result', '<@(_outputs)',
4680 '--isolate', 'browser_tests.isolate', 4684 '--isolate', 'browser_tests.isolate',
4681 ], 4685 ],
4682 }, 4686 },
4683 ], 4687 ],
4684 }, 4688 },
4685 ], 4689 ],
4686 }], 4690 }],
4687 ], # 'conditions' 4691 ], # 'conditions'
4688 } 4692 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/base/ui_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698