OLD | NEW |
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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 '$CHROME_DIR/test/reliability/page_load_test$OBJSUFFIX', | 122 '$CHROME_DIR/test/reliability/page_load_test$OBJSUFFIX', |
123 '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', | 123 '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', |
124 ] | 124 ] |
125 | 125 |
126 if env.Bit('windows'): | 126 if env.Bit('windows'): |
127 ui_test_files.extend([ | 127 ui_test_files.extend([ |
128 '$CHROME_DIR/browser/views/find_bar_win_interactive_uitest.cc', | 128 '$CHROME_DIR/browser/views/find_bar_win_interactive_uitest.cc', |
129 '$CHROME_DIR/browser/views/find_bar_win_uitest.cc', | 129 '$CHROME_DIR/browser/views/find_bar_win_uitest.cc', |
130 ]) | 130 ]) |
131 | 131 |
132 env.ChromeTestProgram('ui_tests', ui_test_files) | 132 env.ChromeTestProgram('ui_tests', ui_test_files) |
| 133 |
| 134 env.ChromeMSVSProject('$CHROME_DIR/test/ui/ui_tests.vcproj', |
| 135 dependencies = [ |
| 136 ('$WEBKIT_DIR/glue/plugins/test/' + |
| 137 'npapi_test_plugin.vcproj'), |
| 138 '$CHROME_DIR/test/automation/automation.vcproj', |
| 139 '$BASE_DIR/build/base.vcproj', |
| 140 '$BZIP2_DIR/bzip2.vcproj', |
| 141 '$NET_DIR/build/net.vcproj', |
| 142 '$CHROME_DIR/browser/browser.vcproj', |
| 143 '$MODP_B64_DIR/modp_b64.vcproj', |
| 144 '$CHROME_DIR/app/chrome_exe.vcproj', |
| 145 '$ZLIB_DIR/zlib.vcproj', |
| 146 '$CHROME_DIR/common/common.vcproj', |
| 147 '$ICU38_DIR/build/icu.vcproj', |
| 148 '$CHROME_DIR/app/locales/he.vcproj', |
| 149 '$CHROME_DIR/app/locales/da.vcproj', |
| 150 '$BASE_DIR/build/base_gfx.vcproj', |
| 151 ('$WEBKIT_DIR/tools/npapi_layout_test_plugin/' + |
| 152 'npapi_layout_test_plugin.vcproj'), |
| 153 '$TESTING_DIR/gtest.vcproj', |
| 154 '$LIBPNG_DIR/libpng.vcproj', |
| 155 '$CHROME_DIR/app/locales/en-US.vcproj', |
| 156 '$SKIA_DIR/skia.vcproj', |
| 157 ('$CHROME_DIR/test/security_tests/' + |
| 158 'security_tests.vcproj'), |
| 159 '$CHROME_DIR/app/locales/zh-TW.vcproj', |
| 160 '$GOOGLEURL_DIR/build/googleurl.vcproj', |
| 161 '$SDCH_DIR/sdch.vcproj', |
| 162 '$LIBXML_DIR/build/libxml.vcproj', |
| 163 '$CHROME_DIR/browser/views/browser_views.vcproj', |
| 164 ], |
| 165 guid='{76235B67-1C27-4627-8A33-4B2E1EF93EDE}') |
OLD | NEW |