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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 10827356: Revert 151716 - Add NaCl smoke test to browser_tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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')
Property Changes:
Added: svn:mergeinfo
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 3079 matching lines...) Expand 10 before | Expand all | Expand 10 after
3090 'browser/ui/gtk/one_click_signin_bubble_gtk_browsertest.cc', 3090 'browser/ui/gtk/one_click_signin_bubble_gtk_browsertest.cc',
3091 'browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc', 3091 'browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc',
3092 ] 3092 ]
3093 }], 3093 }],
3094 ['disable_nacl==0', { 3094 ['disable_nacl==0', {
3095 'sources':[ 3095 'sources':[
3096 'browser/extensions/extension_nacl_browsertest.cc', 3096 'browser/extensions/extension_nacl_browsertest.cc',
3097 ], 3097 ],
3098 'conditions': [ 3098 'conditions': [
3099 ['disable_nacl_untrusted==0', { 3099 ['disable_nacl_untrusted==0', {
3100 'sources': [
3101 'test/nacl/nacl_browsertest.cc',
3102 ],
3103 'dependencies': [ 3100 'dependencies': [
3104 'test/data/nacl/nacl_test_data.gyp:nacl_tests', 3101 '../ppapi/ppapi_untrusted.gyp:ppapi_nacl_tests',
3105 '../ppapi/ppapi_untrusted.gyp:ppapi_nacl_tests',
3106 ], 3102 ],
3107 }], 3103 }],
3108 ['OS=="win" or OS=="linux"', { 3104 ['OS=="win" or OS=="linux"', {
3109 'sources': [ 3105 'sources': [
3110 'browser/nacl_host/test/nacl_gdb_browsertest.cc', 3106 'browser/nacl_host/test/nacl_gdb_browsertest.cc',
3111 ], 3107 ],
3112 'dependencies': [ 3108 'dependencies': [
3113 'browser/nacl_host/test/mock_nacl_gdb.gyp:mock_nacl_gdb', 3109 'browser/nacl_host/test/mock_nacl_gdb.gyp:mock_nacl_gdb',
3114 ], 3110 ],
3115 }], 3111 }],
(...skipping 1571 matching lines...) Expand 10 before | Expand all | Expand 10 after
4687 '--result', '<@(_outputs)', 4683 '--result', '<@(_outputs)',
4688 '--isolate', 'browser_tests.isolate', 4684 '--isolate', 'browser_tests.isolate',
4689 ], 4685 ],
4690 }, 4686 },
4691 ], 4687 ],
4692 }, 4688 },
4693 ], 4689 ],
4694 }], 4690 }],
4695 ], # 'conditions' 4691 ], # 'conditions'
4696 } 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