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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 6896051: Disable nacl_test, which was testing obsolete and unsupported APIs. Leave a (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | « no previous file | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 { 5 {
6 'variables' : { 6 'variables' : {
7 'pyautolib_sources': [ 7 'pyautolib_sources': [
8 'app/chrome_command_ids.h', 8 'app/chrome_command_ids.h',
9 'app/chrome_dll_resource.h', 9 'app/chrome_dll_resource.h',
10 'common/automation_constants.h', 10 'common/automation_constants.h',
(...skipping 1013 matching lines...) Expand 10 before | Expand all | Expand 10 after
1024 '../skia/skia.gyp:skia', 1024 '../skia/skia.gyp:skia',
1025 '../testing/gtest.gyp:gtest', 1025 '../testing/gtest.gyp:gtest',
1026 '../third_party/icu/icu.gyp:icui18n', 1026 '../third_party/icu/icu.gyp:icui18n',
1027 '../third_party/icu/icu.gyp:icuuc', 1027 '../third_party/icu/icu.gyp:icuuc',
1028 '../third_party/libxml/libxml.gyp:libxml', 1028 '../third_party/libxml/libxml.gyp:libxml',
1029 ], 1029 ],
1030 'include_dirs': [ 1030 'include_dirs': [
1031 '..', 1031 '..',
1032 ], 1032 ],
1033 'sources': [ 1033 'sources': [
1034 'test/nacl/nacl_test.cc', 1034 # TODO(sehr): reenable when this tests something we plan to release.
1035 #'test/nacl/nacl_test.cc',
1035 'test/nacl/nacl_sandbox_test.cc' 1036 'test/nacl/nacl_sandbox_test.cc'
1036 ], 1037 ],
1037 'conditions': [ 1038 'conditions': [
1038 ['OS=="win"', { 1039 ['OS=="win"', {
1039 'dependencies': [ 1040 'dependencies': [
1040 'chrome_nacl_win64', 1041 'chrome_nacl_win64',
1041 'nacl_security_tests', # run time dependency 1042 'nacl_security_tests', # run time dependency
1042 'nacl_security_tests64', # run time dependency 1043 'nacl_security_tests64', # run time dependency
1043 'test_support_common', 1044 'test_support_common',
1044 '../google_update/google_update.gyp:google_update', 1045 '../google_update/google_update.gyp:google_update',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
1091 '../net/net.gyp:net', 1092 '../net/net.gyp:net',
1092 '../skia/skia.gyp:skia', 1093 '../skia/skia.gyp:skia',
1093 '../testing/gtest.gyp:gtest', 1094 '../testing/gtest.gyp:gtest',
1094 '../third_party/icu/icu.gyp:icui18n', 1095 '../third_party/icu/icu.gyp:icui18n',
1095 '../third_party/icu/icu.gyp:icuuc', 1096 '../third_party/icu/icu.gyp:icuuc',
1096 ], 1097 ],
1097 'include_dirs': [ 1098 'include_dirs': [
1098 '..', 1099 '..',
1099 ], 1100 ],
1100 'sources': [ 1101 'sources': [
1101 'test/nacl/nacl_test.cc', 1102 # TODO(sehr): reenable when this tests something we plan to release.
1103 #'test/nacl/nacl_test.cc',
1102 'test/nacl/nacl_ui_test.cc', 1104 'test/nacl/nacl_ui_test.cc',
1103 ], 1105 ],
1104 'conditions': [ 1106 'conditions': [
1105 ['OS=="win"', { 1107 ['OS=="win"', {
1106 'dependencies': [ 1108 'dependencies': [
1107 'chrome_nacl_win64', 1109 'chrome_nacl_win64',
1108 'security_tests', # run time dependency 1110 'security_tests', # run time dependency
1109 'test_support_common', 1111 'test_support_common',
1110 '../google_update/google_update.gyp:google_update', 1112 '../google_update/google_update.gyp:google_update',
1111 # run time dependency 1113 # run time dependency
(...skipping 2791 matching lines...) Expand 10 before | Expand all | Expand 10 after
3903 ] 3905 ]
3904 }], # 'coverage!=0' 3906 }], # 'coverage!=0'
3905 ], # 'conditions' 3907 ], # 'conditions'
3906 } 3908 }
3907 3909
3908 # Local Variables: 3910 # Local Variables:
3909 # tab-width:2 3911 # tab-width:2
3910 # indent-tabs-mode:nil 3912 # indent-tabs-mode:nil
3911 # End: 3913 # End:
3912 # vim: set expandtab tabstop=2 shiftwidth=2: 3914 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698