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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/SConscript.unit_tests

Issue 2891: Include chrome/SConscript.unit_tests in Linux build.... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 12 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/SConscript ('k') | chrome/browser/net/dns_host_info_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/SConscript.unit_tests
===================================================================
--- chrome/SConscript.unit_tests (revision 2262)
+++ chrome/SConscript.unit_tests (working copy)
@@ -47,173 +47,204 @@
'v8',
'zlib',
- 'activex_shim',
'WTF',
'V8Bindings',
- 'WebCore',
'default_plugin',
'Glue',
'JavaScriptCore_pcre',
- 'Port',
],
)
-env_test.Prepend(
- LINKFLAGS = [
- '/INCREMENTAL',
+if env_test['PLATFORM'] == 'win32':
+ # TODO(port): Port or mark as Windows-specific.
+ env_test.Prepend(
+ LIBS = [
+ 'WebCore',
+ 'Port',
+ ],
+ )
- '/safeseh',
- '/dynamicbase',
- '/ignore:4199',
- '/nxcompat',
+if env_test['PLATFORM'] == 'win32':
+ env_test.Prepend(
+ LINKFLAGS = [
+ '/INCREMENTAL',
- '/MANIFEST',
- '/DELAYLOAD:"ws2_32.dll"',
- '/DELAYLOAD:"dwmapi.dll"',
- '/DELAYLOAD:"uxtheme.dll"',
+ '/safeseh',
+ '/dynamicbase',
+ '/ignore:4199',
+ '/nxcompat',
- '/DEBUG',
- '/MACHINE:X86',
- '/FIXED:No',
- ],
- LIBS = [
- 'winmm.lib',
- 'rpcrt4.lib',
- 'oleacc.lib',
- 'comsupp.lib',
- ],
-)
+ '/MANIFEST',
+ '/DELAYLOAD:"ws2_32.dll"',
+ '/DELAYLOAD:"dwmapi.dll"',
+ '/DELAYLOAD:"uxtheme.dll"',
-libs = [
- 'snapshotv8.lib',
+ '/DEBUG',
+ '/MACHINE:X86',
+ '/FIXED:No',
+ ],
+ LIBS = [
+ 'activex_shim',
- 'browser/browser.lib',
- 'browser/views/browser_views.lib',
- 'browser/debugger/debugger.lib',
- 'common/common.lib',
- 'installer/util/util.lib',
- 'libjscre.lib',
- 'plugin/plugin.lib',
- 'renderer/renderer.lib',
- 'test/chrome_plugin/test_chrome_plugin.lib',
- 'third_party/hunspell/hunspell.lib',
- 'third_party/sqlite/sqlite.lib',
- 'views/views.lib',
-]
+ 'winmm.lib',
+ 'rpcrt4.lib',
+ 'oleacc.lib',
+ 'comsupp.lib',
+ ],
+ )
-unit_test_files = [
- 'browser/autocomplete/autocomplete_unittest.cc',
- 'browser/autocomplete/history_contents_provider_unittest.cc',
- 'browser/autocomplete/history_url_provider_unittest.cc',
- 'browser/autocomplete/keyword_provider_unittest.cc',
- 'browser/back_forward_menu_model_unittest.cc',
- 'browser/bookmark_bar_context_menu_controller_test.cc',
- 'browser/bookmarks/bookmark_bar_unittest.cc',
- 'browser/bookmarks/bookmark_drag_data_unittest.cc',
- 'browser/cache_manager_host_unittest.cc',
- 'browser/chrome_thread_unittest.cc',
- 'browser/controller_unittest.cc',
- 'browser/download_manager_unittest.cc',
- 'browser/encryptor_unittest.cc',
- 'browser/firefox_importer_unittest.cc',
- 'browser/google_url_tracker_unittest.cc',
- 'browser/history/expire_history_backend_unittest.cc',
- 'browser/history/history_backend_unittest.cc',
- 'browser/history/history_querying_unittest.cc',
- 'browser/history/history_types_unittest.cc',
- 'browser/history/history_unittest.cc',
- 'browser/history/query_parser_unittest.cc',
- 'browser/history/snippet_unittest.cc',
- 'browser/history/starred_url_database_unittest.cc',
- 'browser/history/text_database_manager_unittest.cc',
- 'browser/history/text_database_unittest.cc',
- 'browser/history/thumbnail_database_unittest.cc',
- 'browser/history/url_database_unittest.cc',
- 'browser/history/visit_database_unittest.cc',
- 'browser/history/visit_tracker_unittest.cc',
- 'browser/importer_unittest.cc',
- 'browser/metrics_log_unittest.cc',
- 'browser/metrics_response_unittest.cc',
- 'browser/navigation_controller_unittest.cc',
- 'browser/net/dns_host_info_unittest.cc',
- 'browser/net/dns_master_unittest.cc',
- 'browser/password_form_manager_unittest.cc',
- 'browser/printing/page_number_unittest.cc',
- 'browser/printing/page_overlays_unittest.cc',
- 'browser/printing/page_range_unittest.cc',
- 'browser/printing/page_setup_unittest.cc',
- 'browser/printing/units_unittest.cc',
- 'browser/printing/win_printing_context_unittest.cc',
- 'browser/profile_manager_unittest.cc',
- 'browser/renderer_security_policy_unittest.cc',
- 'browser/resource_dispatcher_host_unittest.cc',
- 'browser/rlz/rlz_unittest.cc',
- 'browser/safe_browsing/bloom_filter_unittest.cc',
- 'browser/safe_browsing/chunk_range_unittest.cc',
- 'browser/safe_browsing/protocol_manager_unittest.cc',
- 'browser/safe_browsing/protocol_parser_unittest.cc',
- 'browser/safe_browsing/safe_browsing_database_unittest.cc',
- 'browser/safe_browsing/safe_browsing_util_unittest.cc',
- 'browser/save_package_unittest.cc',
- 'browser/session_backend_unittest.cc',
- 'browser/session_service_test_helper.cc',
- 'browser/session_service_unittest.cc',
- 'browser/site_instance_unittest.cc',
- 'browser/tabs/tab_strip_model_unittest.cc',
- 'browser/template_url_model_unittest.cc',
- 'browser/template_url_parser_unittest.cc',
- 'browser/template_url_unittest.cc',
- 'browser/title_chomper_unittest.cc',
- 'browser/url_fetcher_unittest.cc',
- 'browser/url_fixer_upper_unittest.cc',
- 'browser/views/bookmark_bar_view_test.cc',
- 'browser/views/bookmark_editor_view_unittest.cc',
- 'browser/views/keyword_editor_view_unittest.cc',
- 'browser/visitedlink_unittest.cc',
- 'browser/web_contents_unittest.cc',
- 'browser/webdata/web_database_unittest.cc',
- 'browser/window_sizer_unittest.cc',
- 'common/animation_unittest.cc',
- 'common/bzip2_unittest.cc',
- 'common/chrome_plugin_unittest.cc',
- 'common/gfx/emf_unittest.cc',
- 'common/gfx/icon_util_unittest.cc',
- 'common/gfx/url_elider_unittest.cc',
- 'common/ipc_message_unittest.cc',
- 'common/ipc_sync_channel_unittest.cc',
- 'common/ipc_sync_message_unittest.cc',
- 'common/jpeg_codec_unittest.cc',
- 'common/json_value_serializer_unittest.cc',
- 'common/l10n_util_unittest.cc',
- 'common/mru_cache_unittest.cc',
- 'common/notification_service_unittest.cc',
- 'common/os_exchange_data_unittest.cc',
- 'common/pref_member_unittest.cc',
- 'common/pref_service_unittest.cc',
- 'common/resource_dispatcher_unittest.cc',
- 'common/time_format_unittest.cc',
- 'common/win_util_unittest.cc',
- 'renderer/net/render_dns_master_unittest.cc',
- 'renderer/net/render_dns_queue_unittest.cc',
- 'renderer/spellcheck_unittest.cc',
- 'views/focus_manager_unittest.cc',
- 'views/grid_layout_unittest.cc',
- 'views/view_unittest.cc',
- 'test/test_notification_tracker.cc',
- 'test/testing_profile.cc',
- 'test/ui/view_event_test_base.cc',
- 'test/unit/run_all_unittests.cc',
- # Commented out for now because googleurl_tests doesn't build with
- # gtest; see ../build/SConscript.googleurl.
- #'$GOOGLEURL_DIR/googleurl_tests.lib',
- '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX',
+ libs = [
+ 'snapshotv8.lib',
- env_test['BROWSER_RES'],
- env_test['TEST_DATA_RES'],
-]
+ 'browser/browser.lib',
+ 'browser/views/browser_views.lib',
+ 'browser/debugger/debugger.lib',
+ 'common/common.lib',
+ 'installer/util/util.lib',
+ 'libjscre.lib',
+ 'plugin/plugin.lib',
+ 'renderer/renderer.lib',
+ 'test/chrome_plugin/test_chrome_plugin.lib',
+ 'third_party/hunspell/hunspell.lib',
+ 'third_party/sqlite/sqlite.lib',
+ 'views/views.lib',
+ ]
-unit_tests = env_test.ChromeTestProgram('unit_tests', unit_test_files + libs)
+unit_test_files = []
-i = env_test.Install('$TARGET_ROOT', unit_tests)
-Alias('chrome', i)
+if env_test['PLATFORM'] in ('posix', 'win32'):
+ # TODO(port): Port to Mac.
+ unit_test_files.extend([
+ 'browser/net/dns_host_info_unittest.cc',
+ 'browser/safe_browsing/chunk_range_unittest.cc',
+ 'browser/safe_browsing/protocol_parser_unittest.cc',
+ 'browser/safe_browsing/safe_browsing_util_unittest.cc',
+ 'test/unit/run_all_unittests.cc',
+ ])
+ env_test.Prepend(
+ LIBS = [
+ 'browser',
+ ],
+ )
+
+if env_test['PLATFORM'] == 'win32':
+ # TODO(port): Port these.
+ unit_test_files.extend([
+ 'browser/autocomplete/autocomplete_unittest.cc',
+ 'browser/autocomplete/history_contents_provider_unittest.cc',
+ 'browser/autocomplete/history_url_provider_unittest.cc',
+ 'browser/autocomplete/keyword_provider_unittest.cc',
+ 'browser/back_forward_menu_model_unittest.cc',
+ 'browser/bookmark_bar_context_menu_controller_test.cc',
+ 'browser/bookmarks/bookmark_bar_unittest.cc',
+ 'browser/bookmarks/bookmark_drag_data_unittest.cc',
+ 'browser/cache_manager_host_unittest.cc',
+ 'browser/chrome_thread_unittest.cc',
+ 'browser/controller_unittest.cc',
+ 'browser/download_manager_unittest.cc',
+ 'browser/encryptor_unittest.cc',
+ 'browser/firefox_importer_unittest.cc',
+ 'browser/google_url_tracker_unittest.cc',
+ 'browser/history/expire_history_backend_unittest.cc',
+ 'browser/history/history_backend_unittest.cc',
+ 'browser/history/history_querying_unittest.cc',
+ 'browser/history/history_types_unittest.cc',
+ 'browser/history/history_unittest.cc',
+ 'browser/history/query_parser_unittest.cc',
+ 'browser/history/snippet_unittest.cc',
+ 'browser/history/starred_url_database_unittest.cc',
+ 'browser/history/text_database_manager_unittest.cc',
+ 'browser/history/text_database_unittest.cc',
+ 'browser/history/thumbnail_database_unittest.cc',
+ 'browser/history/url_database_unittest.cc',
+ 'browser/history/visit_database_unittest.cc',
+ 'browser/history/visit_tracker_unittest.cc',
+ 'browser/importer_unittest.cc',
+ 'browser/metrics_log_unittest.cc',
+ 'browser/metrics_response_unittest.cc',
+ 'browser/navigation_controller_unittest.cc',
+ 'browser/net/dns_master_unittest.cc',
+ 'browser/password_form_manager_unittest.cc',
+ 'browser/printing/page_number_unittest.cc',
+ 'browser/printing/page_overlays_unittest.cc',
+ 'browser/printing/page_range_unittest.cc',
+ 'browser/printing/page_setup_unittest.cc',
+ 'browser/printing/units_unittest.cc',
+ 'browser/printing/win_printing_context_unittest.cc',
+ 'browser/profile_manager_unittest.cc',
+ 'browser/renderer_security_policy_unittest.cc',
+ 'browser/resource_dispatcher_host_unittest.cc',
+ 'browser/rlz/rlz_unittest.cc',
+ 'browser/safe_browsing/bloom_filter_unittest.cc',
+ 'browser/safe_browsing/protocol_manager_unittest.cc',
+ 'browser/safe_browsing/safe_browsing_database_unittest.cc',
+ 'browser/save_package_unittest.cc',
+ 'browser/session_backend_unittest.cc',
+ 'browser/session_service_test_helper.cc',
+ 'browser/session_service_unittest.cc',
+ 'browser/site_instance_unittest.cc',
+ 'browser/tabs/tab_strip_model_unittest.cc',
+ 'browser/template_url_model_unittest.cc',
+ 'browser/template_url_parser_unittest.cc',
+ 'browser/template_url_unittest.cc',
+ 'browser/title_chomper_unittest.cc',
+ 'browser/url_fetcher_unittest.cc',
+ 'browser/url_fixer_upper_unittest.cc',
+ 'browser/views/bookmark_bar_view_test.cc',
+ 'browser/views/bookmark_editor_view_unittest.cc',
+ 'browser/views/keyword_editor_view_unittest.cc',
+ 'browser/visitedlink_unittest.cc',
+ 'browser/web_contents_unittest.cc',
+ 'browser/webdata/web_database_unittest.cc',
+ 'browser/window_sizer_unittest.cc',
+ 'common/animation_unittest.cc',
+ 'common/bzip2_unittest.cc',
+ 'common/chrome_plugin_unittest.cc',
+ 'common/gfx/emf_unittest.cc',
+ 'common/gfx/icon_util_unittest.cc',
+ 'common/gfx/url_elider_unittest.cc',
+ 'common/ipc_message_unittest.cc',
+ 'common/ipc_sync_channel_unittest.cc',
+ 'common/ipc_sync_message_unittest.cc',
+ 'common/jpeg_codec_unittest.cc',
+ 'common/json_value_serializer_unittest.cc',
+ 'common/l10n_util_unittest.cc',
+ 'common/mru_cache_unittest.cc',
+ 'common/notification_service_unittest.cc',
+ 'common/os_exchange_data_unittest.cc',
+ 'common/pref_member_unittest.cc',
+ 'common/pref_service_unittest.cc',
+ 'common/resource_dispatcher_unittest.cc',
+ 'common/time_format_unittest.cc',
+ 'common/win_util_unittest.cc',
+ 'renderer/net/render_dns_master_unittest.cc',
+ 'renderer/net/render_dns_queue_unittest.cc',
+ 'renderer/spellcheck_unittest.cc',
+ 'views/focus_manager_unittest.cc',
+ 'views/grid_layout_unittest.cc',
+ 'views/view_unittest.cc',
+ 'test/test_notification_tracker.cc',
+ 'test/testing_profile.cc',
+ 'test/ui/view_event_test_base.cc',
+ # Commented out for now because googleurl_tests doesn't build with
+ # gtest; see ../build/SConscript.googleurl.
+ #'$GOOGLEURL_DIR/googleurl_tests.lib',
+ '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX',
+
+ env_test['BROWSER_RES'],
+ env_test['TEST_DATA_RES'],
+ ])
+
+if env_test['PLATFORM'] in ('posix', 'win32'):
+ # TODO(port): This should work on all platforms.
+
+ test_program_files = unit_test_files
+ if env_test['PLATFORM'] == 'win32':
+ # This is probably Windows-specific.
+ test_program_files.extend(libs)
+ unit_tests = env_test.ChromeTestProgram('unit_tests', test_program_files)
+
+ i = env_test.Install('$TARGET_ROOT', unit_tests)
+ Alias('chrome', i)
+
« no previous file with comments | « chrome/SConscript ('k') | chrome/browser/net/dns_host_info_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698