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

Side by Side Diff: chrome/test/ui/ui_tests.scons

Issue 16545: Butcher some files to make ui_tests run 0 tests on Linux. (Closed)
Patch Set: typo fix Created 11 years, 11 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
« no previous file with comments | « chrome/test/ui/ui_test_suite.h ('k') | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2006-2008 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 Import('env') 5 Import('env')
6 6
7 env = env.Clone() 7 env = env.Clone()
8 8
9 env.SConscript([ 9 env.SConscript([
10 '$BASE_DIR/using_base.scons', 10 '$BASE_DIR/using_base.scons',
(...skipping 16 matching lines...) Expand all
27 27
28 env.Prepend( 28 env.Prepend(
29 CPPPATH = [ 29 CPPPATH = [
30 '$CHROME_DIR/app/resources', 30 '$CHROME_DIR/app/resources',
31 '$CHROME_SRC_DIR', 31 '$CHROME_SRC_DIR',
32 ], 32 ],
33 CPPDEFINES = [ 33 CPPDEFINES = [
34 'UI_TEST', 34 'UI_TEST',
35 ], 35 ],
36 LIBS = [ 36 LIBS = [
37 'automation',
38 'browser', 37 'browser',
39 'browser_views',
40 'common', 38 'common',
41 'npapi_layout_test_plugin', 39 'sqlite',
42 'npapi_test_plugin', 40 ]
43 'port',
44 'security_tests',
45 ],
46 ) 41 )
47 42
48 if env.Bit('windows'): 43 if env.Bit('windows'):
44 # TODO(port): split these into upper env.Prepend (for portable libs) and
45 # lower env.Prepend (for win-specific libs).
46 env.Prepend(
47 LIBS = [
48 'automation',
49 'browser_views',
50 'npapi_layout_test_plugin',
51 'npapi_test_plugin',
52 'port',
53 'security_tests',
54 ],
55 )
56
57 if env.Bit('windows'):
49 env.Prepend( 58 env.Prepend(
50 CPPPATH = [ 59 CPPPATH = [
51 '$CHROME_DIR/tools/build/win', 60 '$CHROME_DIR/tools/build/win',
52 ], 61 ],
53 LINKFLAGS = [ 62 LINKFLAGS = [
54 '/INCREMENTAL', 63 '/INCREMENTAL',
55 64
56 '/safeseh', 65 '/safeseh',
57 '/dynamicbase', 66 '/dynamicbase',
58 '/ignore:4199', 67 '/ignore:4199',
(...skipping 10 matching lines...) Expand all
69 ], 78 ],
70 LIBS = [ 79 LIBS = [
71 'comsupp', 80 'comsupp',
72 'oleacc', 81 'oleacc',
73 'rpcrt4', 82 'rpcrt4',
74 'winmm', 83 'winmm',
75 ], 84 ],
76 ) 85 )
77 86
78 ui_test_files = [ 87 ui_test_files = [
88 'run_all_unittests.cc',
89 'ui_test.cc',
90 'ui_test_suite.cc',
91 ]
92
93 if env.Bit('windows'):
94 # TODO(port): mark which of these work and which don't.
95 ui_test_files.extend([
96 'history_uitest.cc',
79 'inspector_controller_uitest.cc', 97 'inspector_controller_uitest.cc',
80 'layout_plugin_uitest.cpp', 98 'layout_plugin_uitest.cpp',
99 'npapi_test_helper.cc',
81 'npapi_uitest.cpp', 100 'npapi_uitest.cpp',
82 'omnibox_uitest.cc', 101 'omnibox_uitest.cc',
83 'run_all_unittests.cc', 102
84 'sandbox_uitests.cc', 103 'sandbox_uitests.cc',
85 'ui_test.cc',
86 'ui_test_suite.cc',
87 'history_uitest.cc',
88 'npapi_test_helper.cc',
89 104
90 '$CHROME_DIR/app/chrome_main_uitest.cc', 105 '$CHROME_DIR/app/chrome_main_uitest.cc',
91 '$CHROME_DIR/browser/browser_uitest.cc', 106 '$CHROME_DIR/browser/browser_uitest.cc',
92 '$CHROME_DIR/browser/crash_recovery_uitest.cc', 107 '$CHROME_DIR/browser/crash_recovery_uitest.cc',
93 '$CHROME_DIR/browser/download/download_uitest.cc', 108 '$CHROME_DIR/browser/download/download_uitest.cc',
94 '$CHROME_DIR/browser/download/save_page_uitest.cc', 109 '$CHROME_DIR/browser/download/save_page_uitest.cc',
95 '$CHROME_DIR/browser/errorpage_uitest.cc', 110 '$CHROME_DIR/browser/errorpage_uitest.cc',
96 '$CHROME_DIR/browser/history/redirect_uitest.cc', 111 '$CHROME_DIR/browser/history/redirect_uitest.cc',
97 '$CHROME_DIR/browser/iframe_uitest.cc', 112 '$CHROME_DIR/browser/iframe_uitest.cc',
98 '$CHROME_DIR/browser/images_uitest.cc', 113 '$CHROME_DIR/browser/images_uitest.cc',
(...skipping 15 matching lines...) Expand all
114 '$CHROME_DIR/test/accessibility/accessibility_tests.cc', 129 '$CHROME_DIR/test/accessibility/accessibility_tests.cc',
115 '$CHROME_DIR/test/accessibility/accessibility_util.cc', 130 '$CHROME_DIR/test/accessibility/accessibility_util.cc',
116 '$CHROME_DIR/test/accessibility/browser_impl.cc', 131 '$CHROME_DIR/test/accessibility/browser_impl.cc',
117 '$CHROME_DIR/test/accessibility/keyboard_util.cc', 132 '$CHROME_DIR/test/accessibility/keyboard_util.cc',
118 '$CHROME_DIR/test/accessibility/registry_util.cc', 133 '$CHROME_DIR/test/accessibility/registry_util.cc',
119 '$CHROME_DIR/test/accessibility/tab_impl.cc', 134 '$CHROME_DIR/test/accessibility/tab_impl.cc',
120 '$CHROME_DIR/test/automation/automation_proxy_uitest.cc', 135 '$CHROME_DIR/test/automation/automation_proxy_uitest.cc',
121 '$CHROME_DIR/test/perf/mem_usage.cc', 136 '$CHROME_DIR/test/perf/mem_usage.cc',
122 '$CHROME_DIR/test/reliability/page_load_test$OBJSUFFIX', 137 '$CHROME_DIR/test/reliability/page_load_test$OBJSUFFIX',
123 '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', 138 '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX',
124 ] 139 ])
125 140
126 if env.Bit('windows'): 141 # Windows-specific tests.
127 ui_test_files.extend([ 142 ui_test_files.extend([
128 '$CHROME_DIR/browser/views/find_bar_win_interactive_uitest.cc', 143 '$CHROME_DIR/browser/views/find_bar_win_interactive_uitest.cc',
129 '$CHROME_DIR/browser/views/find_bar_win_uitest.cc', 144 '$CHROME_DIR/browser/views/find_bar_win_uitest.cc',
130 ]) 145 ])
131 146
132 env.ChromeTestProgram('ui_tests', ui_test_files) 147 env.ChromeTestProgram('ui_tests', ui_test_files)
133 148
134 env.ChromeMSVSProject('$CHROME_DIR/test/ui/ui_tests.vcproj', 149 env.ChromeMSVSProject('$CHROME_DIR/test/ui/ui_tests.vcproj',
135 dependencies = [ 150 dependencies = [
136 ('$WEBKIT_DIR/glue/plugins/test/' + 151 ('$WEBKIT_DIR/glue/plugins/test/' +
137 'npapi_test_plugin.vcproj'), 152 'npapi_test_plugin.vcproj'),
138 '$CHROME_DIR/test/automation/automation.vcproj', 153 '$CHROME_DIR/test/automation/automation.vcproj',
139 '$BASE_DIR/build/base.vcproj', 154 '$BASE_DIR/build/base.vcproj',
140 '$BZIP2_DIR/bzip2.vcproj', 155 '$BZIP2_DIR/bzip2.vcproj',
141 '$NET_DIR/build/net.vcproj', 156 '$NET_DIR/build/net.vcproj',
142 '$CHROME_DIR/browser/browser.vcproj', 157 '$CHROME_DIR/browser/browser.vcproj',
(...skipping 13 matching lines...) Expand all
156 '$SKIA_DIR/skia.vcproj', 171 '$SKIA_DIR/skia.vcproj',
157 ('$CHROME_DIR/test/security_tests/' + 172 ('$CHROME_DIR/test/security_tests/' +
158 'security_tests.vcproj'), 173 'security_tests.vcproj'),
159 '$CHROME_DIR/app/locales/zh-TW.vcproj', 174 '$CHROME_DIR/app/locales/zh-TW.vcproj',
160 '$GOOGLEURL_DIR/build/googleurl.vcproj', 175 '$GOOGLEURL_DIR/build/googleurl.vcproj',
161 '$SDCH_DIR/sdch.vcproj', 176 '$SDCH_DIR/sdch.vcproj',
162 '$LIBXML_DIR/build/libxml.vcproj', 177 '$LIBXML_DIR/build/libxml.vcproj',
163 '$CHROME_DIR/browser/views/browser_views.vcproj', 178 '$CHROME_DIR/browser/views/browser_views.vcproj',
164 ], 179 ],
165 guid='{76235B67-1C27-4627-8A33-4B2E1EF93EDE}') 180 guid='{76235B67-1C27-4627-8A33-4B2E1EF93EDE}')
OLDNEW
« no previous file with comments | « chrome/test/ui/ui_test_suite.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698