| 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', 'env_res') | 5 Import('env', 'env_res') |
| 6 | 6 |
| 7 env = env.Clone() | 7 env = env.Clone() |
| 8 env_res = env_res.Clone() | 8 env_res = env_res.Clone() |
| 9 | 9 |
| 10 env.SConscript([ | 10 env.SConscript([ |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 env.Alias('webkit', i) | 223 env.Alias('webkit', i) |
| 224 | 224 |
| 225 test_files = [ | 225 test_files = [ |
| 226 'image_decoder_unittest.cc', | 226 'image_decoder_unittest.cc', |
| 227 'keyboard_unittest.cc', | 227 'keyboard_unittest.cc', |
| 228 'layout_test_controller_unittest.cc', | 228 'layout_test_controller_unittest.cc', |
| 229 'node_leak_test.cc', | 229 'node_leak_test.cc', |
| 230 'run_all_tests.cc', | 230 'run_all_tests.cc', |
| 231 'test_shell_test.cc', | 231 'test_shell_test.cc', |
| 232 'text_input_controller_unittest.cc', | 232 'text_input_controller_unittest.cc', |
| 233 '$SKIA_DIR/ext/convolver_unittest.cc', |
| 233 '$WEBKIT_DIR/glue/bookmarklet_unittest.cc', | 234 '$WEBKIT_DIR/glue/bookmarklet_unittest.cc', |
| 234 '$WEBKIT_DIR/glue/context_menu_unittest.cc', | 235 '$WEBKIT_DIR/glue/context_menu_unittest.cc', |
| 235 '$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc', | 236 '$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc', |
| 236 '$WEBKIT_DIR/glue/cpp_variant_unittest.cc', | 237 '$WEBKIT_DIR/glue/cpp_variant_unittest.cc', |
| 237 '$WEBKIT_DIR/glue/dom_operations_unittest.cc', | 238 '$WEBKIT_DIR/glue/dom_operations_unittest.cc', |
| 238 '$WEBKIT_DIR/glue/dom_serializer_unittest.cc', | 239 '$WEBKIT_DIR/glue/dom_serializer_unittest.cc', |
| 239 '$WEBKIT_DIR/glue/glue_serialize_unittest.cc', | 240 '$WEBKIT_DIR/glue/glue_serialize_unittest.cc', |
| 240 '$WEBKIT_DIR/glue/iframe_redirect_unittest.cc', | 241 '$WEBKIT_DIR/glue/iframe_redirect_unittest.cc', |
| 241 '$WEBKIT_DIR/glue/mimetype_unittest.cc', | 242 '$WEBKIT_DIR/glue/mimetype_unittest.cc', |
| 242 '$WEBKIT_DIR/glue/multipart_response_delegate_unittest.cc', | 243 '$WEBKIT_DIR/glue/multipart_response_delegate_unittest.cc', |
| 243 '$WEBKIT_DIR/glue/password_autocomplete_listener_unittest.cc', | 244 '$WEBKIT_DIR/glue/password_autocomplete_listener_unittest.cc', |
| 244 '$WEBKIT_DIR/glue/regular_expression_unittest.cc', | 245 '$WEBKIT_DIR/glue/regular_expression_unittest.cc', |
| 245 '$WEBKIT_DIR/glue/resource_fetcher_unittest.cc', | 246 '$WEBKIT_DIR/glue/resource_fetcher_unittest.cc', |
| 246 '$WEBKIT_DIR/glue/webframe_unittest.cc', | 247 '$WEBKIT_DIR/glue/webframe_unittest.cc', |
| 247 '$WEBKIT_DIR/tools/webcore_unit_tests/GKURL_unittest.cpp', | 248 '$WEBKIT_DIR/tools/webcore_unit_tests/GKURL_unittest.cpp', |
| 248 '$WEBKIT_DIR/tools/webcore_unit_tests/BMPImageDecoder_unittest.cpp', | 249 '$WEBKIT_DIR/tools/webcore_unit_tests/BMPImageDecoder_unittest.cpp', |
| 249 '$WEBKIT_DIR/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp', | 250 '$WEBKIT_DIR/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp', |
| 250 '$WEBKIT_DIR/tools/webcore_unit_tests/XBMImageDecoder_unittest.cpp', | 251 '$WEBKIT_DIR/tools/webcore_unit_tests/XBMImageDecoder_unittest.cpp', |
| 251 '$V8_DIR/snapshot-empty$OBJSUFFIX', | 252 '$V8_DIR/snapshot-empty$OBJSUFFIX', |
| 252 ] | 253 ] |
| 253 | 254 |
| 254 if env.Bit('windows'): | 255 if env.Bit('windows'): |
| 255 # TODO(port): put portable files in above test_files declaration. | 256 # TODO(port): put portable files in above test_files declaration. |
| 256 test_files.extend([ | 257 test_files.extend([ |
| 258 '$SKIA_DIR/ext/platform_canvas_unittest.cc', |
| 257 'plugin_tests.cc', | 259 'plugin_tests.cc', |
| 258 # Commented out until a regression is fixed and this file is restored. | 260 # Commented out until a regression is fixed and this file is restored. |
| 259 #'$WEBKIT_DIR/glue/stringimpl_unittest.cc', | 261 #'$WEBKIT_DIR/glue/stringimpl_unittest.cc', |
| 262 '$SKIA_DIR/ext/vector_canvas_unittest.cc', |
| 260 '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc', | 263 '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc', |
| 261 '$WEBKIT_DIR/tools/webcore_unit_tests/UniscribeHelper_unittest.cpp', | 264 '$WEBKIT_DIR/tools/webcore_unit_tests/UniscribeHelper_unittest.cpp', |
| 262 ]) | 265 ]) |
| 263 | 266 |
| 264 test_shell_tests = env.ChromeTestProgram('test_shell_tests', | 267 test_shell_tests = env.ChromeTestProgram('test_shell_tests', |
| 265 resources + test_files) | 268 resources + test_files) |
| 266 i = env.Install('$TARGET_ROOT', test_shell_tests) | 269 i = env.Install('$TARGET_ROOT', test_shell_tests) |
| 267 env.Alias('webkit', i) | 270 env.Alias('webkit', i) |
| 268 | 271 |
| 269 env.ChromeMSVSProject('$WEBKIT_DIR/tools/test_shell/test_shell_tests.vcproj', | 272 env.ChromeMSVSProject('$WEBKIT_DIR/tools/test_shell/test_shell_tests.vcproj', |
| (...skipping 19 matching lines...) Expand all Loading... |
| 289 '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', | 292 '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', |
| 290 '$LIBPNG_DIR/libpng.vcproj', | 293 '$LIBPNG_DIR/libpng.vcproj', |
| 291 '$WEBKIT_DIR/build/glue/glue.vcproj', | 294 '$WEBKIT_DIR/build/glue/glue.vcproj', |
| 292 '$SKIA_DIR/skia.vcproj', | 295 '$SKIA_DIR/skia.vcproj', |
| 293 '$GOOGLEURL_DIR/build/googleurl.vcproj', | 296 '$GOOGLEURL_DIR/build/googleurl.vcproj', |
| 294 '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', | 297 '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', |
| 295 '$SDCH_DIR/sdch.vcproj', | 298 '$SDCH_DIR/sdch.vcproj', |
| 296 '$LIBXSLT_DIR/build/libxslt.vcproj', | 299 '$LIBXSLT_DIR/build/libxslt.vcproj', |
| 297 ], | 300 ], |
| 298 guid='{E6766F81-1FCD-4CD7-BC16-E36964A14867}') | 301 guid='{E6766F81-1FCD-4CD7-BC16-E36964A14867}') |
| OLD | NEW |