| 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 Import('bdict_reader_o', 'bdict_writer_o') | 6 Import('bdict_reader_o', 'bdict_writer_o') |
| 7 | 7 |
| 8 env = env.Clone() | 8 env = env.Clone() |
| 9 | 9 |
| 10 env.SConscript([ | 10 env.SConscript([ |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 379 '$CHROME_DIR/common/file_descriptor_set_unittest.cc' | 379 '$CHROME_DIR/common/file_descriptor_set_unittest.cc' |
| 380 ) | 380 ) |
| 381 | 381 |
| 382 if not env.Bit('windows'): | 382 if not env.Bit('windows'): |
| 383 # TODO(port): Port these. | 383 # TODO(port): Port these. |
| 384 input_files.Remove( | 384 input_files.Remove( |
| 385 '$CHROME_DIR/browser/bookmarks/bookmark_context_menu_test.cc', | 385 '$CHROME_DIR/browser/bookmarks/bookmark_context_menu_test.cc', |
| 386 '$CHROME_DIR/browser/bookmarks/bookmark_drag_data_unittest.cc', | 386 '$CHROME_DIR/browser/bookmarks/bookmark_drag_data_unittest.cc', |
| 387 '$CHROME_DIR/browser/bookmarks/bookmark_folder_tree_model_unittest.cc', | 387 '$CHROME_DIR/browser/bookmarks/bookmark_folder_tree_model_unittest.cc', |
| 388 '$CHROME_DIR/browser/bookmarks/bookmark_table_model_unittest.cc', | 388 '$CHROME_DIR/browser/bookmarks/bookmark_table_model_unittest.cc', |
| 389 '$CHROME_DIR/browser/bookmarks/bookmark_utils_unittest.cc', | |
| 390 '$CHROME_DIR/browser/browser_commands_unittest.cc', | 389 '$CHROME_DIR/browser/browser_commands_unittest.cc', |
| 391 # This test is mostly about renaming downloads to safe file names. As such | 390 # This test is mostly about renaming downloads to safe file names. As such |
| 392 # we don't need/want to port it to linux. We might want to write our own | 391 # we don't need/want to port it to linux. We might want to write our own |
| 393 # tests for the download manager on linux, though. | 392 # tests for the download manager on linux, though. |
| 394 '$CHROME_DIR/browser/download/download_manager_unittest.cc', | 393 '$CHROME_DIR/browser/download/download_manager_unittest.cc', |
| 395 '$CHROME_DIR/browser/extensions/user_script_master_unittest.cc', | 394 '$CHROME_DIR/browser/extensions/user_script_master_unittest.cc', |
| 396 '$CHROME_DIR/browser/importer/firefox_importer_unittest.cc', | 395 '$CHROME_DIR/browser/importer/firefox_importer_unittest.cc', |
| 397 '$CHROME_DIR/browser/importer/importer_unittest.cc', | 396 '$CHROME_DIR/browser/importer/importer_unittest.cc', |
| 398 '$CHROME_DIR/browser/login_prompt_unittest.cc', | 397 '$CHROME_DIR/browser/login_prompt_unittest.cc', |
| 399 '$CHROME_DIR/browser/net/resolve_proxy_msg_helper_unittest.cc', | |
| 400 '$CHROME_DIR/browser/password_manager/encryptor_unittest.cc', | 398 '$CHROME_DIR/browser/password_manager/encryptor_unittest.cc', |
| 401 '$CHROME_DIR/browser/password_manager/password_form_manager_unittest.cc', | 399 '$CHROME_DIR/browser/password_manager/password_form_manager_unittest.cc', |
| 402 '$CHROME_DIR/browser/printing/page_number_unittest.cc', | 400 '$CHROME_DIR/browser/printing/page_number_unittest.cc', |
| 403 '$CHROME_DIR/browser/printing/page_overlays_unittest.cc', | 401 '$CHROME_DIR/browser/printing/page_overlays_unittest.cc', |
| 404 '$CHROME_DIR/browser/printing/print_job_unittest.cc', | 402 '$CHROME_DIR/browser/printing/print_job_unittest.cc', |
| 405 '$CHROME_DIR/browser/printing/win_printing_context_unittest.cc', | 403 '$CHROME_DIR/browser/printing/win_printing_context_unittest.cc', |
| 406 '$CHROME_DIR/browser/profile_manager_unittest.cc', | |
| 407 '$CHROME_DIR/browser/rlz/rlz_unittest.cc', | 404 '$CHROME_DIR/browser/rlz/rlz_unittest.cc', |
| 408 '$CHROME_DIR/browser/sessions/session_service_unittest.cc', | 405 '$CHROME_DIR/browser/sessions/session_service_unittest.cc', |
| 409 '$CHROME_DIR/browser/sessions/tab_restore_service_unittest.cc', | |
| 410 '$CHROME_DIR/browser/tabs/tab_strip_model_unittest.cc', | 406 '$CHROME_DIR/browser/tabs/tab_strip_model_unittest.cc', |
| 411 '$CHROME_DIR/browser/views/bookmark_editor_view_unittest.cc', | 407 '$CHROME_DIR/browser/views/bookmark_editor_view_unittest.cc', |
| 412 '$CHROME_DIR/browser/views/keyword_editor_view_unittest.cc', | 408 '$CHROME_DIR/browser/views/keyword_editor_view_unittest.cc', |
| 413 '$CHROME_DIR/browser/webdata/web_database_unittest.cc', | 409 '$CHROME_DIR/browser/webdata/web_database_unittest.cc', |
| 414 '$CHROME_DIR/browser/window_sizer_unittest.cc', | 410 '$CHROME_DIR/browser/window_sizer_unittest.cc', |
| 415 '$CHROME_DIR/common/chrome_plugin_unittest.cc', | 411 '$CHROME_DIR/common/chrome_plugin_unittest.cc', |
| 416 '$CHROME_DIR/common/gfx/emf_unittest.cc', | 412 '$CHROME_DIR/common/gfx/emf_unittest.cc', |
| 417 '$CHROME_DIR/common/gfx/icon_util_unittest.cc', | 413 '$CHROME_DIR/common/gfx/icon_util_unittest.cc', |
| 418 '$CHROME_DIR/common/os_exchange_data_unittest.cc', | 414 '$CHROME_DIR/common/os_exchange_data_unittest.cc', |
| 419 '$CHROME_DIR/common/time_format_unittest.cc', | |
| 420 '$CHROME_DIR/common/win_util_unittest.cc', | 415 '$CHROME_DIR/common/win_util_unittest.cc', |
| 421 '$CHROME_DIR/test/browser_with_test_window_test.cc', | 416 '$CHROME_DIR/test/browser_with_test_window_test.cc', |
| 422 | 417 |
| 423 # Commented out for now because googleurl_tests doesn't build with | 418 # Commented out for now because googleurl_tests doesn't build with |
| 424 # gtest; see ../build/SConscript.googleurl. | 419 # gtest; see ../build/SConscript.googleurl. |
| 425 #'$GOOGLEURL_DIR/googleurl_tests.lib', | 420 #'$GOOGLEURL_DIR/googleurl_tests.lib', |
| 426 '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', | 421 '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', |
| 427 | 422 |
| 428 '$CHROME_DIR/browser/browser_resources.res', | 423 '$CHROME_DIR/browser/browser_resources.res', |
| 429 '$CHROME_DIR/test/data/resource.res', | 424 '$CHROME_DIR/test/data/resource.res', |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 549 '../../third_party/hunspell/using_hunspell.vsprops', | 544 '../../third_party/hunspell/using_hunspell.vsprops', |
| 550 '../../../third_party/npapi/using_npapi.vsprops', | 545 '../../../third_party/npapi/using_npapi.vsprops', |
| 551 ]) | 546 ]) |
| 552 | 547 |
| 553 p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', | 548 p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', |
| 554 'Debug|Win32', | 549 'Debug|Win32', |
| 555 tools=[ | 550 tools=[ |
| 556 MSVSTool('VCCLCompilerTool', | 551 MSVSTool('VCCLCompilerTool', |
| 557 UsePrecompiledHeader='1'), | 552 UsePrecompiledHeader='1'), |
| 558 ]) | 553 ]) |
| OLD | NEW |