Chromium Code Reviews Chromium Code Reviews
Issue 10698126:
Move net_unittests and net_unittests_run inside a inside_chromium_build==1 condition. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| Index: net/net.gyp |
| diff --git a/net/net.gyp b/net/net.gyp |
| index 73c7fd4168711eab24eab04bf2408701b3c92152..0f7795868ae5539e429b625fc42a5f920bff768f 100644 |
| --- a/net/net.gyp |
| +++ b/net/net.gyp |
| @@ -1042,391 +1042,6 @@ |
| ], |
| }, |
| { |
| - 'target_name': 'net_unittests', |
| - 'type': '<(gtest_target_type)', |
| - 'dependencies': [ |
| - 'net', |
| - 'net_test_support', |
| - '../base/base.gyp:base', |
| - '../base/base.gyp:base_i18n', |
| - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |
| - '../build/temp_gyp/googleurl.gyp:googleurl', |
| - '../crypto/crypto.gyp:crypto', |
| - '../testing/gmock.gyp:gmock', |
| - '../testing/gtest.gyp:gtest', |
| - '../third_party/zlib/zlib.gyp:zlib', |
| - ], |
| - 'sources': [ |
| - 'base/address_list_unittest.cc', |
| - 'base/backoff_entry_unittest.cc', |
| - 'base/big_endian_unittest.cc', |
| - 'base/cert_database_nss_unittest.cc', |
| - 'base/cert_verify_proc_unittest.cc', |
| - 'base/crl_set_unittest.cc', |
| - 'base/data_url_unittest.cc', |
| - 'base/default_server_bound_cert_store_unittest.cc', |
| - 'base/directory_lister_unittest.cc', |
| - 'base/dnssec_unittest.cc', |
| - 'base/dns_util_unittest.cc', |
| - 'base/dnsrr_resolver_unittest.cc', |
| - 'base/escape_unittest.cc', |
| - 'base/ev_root_ca_metadata_unittest.cc', |
| - 'base/expiring_cache_unittest.cc', |
| - 'base/file_stream_unittest.cc', |
| - 'base/filter_unittest.cc', |
| - 'base/gzip_filter_unittest.cc', |
| - 'base/host_cache_unittest.cc', |
| - 'base/host_mapping_rules_unittest.cc', |
| - 'base/host_port_pair_unittest.cc', |
| - 'base/host_resolver_impl_unittest.cc', |
| - 'base/ip_endpoint_unittest.cc', |
| - 'base/keygen_handler_unittest.cc', |
| - 'base/mapped_host_resolver_unittest.cc', |
| - 'base/mime_sniffer_unittest.cc', |
| - 'base/mime_util_unittest.cc', |
| - 'base/mock_filter_context.cc', |
| - 'base/mock_filter_context.h', |
| - 'base/multi_threaded_cert_verifier_unittest.cc', |
| - 'base/net_log_unittest.h', |
| - 'base/net_util_unittest.cc', |
| - 'base/network_change_notifier_linux_unittest.cc', |
| - 'base/network_change_notifier_win_unittest.cc', |
| - 'base/pem_tokenizer_unittest.cc', |
| - 'base/prioritized_dispatcher_unittest.cc', |
| - 'base/priority_queue_unittest.cc', |
| - 'base/registry_controlled_domain_unittest.cc', |
| - 'base/run_all_unittests.cc', |
| - 'base/sdch_filter_unittest.cc', |
| - 'base/server_bound_cert_service_unittest.cc', |
| - 'base/single_request_host_resolver_unittest.cc', |
| - 'base/ssl_cipher_suite_names_unittest.cc', |
| - 'base/ssl_client_auth_cache_unittest.cc', |
| - 'base/ssl_config_service_unittest.cc', |
| - 'base/static_cookie_policy_unittest.cc', |
| - 'base/tcp_listen_socket_unittest.cc', |
| - 'base/tcp_listen_socket_unittest.h', |
| - 'base/test_certificate_data.h', |
| - 'base/test_completion_callback_unittest.cc', |
| - 'base/transport_security_state_unittest.cc', |
| - 'base/unix_domain_socket_posix_unittest.cc', |
| - 'base/upload_data_stream_unittest.cc', |
| - 'base/upload_data_unittest.cc', |
| - 'base/x509_certificate_unittest.cc', |
| - 'base/x509_cert_types_unittest.cc', |
| - 'base/x509_util_nss_unittest.cc', |
| - 'base/x509_util_openssl_unittest.cc', |
| - 'cookies/cookie_monster_unittest.cc', |
| - 'cookies/cookie_store_unittest.h', |
| - 'cookies/cookie_util_unittest.cc', |
| - 'disk_cache/addr_unittest.cc', |
| - 'disk_cache/backend_unittest.cc', |
| - 'disk_cache/bitmap_unittest.cc', |
| - 'disk_cache/block_files_unittest.cc', |
| - 'disk_cache/cache_util_unittest.cc', |
| - 'disk_cache/entry_unittest.cc', |
| - 'disk_cache/mapped_file_unittest.cc', |
| - 'disk_cache/storage_block_unittest.cc', |
| - 'dns/dns_config_service_posix_unittest.cc', |
| - 'dns/dns_config_service_unittest.cc', |
| - 'dns/dns_config_service_win_unittest.cc', |
| - 'dns/dns_hosts_unittest.cc', |
| - 'dns/dns_query_unittest.cc', |
| - 'dns/dns_response_unittest.cc', |
| - 'dns/dns_transaction_unittest.cc', |
| - 'dns/serial_worker_unittest.cc', |
| - 'ftp/ftp_auth_cache_unittest.cc', |
| - 'ftp/ftp_ctrl_response_buffer_unittest.cc', |
| - 'ftp/ftp_directory_listing_parser_ls_unittest.cc', |
| - 'ftp/ftp_directory_listing_parser_netware_unittest.cc', |
| - 'ftp/ftp_directory_listing_parser_os2_unittest.cc', |
| - 'ftp/ftp_directory_listing_parser_unittest.cc', |
| - 'ftp/ftp_directory_listing_parser_unittest.h', |
| - 'ftp/ftp_directory_listing_parser_vms_unittest.cc', |
| - 'ftp/ftp_directory_listing_parser_windows_unittest.cc', |
| - 'ftp/ftp_network_transaction_unittest.cc', |
| - 'ftp/ftp_util_unittest.cc', |
| - 'http/des_unittest.cc', |
| - 'http/http_auth_cache_unittest.cc', |
| - 'http/http_auth_controller_unittest.cc', |
| - 'http/http_auth_filter_unittest.cc', |
| - 'http/http_auth_gssapi_posix_unittest.cc', |
| - 'http/http_auth_handler_basic_unittest.cc', |
| - 'http/http_auth_handler_digest_unittest.cc', |
| - 'http/http_auth_handler_factory_unittest.cc', |
| - 'http/http_auth_handler_mock.cc', |
| - 'http/http_auth_handler_mock.h', |
| - 'http/http_auth_handler_negotiate_unittest.cc', |
| - 'http/http_auth_handler_unittest.cc', |
| - 'http/http_auth_sspi_win_unittest.cc', |
| - 'http/http_auth_unittest.cc', |
| - 'http/http_byte_range_unittest.cc', |
| - 'http/http_cache_unittest.cc', |
| - 'http/http_chunked_decoder_unittest.cc', |
| - 'http/http_content_disposition_unittest.cc', |
| - 'http/http_network_layer_unittest.cc', |
| - 'http/http_network_transaction_spdy3_unittest.cc', |
| - 'http/http_network_transaction_spdy2_unittest.cc', |
| - 'http/http_pipelined_connection_impl_unittest.cc', |
| - 'http/http_pipelined_host_forced_unittest.cc', |
| - 'http/http_pipelined_host_impl_unittest.cc', |
| - 'http/http_pipelined_host_pool_unittest.cc', |
| - 'http/http_pipelined_host_test_util.cc', |
| - 'http/http_pipelined_host_test_util.h', |
| - 'http/http_pipelined_network_transaction_unittest.cc', |
| - 'http/http_proxy_client_socket_pool_spdy2_unittest.cc', |
| - 'http/http_proxy_client_socket_pool_spdy3_unittest.cc', |
| - 'http/http_request_headers_unittest.cc', |
| - 'http/http_response_body_drainer_unittest.cc', |
| - 'http/http_response_headers_unittest.cc', |
| - 'http/http_server_properties_impl_unittest.cc', |
| - 'http/http_stream_factory_impl_unittest.cc', |
| - 'http/http_stream_parser_unittest.cc', |
| - 'http/http_transaction_unittest.cc', |
| - 'http/http_transaction_unittest.h', |
| - 'http/http_util_unittest.cc', |
| - 'http/http_vary_data_unittest.cc', |
| - 'http/mock_allow_url_security_manager.cc', |
| - 'http/mock_allow_url_security_manager.h', |
| - 'http/mock_gssapi_library_posix.cc', |
| - 'http/mock_gssapi_library_posix.h', |
| - 'http/mock_http_cache.cc', |
| - 'http/mock_http_cache.h', |
| - 'http/mock_sspi_library_win.cc', |
| - 'http/mock_sspi_library_win.h', |
| - 'http/url_security_manager_unittest.cc', |
| - 'proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc', |
| - 'proxy/dhcp_proxy_script_fetcher_factory_unittest.cc', |
| - 'proxy/dhcp_proxy_script_fetcher_win_unittest.cc', |
| - 'proxy/multi_threaded_proxy_resolver_unittest.cc', |
| - 'proxy/network_delegate_error_observer_unittest.cc', |
| - 'proxy/proxy_bypass_rules_unittest.cc', |
| - 'proxy/proxy_config_service_android_unittest.cc', |
| - 'proxy/proxy_config_service_linux_unittest.cc', |
| - 'proxy/proxy_config_service_win_unittest.cc', |
| - 'proxy/proxy_config_unittest.cc', |
| - 'proxy/proxy_info_unittest.cc', |
| - 'proxy/proxy_list_unittest.cc', |
| - 'proxy/proxy_resolver_js_bindings_unittest.cc', |
| - 'proxy/proxy_resolver_v8_unittest.cc', |
| - 'proxy/proxy_script_decider_unittest.cc', |
| - 'proxy/proxy_script_fetcher_impl_unittest.cc', |
| - 'proxy/proxy_server_unittest.cc', |
| - 'proxy/proxy_service_unittest.cc', |
| - 'proxy/sync_host_resolver_bridge_unittest.cc', |
| - 'socket/buffered_write_stream_socket_unittest.cc', |
| - 'socket/client_socket_pool_base_unittest.cc', |
| - 'socket/deterministic_socket_data_unittest.cc', |
| - 'socket/mock_client_socket_pool_manager.cc', |
| - 'socket/mock_client_socket_pool_manager.h', |
| - 'socket/socks5_client_socket_unittest.cc', |
| - 'socket/socks_client_socket_pool_unittest.cc', |
| - 'socket/socks_client_socket_unittest.cc', |
| - 'socket/ssl_client_socket_pool_unittest.cc', |
| - 'socket/ssl_client_socket_unittest.cc', |
| - 'socket/ssl_server_socket_unittest.cc', |
| - 'socket/tcp_client_socket_unittest.cc', |
| - 'socket/tcp_server_socket_unittest.cc', |
| - 'socket/transport_client_socket_pool_unittest.cc', |
| - 'socket/transport_client_socket_unittest.cc', |
| - 'socket/web_socket_server_socket_unittest.cc', |
| - 'socket_stream/socket_stream_metrics_unittest.cc', |
| - 'socket_stream/socket_stream_unittest.cc', |
| - 'spdy/buffered_spdy_framer_spdy3_unittest.cc', |
| - 'spdy/buffered_spdy_framer_spdy2_unittest.cc', |
| - 'spdy/spdy_credential_state_unittest.cc', |
| - 'spdy/spdy_frame_reader_test.cc', |
| - 'spdy/spdy_framer_test.cc', |
| - 'spdy/spdy_http_stream_spdy3_unittest.cc', |
| - 'spdy/spdy_http_stream_spdy2_unittest.cc', |
| - 'spdy/spdy_http_utils_unittest.cc', |
| - 'spdy/spdy_network_transaction_spdy3_unittest.cc', |
| - 'spdy/spdy_network_transaction_spdy2_unittest.cc', |
| - 'spdy/spdy_protocol_test.cc', |
| - 'spdy/spdy_proxy_client_socket_spdy3_unittest.cc', |
| - 'spdy/spdy_proxy_client_socket_spdy2_unittest.cc', |
| - 'spdy/spdy_session_spdy3_unittest.cc', |
| - 'spdy/spdy_session_spdy2_unittest.cc', |
| - 'spdy/spdy_stream_spdy3_unittest.cc', |
| - 'spdy/spdy_stream_spdy2_unittest.cc', |
| - 'spdy/spdy_test_util_spdy3.cc', |
| - 'spdy/spdy_test_util_spdy3.h', |
| - 'spdy/spdy_test_util_spdy2.cc', |
| - 'spdy/spdy_test_util_spdy2.h', |
| - 'spdy/spdy_websocket_stream_spdy2_unittest.cc', |
| - 'spdy/spdy_websocket_stream_spdy3_unittest.cc', |
| - 'spdy/spdy_websocket_test_util_spdy2.cc', |
| - 'spdy/spdy_websocket_test_util_spdy2.h', |
| - 'spdy/spdy_websocket_test_util_spdy3.cc', |
| - 'spdy/spdy_websocket_test_util_spdy3.h', |
| - 'test/python_utils_unittest.cc', |
| - 'tools/dump_cache/url_to_filename_encoder.cc', |
| - 'tools/dump_cache/url_to_filename_encoder.h', |
| - 'tools/dump_cache/url_to_filename_encoder_unittest.cc', |
| - 'tools/dump_cache/url_utilities.h', |
| - 'tools/dump_cache/url_utilities.cc', |
| - 'tools/dump_cache/url_utilities_unittest.cc', |
| - 'udp/udp_socket_unittest.cc', |
| - 'url_request/url_fetcher_impl_unittest.cc', |
| - 'url_request/url_request_context_builder_unittest.cc', |
| - 'url_request/url_request_job_factory_unittest.cc', |
| - 'url_request/url_request_job_unittest.cc', |
| - 'url_request/url_request_throttler_simulation_unittest.cc', |
| - 'url_request/url_request_throttler_test_support.cc', |
| - 'url_request/url_request_throttler_test_support.h', |
| - 'url_request/url_request_throttler_unittest.cc', |
| - 'url_request/url_request_unittest.cc', |
| - 'url_request/view_cache_helper_unittest.cc', |
| - 'websockets/websocket_frame_parser_unittest.cc', |
| - 'websockets/websocket_frame_unittest.cc', |
| - 'websockets/websocket_handshake_handler_unittest.cc', |
| - 'websockets/websocket_job_spdy2_unittest.cc', |
| - 'websockets/websocket_job_spdy3_unittest.cc', |
| - 'websockets/websocket_net_log_params_unittest.cc', |
| - 'websockets/websocket_throttle_unittest.cc', |
| - ], |
| - 'conditions': [ |
| - ['chromeos==1', { |
| - 'sources!': [ |
| - 'base/network_change_notifier_linux_unittest.cc', |
| - 'proxy/proxy_config_service_linux_unittest.cc', |
| - ], |
| - }], |
| - [ 'use_glib == 1', { |
| - 'dependencies': [ |
| - '../build/linux/system.gyp:ssl', |
| - ], |
| - }, { # else: OS is not in the above list |
| - 'sources!': [ |
| - 'base/cert_database_nss_unittest.cc', |
| - ], |
| - }, |
| - ], |
| - [ 'toolkit_uses_gtk == 1', { |
| - 'dependencies': [ |
| - '../build/linux/system.gyp:gtk', |
| - ], |
| - }, |
| - ], |
| - [ 'os_posix == 1 and OS != "mac" and OS != "android"', { |
| - 'conditions': [ |
| - ['linux_use_tcmalloc==1', { |
| - 'dependencies': [ |
| - '../base/allocator/allocator.gyp:allocator', |
| - ], |
| - }], |
| - ], |
| - }], |
| - [ 'use_kerberos==1', { |
| - 'defines': [ |
| - 'USE_KERBEROS', |
| - ], |
| - }, { # use_kerberos == 0 |
| - 'sources!': [ |
| - 'http/http_auth_gssapi_posix_unittest.cc', |
| - 'http/http_auth_handler_negotiate_unittest.cc', |
| - 'http/mock_gssapi_library_posix.cc', |
| - 'http/mock_gssapi_library_posix.h', |
| - ], |
| - }], |
| - [ 'use_openssl==1', { |
| - # When building for OpenSSL, we need to exclude NSS specific tests. |
| - # TODO(bulach): Add equivalent tests when the underlying |
| - # functionality is ported to OpenSSL. |
| - 'sources!': [ |
| - 'base/x509_util_nss_unittest.cc', |
| - 'base/cert_database_nss_unittest.cc', |
| - 'base/dnssec_unittest.cc', |
| - ], |
| - }, { # else !use_openssl: remove the unneeded files |
| - 'sources!': [ |
| - 'base/x509_util_openssl_unittest.cc', |
| - ], |
| - }, |
| - ], |
| - [ 'OS == "win"', { |
| - 'sources!': [ |
| - 'dns/dns_config_service_posix_unittest.cc', |
| - 'http/http_auth_gssapi_posix_unittest.cc', |
| - ], |
| - # This is needed to trigger the dll copy step on windows. |
| - # TODO(mark): Specifying this here shouldn't be necessary. |
| - 'dependencies': [ |
| - '../third_party/icu/icu.gyp:icudata', |
| - '../third_party/nss/nss.gyp:nspr', |
| - '../third_party/nss/nss.gyp:nss', |
| - 'third_party/nss/ssl.gyp:libssl', |
| - ], |
| - }, |
| - ], |
| - [ 'OS == "mac"', { |
| - 'dependencies': [ |
| - '../third_party/nss/nss.gyp:nspr', |
| - '../third_party/nss/nss.gyp:nss', |
| - 'third_party/nss/ssl.gyp:libssl', |
| - ], |
| - }, |
| - ], |
| - [ 'OS == "linux"', { |
| - 'dependencies': [ |
| - '../build/linux/system.gyp:dbus', |
| - '../dbus/dbus.gyp:dbus_test_support', |
| - ], |
| - }, |
| - ], |
| - [ 'OS == "android"', { |
| - 'dependencies': [ |
| - '../third_party/openssl/openssl.gyp:openssl', |
| - ], |
| - 'sources!': [ |
| - 'dns/dns_config_service_posix_unittest.cc', |
| - ], |
| - }, |
| - ], |
| - ['OS == "android" and gtest_target_type == "shared_library"', { |
| - 'dependencies': [ |
| - '../testing/android/native_test.gyp:native_test_native_code', |
| - ] |
| - }], |
| - [ 'OS != "win" and OS != "mac"', { |
| - 'sources!': [ |
| - 'base/x509_cert_types_unittest.cc', |
| - ], |
| - }] |
| - ], |
| - }, |
| - { |
| - 'target_name': 'net_unittests_run', |
| - 'type': 'none', |
| - 'dependencies': [ |
| - 'net_unittests', |
| - ], |
| - 'includes': [ |
| - 'net_unittests.isolate', |
| - ], |
| - 'actions': [ |
| - { |
| - 'action_name': 'isolate', |
| - 'inputs': [ |
| - 'net_unittests.isolate', |
| - '<@(isolate_dependency_tracked)', |
| - ], |
| - 'outputs': [ |
| - '<(PRODUCT_DIR)/net_unittests.results', |
| - ], |
| - 'action': [ |
| - 'python', |
| - '../tools/isolate/isolate.py', |
| - '<(test_isolation_mode)', |
| - '--outdir', '<(test_isolation_outdir)', |
| - '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)', |
| - '--variable', 'OS', '<(OS)', |
| - '--result', '<@(_outputs)', |
| - '--isolate', 'net_unittests.isolate', |
| - ], |
| - }, |
| - ], |
| - }, |
| - { |
| 'target_name': 'net_perftests', |
| 'type': 'executable', |
| 'dependencies': [ |
| @@ -1746,6 +1361,398 @@ |
| }, |
| ], |
| 'conditions': [ |
| + ['inside_chromium_build=="1"', { |
| + 'targets': [ |
| + # These targets depends on dependencies not fetched by WebKit's DEPS. |
| + # In particular, ..\chrome\test\data and ..\third_party\python_26 on |
| + # Windows. |
| + { |
| + 'target_name': 'net_unittests', |
| + 'type': '<(gtest_target_type)', |
| + 'dependencies': [ |
| + 'net', |
| + 'net_test_support', |
| + '../base/base.gyp:base', |
| + '../base/base.gyp:base_i18n', |
| + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |
| + '../build/temp_gyp/googleurl.gyp:googleurl', |
| + '../crypto/crypto.gyp:crypto', |
| + '../testing/gmock.gyp:gmock', |
| + '../testing/gtest.gyp:gtest', |
| + '../third_party/zlib/zlib.gyp:zlib', |
| + ], |
| + 'sources': [ |
| + 'base/address_list_unittest.cc', |
| + 'base/backoff_entry_unittest.cc', |
| + 'base/big_endian_unittest.cc', |
| + 'base/cert_database_nss_unittest.cc', |
| + 'base/cert_verify_proc_unittest.cc', |
| + 'base/crl_set_unittest.cc', |
| + 'base/data_url_unittest.cc', |
| + 'base/default_server_bound_cert_store_unittest.cc', |
| + 'base/directory_lister_unittest.cc', |
| + 'base/dnssec_unittest.cc', |
| + 'base/dns_util_unittest.cc', |
| + 'base/dnsrr_resolver_unittest.cc', |
| + 'base/escape_unittest.cc', |
| + 'base/ev_root_ca_metadata_unittest.cc', |
| + 'base/expiring_cache_unittest.cc', |
| + 'base/file_stream_unittest.cc', |
| + 'base/filter_unittest.cc', |
| + 'base/gzip_filter_unittest.cc', |
| + 'base/host_cache_unittest.cc', |
| + 'base/host_mapping_rules_unittest.cc', |
| + 'base/host_port_pair_unittest.cc', |
| + 'base/host_resolver_impl_unittest.cc', |
| + 'base/ip_endpoint_unittest.cc', |
| + 'base/keygen_handler_unittest.cc', |
| + 'base/mapped_host_resolver_unittest.cc', |
| + 'base/mime_sniffer_unittest.cc', |
| + 'base/mime_util_unittest.cc', |
| + 'base/mock_filter_context.cc', |
| + 'base/mock_filter_context.h', |
| + 'base/multi_threaded_cert_verifier_unittest.cc', |
| + 'base/net_log_unittest.h', |
| + 'base/net_util_unittest.cc', |
| + 'base/network_change_notifier_linux_unittest.cc', |
| + 'base/network_change_notifier_win_unittest.cc', |
| + 'base/pem_tokenizer_unittest.cc', |
| + 'base/prioritized_dispatcher_unittest.cc', |
| + 'base/priority_queue_unittest.cc', |
| + 'base/registry_controlled_domain_unittest.cc', |
| + 'base/run_all_unittests.cc', |
| + 'base/sdch_filter_unittest.cc', |
| + 'base/server_bound_cert_service_unittest.cc', |
| + 'base/single_request_host_resolver_unittest.cc', |
| + 'base/ssl_cipher_suite_names_unittest.cc', |
| + 'base/ssl_client_auth_cache_unittest.cc', |
| + 'base/ssl_config_service_unittest.cc', |
| + 'base/static_cookie_policy_unittest.cc', |
| + 'base/tcp_listen_socket_unittest.cc', |
| + 'base/tcp_listen_socket_unittest.h', |
| + 'base/test_certificate_data.h', |
| + 'base/test_completion_callback_unittest.cc', |
| + 'base/transport_security_state_unittest.cc', |
| + 'base/unix_domain_socket_posix_unittest.cc', |
| + 'base/upload_data_stream_unittest.cc', |
| + 'base/upload_data_unittest.cc', |
| + 'base/x509_certificate_unittest.cc', |
| + 'base/x509_cert_types_unittest.cc', |
| + 'base/x509_util_nss_unittest.cc', |
| + 'base/x509_util_openssl_unittest.cc', |
| + 'cookies/cookie_monster_unittest.cc', |
| + 'cookies/cookie_store_unittest.h', |
| + 'cookies/cookie_util_unittest.cc', |
| + 'disk_cache/addr_unittest.cc', |
| + 'disk_cache/backend_unittest.cc', |
| + 'disk_cache/bitmap_unittest.cc', |
| + 'disk_cache/block_files_unittest.cc', |
| + 'disk_cache/cache_util_unittest.cc', |
| + 'disk_cache/entry_unittest.cc', |
| + 'disk_cache/mapped_file_unittest.cc', |
| + 'disk_cache/storage_block_unittest.cc', |
| + 'dns/dns_config_service_posix_unittest.cc', |
| + 'dns/dns_config_service_unittest.cc', |
| + 'dns/dns_config_service_win_unittest.cc', |
| + 'dns/dns_hosts_unittest.cc', |
| + 'dns/dns_query_unittest.cc', |
| + 'dns/dns_response_unittest.cc', |
| + 'dns/dns_transaction_unittest.cc', |
| + 'dns/serial_worker_unittest.cc', |
| + 'ftp/ftp_auth_cache_unittest.cc', |
| + 'ftp/ftp_ctrl_response_buffer_unittest.cc', |
| + 'ftp/ftp_directory_listing_parser_ls_unittest.cc', |
| + 'ftp/ftp_directory_listing_parser_netware_unittest.cc', |
| + 'ftp/ftp_directory_listing_parser_os2_unittest.cc', |
| + 'ftp/ftp_directory_listing_parser_unittest.cc', |
| + 'ftp/ftp_directory_listing_parser_unittest.h', |
| + 'ftp/ftp_directory_listing_parser_vms_unittest.cc', |
| + 'ftp/ftp_directory_listing_parser_windows_unittest.cc', |
| + 'ftp/ftp_network_transaction_unittest.cc', |
| + 'ftp/ftp_util_unittest.cc', |
| + 'http/des_unittest.cc', |
| + 'http/http_auth_cache_unittest.cc', |
| + 'http/http_auth_controller_unittest.cc', |
| + 'http/http_auth_filter_unittest.cc', |
| + 'http/http_auth_gssapi_posix_unittest.cc', |
| + 'http/http_auth_handler_basic_unittest.cc', |
| + 'http/http_auth_handler_digest_unittest.cc', |
| + 'http/http_auth_handler_factory_unittest.cc', |
| + 'http/http_auth_handler_mock.cc', |
| + 'http/http_auth_handler_mock.h', |
| + 'http/http_auth_handler_negotiate_unittest.cc', |
| + 'http/http_auth_handler_unittest.cc', |
| + 'http/http_auth_sspi_win_unittest.cc', |
| + 'http/http_auth_unittest.cc', |
| + 'http/http_byte_range_unittest.cc', |
| + 'http/http_cache_unittest.cc', |
| + 'http/http_chunked_decoder_unittest.cc', |
| + 'http/http_content_disposition_unittest.cc', |
| + 'http/http_network_layer_unittest.cc', |
| + 'http/http_network_transaction_spdy3_unittest.cc', |
| + 'http/http_network_transaction_spdy2_unittest.cc', |
| + 'http/http_pipelined_connection_impl_unittest.cc', |
| + 'http/http_pipelined_host_forced_unittest.cc', |
| + 'http/http_pipelined_host_impl_unittest.cc', |
| + 'http/http_pipelined_host_pool_unittest.cc', |
| + 'http/http_pipelined_host_test_util.cc', |
| + 'http/http_pipelined_host_test_util.h', |
| + 'http/http_pipelined_network_transaction_unittest.cc', |
| + 'http/http_proxy_client_socket_pool_spdy2_unittest.cc', |
| + 'http/http_proxy_client_socket_pool_spdy3_unittest.cc', |
| + 'http/http_request_headers_unittest.cc', |
| + 'http/http_response_body_drainer_unittest.cc', |
| + 'http/http_response_headers_unittest.cc', |
| + 'http/http_server_properties_impl_unittest.cc', |
| + 'http/http_stream_factory_impl_unittest.cc', |
| + 'http/http_stream_parser_unittest.cc', |
| + 'http/http_transaction_unittest.cc', |
| + 'http/http_transaction_unittest.h', |
| + 'http/http_util_unittest.cc', |
| + 'http/http_vary_data_unittest.cc', |
| + 'http/mock_allow_url_security_manager.cc', |
| + 'http/mock_allow_url_security_manager.h', |
| + 'http/mock_gssapi_library_posix.cc', |
| + 'http/mock_gssapi_library_posix.h', |
| + 'http/mock_http_cache.cc', |
| + 'http/mock_http_cache.h', |
| + 'http/mock_sspi_library_win.cc', |
| + 'http/mock_sspi_library_win.h', |
| + 'http/url_security_manager_unittest.cc', |
| + 'proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc', |
| + 'proxy/dhcp_proxy_script_fetcher_factory_unittest.cc', |
| + 'proxy/dhcp_proxy_script_fetcher_win_unittest.cc', |
| + 'proxy/multi_threaded_proxy_resolver_unittest.cc', |
| + 'proxy/network_delegate_error_observer_unittest.cc', |
| + 'proxy/proxy_bypass_rules_unittest.cc', |
| + 'proxy/proxy_config_service_android_unittest.cc', |
| + 'proxy/proxy_config_service_linux_unittest.cc', |
| + 'proxy/proxy_config_service_win_unittest.cc', |
| + 'proxy/proxy_config_unittest.cc', |
| + 'proxy/proxy_info_unittest.cc', |
| + 'proxy/proxy_list_unittest.cc', |
| + 'proxy/proxy_resolver_js_bindings_unittest.cc', |
| + 'proxy/proxy_resolver_v8_unittest.cc', |
| + 'proxy/proxy_script_decider_unittest.cc', |
| + 'proxy/proxy_script_fetcher_impl_unittest.cc', |
| + 'proxy/proxy_server_unittest.cc', |
| + 'proxy/proxy_service_unittest.cc', |
| + 'proxy/sync_host_resolver_bridge_unittest.cc', |
| + 'socket/buffered_write_stream_socket_unittest.cc', |
| + 'socket/client_socket_pool_base_unittest.cc', |
| + 'socket/deterministic_socket_data_unittest.cc', |
| + 'socket/mock_client_socket_pool_manager.cc', |
| + 'socket/mock_client_socket_pool_manager.h', |
| + 'socket/socks5_client_socket_unittest.cc', |
| + 'socket/socks_client_socket_pool_unittest.cc', |
| + 'socket/socks_client_socket_unittest.cc', |
| + 'socket/ssl_client_socket_pool_unittest.cc', |
| + 'socket/ssl_client_socket_unittest.cc', |
| + 'socket/ssl_server_socket_unittest.cc', |
| + 'socket/tcp_client_socket_unittest.cc', |
| + 'socket/tcp_server_socket_unittest.cc', |
| + 'socket/transport_client_socket_pool_unittest.cc', |
| + 'socket/transport_client_socket_unittest.cc', |
| + 'socket/web_socket_server_socket_unittest.cc', |
| + 'socket_stream/socket_stream_metrics_unittest.cc', |
| + 'socket_stream/socket_stream_unittest.cc', |
| + 'spdy/buffered_spdy_framer_spdy3_unittest.cc', |
| + 'spdy/buffered_spdy_framer_spdy2_unittest.cc', |
| + 'spdy/spdy_credential_state_unittest.cc', |
| + 'spdy/spdy_frame_reader_test.cc', |
| + 'spdy/spdy_framer_test.cc', |
| + 'spdy/spdy_http_stream_spdy3_unittest.cc', |
| + 'spdy/spdy_http_stream_spdy2_unittest.cc', |
| + 'spdy/spdy_http_utils_unittest.cc', |
| + 'spdy/spdy_network_transaction_spdy3_unittest.cc', |
| + 'spdy/spdy_network_transaction_spdy2_unittest.cc', |
| + 'spdy/spdy_protocol_test.cc', |
| + 'spdy/spdy_proxy_client_socket_spdy3_unittest.cc', |
| + 'spdy/spdy_proxy_client_socket_spdy2_unittest.cc', |
| + 'spdy/spdy_session_spdy3_unittest.cc', |
| + 'spdy/spdy_session_spdy2_unittest.cc', |
| + 'spdy/spdy_stream_spdy3_unittest.cc', |
| + 'spdy/spdy_stream_spdy2_unittest.cc', |
| + 'spdy/spdy_test_util_spdy3.cc', |
| + 'spdy/spdy_test_util_spdy3.h', |
| + 'spdy/spdy_test_util_spdy2.cc', |
| + 'spdy/spdy_test_util_spdy2.h', |
| + 'spdy/spdy_websocket_stream_spdy2_unittest.cc', |
| + 'spdy/spdy_websocket_stream_spdy3_unittest.cc', |
| + 'spdy/spdy_websocket_test_util_spdy2.cc', |
| + 'spdy/spdy_websocket_test_util_spdy2.h', |
| + 'spdy/spdy_websocket_test_util_spdy3.cc', |
| + 'spdy/spdy_websocket_test_util_spdy3.h', |
| + 'test/python_utils_unittest.cc', |
| + 'tools/dump_cache/url_to_filename_encoder.cc', |
| + 'tools/dump_cache/url_to_filename_encoder.h', |
| + 'tools/dump_cache/url_to_filename_encoder_unittest.cc', |
| + 'tools/dump_cache/url_utilities.h', |
| + 'tools/dump_cache/url_utilities.cc', |
| + 'tools/dump_cache/url_utilities_unittest.cc', |
| + 'udp/udp_socket_unittest.cc', |
| + 'url_request/url_fetcher_impl_unittest.cc', |
| + 'url_request/url_request_context_builder_unittest.cc', |
| + 'url_request/url_request_job_factory_unittest.cc', |
| + 'url_request/url_request_job_unittest.cc', |
| + 'url_request/url_request_throttler_simulation_unittest.cc', |
| + 'url_request/url_request_throttler_test_support.cc', |
| + 'url_request/url_request_throttler_test_support.h', |
| + 'url_request/url_request_throttler_unittest.cc', |
| + 'url_request/url_request_unittest.cc', |
| + 'url_request/view_cache_helper_unittest.cc', |
| + 'websockets/websocket_frame_parser_unittest.cc', |
| + 'websockets/websocket_frame_unittest.cc', |
| + 'websockets/websocket_handshake_handler_unittest.cc', |
| + 'websockets/websocket_job_spdy2_unittest.cc', |
| + 'websockets/websocket_job_spdy3_unittest.cc', |
| + 'websockets/websocket_net_log_params_unittest.cc', |
| + 'websockets/websocket_throttle_unittest.cc', |
| + ], |
| + 'conditions': [ |
| + ['chromeos==1', { |
| + 'sources!': [ |
| + 'base/network_change_notifier_linux_unittest.cc', |
| + 'proxy/proxy_config_service_linux_unittest.cc', |
| + ], |
| + }], |
| + [ 'use_glib == 1', { |
| + 'dependencies': [ |
| + '../build/linux/system.gyp:ssl', |
| + ], |
| + }, { # else: OS is not in the above list |
| + 'sources!': [ |
| + 'base/cert_database_nss_unittest.cc', |
| + ], |
| + }, |
| + ], |
| + [ 'toolkit_uses_gtk == 1', { |
| + 'dependencies': [ |
| + '../build/linux/system.gyp:gtk', |
| + ], |
| + }, |
| + ], |
| + [ 'os_posix == 1 and OS != "mac" and OS != "android"', { |
| + 'conditions': [ |
| + ['linux_use_tcmalloc==1', { |
| + 'dependencies': [ |
| + '../base/allocator/allocator.gyp:allocator', |
| + ], |
| + }], |
| + ], |
| + }], |
| + [ 'use_kerberos==1', { |
| + 'defines': [ |
| + 'USE_KERBEROS', |
| + ], |
| + }, { # use_kerberos == 0 |
| + 'sources!': [ |
| + 'http/http_auth_gssapi_posix_unittest.cc', |
| + 'http/http_auth_handler_negotiate_unittest.cc', |
| + 'http/mock_gssapi_library_posix.cc', |
| + 'http/mock_gssapi_library_posix.h', |
| + ], |
| + }], |
| + [ 'use_openssl==1', { |
| + # When building for OpenSSL, we need to exclude NSS specific tests. |
| + # TODO(bulach): Add equivalent tests when the underlying |
| + # functionality is ported to OpenSSL. |
| + 'sources!': [ |
| + 'base/x509_util_nss_unittest.cc', |
| + 'base/cert_database_nss_unittest.cc', |
| + 'base/dnssec_unittest.cc', |
| + ], |
| + }, { # else !use_openssl: remove the unneeded files |
| + 'sources!': [ |
| + 'base/x509_util_openssl_unittest.cc', |
| + ], |
| + }, |
| + ], |
| + [ 'OS == "win"', { |
| + 'sources!': [ |
| + 'dns/dns_config_service_posix_unittest.cc', |
| + 'http/http_auth_gssapi_posix_unittest.cc', |
| + ], |
| + # This is needed to trigger the dll copy step on windows. |
| + # TODO(mark): Specifying this here shouldn't be necessary. |
| + 'dependencies': [ |
| + '../third_party/icu/icu.gyp:icudata', |
| + '../third_party/nss/nss.gyp:nspr', |
| + '../third_party/nss/nss.gyp:nss', |
| + 'third_party/nss/ssl.gyp:libssl', |
| + ], |
| + }, |
| + ], |
| + [ 'OS == "mac"', { |
| + 'dependencies': [ |
| + '../third_party/nss/nss.gyp:nspr', |
| + '../third_party/nss/nss.gyp:nss', |
| + 'third_party/nss/ssl.gyp:libssl', |
| + ], |
| + }, |
| + ], |
| + [ 'OS == "linux"', { |
| + 'dependencies': [ |
| + '../build/linux/system.gyp:dbus', |
| + '../dbus/dbus.gyp:dbus_test_support', |
| + ], |
| + }, |
| + ], |
| + [ 'OS == "android"', { |
| + 'dependencies': [ |
| + '../third_party/openssl/openssl.gyp:openssl', |
| + ], |
| + 'sources!': [ |
| + 'dns/dns_config_service_posix_unittest.cc', |
| + ], |
| + }, |
| + ], |
| + ['OS == "android" and gtest_target_type == "shared_library"', { |
| + 'dependencies': [ |
| + '../testing/android/native_test.gyp:native_test_native_code', |
| + ] |
| + }], |
| + [ 'OS != "win" and OS != "mac"', { |
| + 'sources!': [ |
| + 'base/x509_cert_types_unittest.cc', |
| + ], |
| + }] |
| + ], |
| + }, |
| + { |
| + 'target_name': 'net_unittests_run', |
| + 'type': 'none', |
| + 'dependencies': [ |
| + 'net_unittests', |
| + ], |
| + 'includes': [ |
| + 'net_unittests.isolate', |
| + ], |
| + 'actions': [ |
| + { |
| + 'action_name': 'isolate', |
| + 'inputs': [ |
| + 'net_unittests.isolate', |
| + '<@(isolate_dependency_tracked)', |
| + ], |
| + 'outputs': [ |
| + '<(PRODUCT_DIR)/net_unittests.results', |
| + ], |
| + 'action': [ |
| + 'python', |
| + '../tools/isolate/isolate.py', |
| + '<(test_isolation_mode)', |
| + '--outdir', '<(test_isolation_outdir)', |
| + '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)', |
| + '--variable', 'OS', '<(OS)', |
| + '--result', '<@(_outputs)', |
| + '--isolate', 'net_unittests.isolate', |
| + ], |
| + }, |
| + ], |
| + }, |
| + ], |
| + }], |
| ['os_posix == 1 and OS != "mac" and OS != "android"', { |
|
M-A Ruel
2012/07/10 13:56:08
One shall fix alignment for this block on day. It'
|
| 'targets': [ |
| { |
