| 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 __doc__ = """ | 5 __doc__ = """ |
| 6 Configuration for building the net_unittests{,.exe} executable. | 6 Configuration for building the net_unittests{,.exe} executable. |
| 7 """ | 7 """ |
| 8 | 8 |
| 9 Import('env') | 9 Import('env') |
| 10 | 10 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 CCFLAGS = [ | 32 CCFLAGS = [ |
| 33 '/WX', | 33 '/WX', |
| 34 ], | 34 ], |
| 35 ) | 35 ) |
| 36 | 36 |
| 37 input_files = ChromeFileList([ | 37 input_files = ChromeFileList([ |
| 38 # TODO(sgk): violate standard indentation so we don't have to | 38 # TODO(sgk): violate standard indentation so we don't have to |
| 39 # reindent too much when we remove the explicit MSVSFilter() calls | 39 # reindent too much when we remove the explicit MSVSFilter() calls |
| 40 # in favor of generating the hierarchy to reflect the file system. | 40 # in favor of generating the hierarchy to reflect the file system. |
| 41 MSVSFilter('support', [ | 41 MSVSFilter('support', [ |
| 42 'build/precompiled_net$OBJSUFFIX', | 42 # Built from build/precomiled_net.cc, net_lib.scons. |
| 43 'precompiled_net$OBJSUFFIX', |
| 43 'build/precompiled_net.h', | 44 'build/precompiled_net.h', |
| 44 'base/run_all_unittests.cc', | 45 'base/run_all_unittests.cc', |
| 45 ]), | 46 ]), |
| 46 MSVSFilter('tests', [ | 47 MSVSFilter('tests', [ |
| 47 MSVSFilter('disk_cache', [ | 48 MSVSFilter('disk_cache', [ |
| 48 'disk_cache/addr_unittest.cc', | 49 'disk_cache/addr_unittest.cc', |
| 49 'disk_cache/backend_unittest.cc', | 50 'disk_cache/backend_unittest.cc', |
| 50 'disk_cache/block_files_unittest.cc', | 51 'disk_cache/block_files_unittest.cc', |
| 51 'disk_cache/disk_cache_test_base.cc', | 52 'disk_cache/disk_cache_test_base.cc', |
| 52 'disk_cache/disk_cache_test_base.h', | 53 'disk_cache/disk_cache_test_base.h', |
| (...skipping 11 matching lines...) Expand all Loading... |
| 64 'http/http_cache_unittest.cc', | 65 'http/http_cache_unittest.cc', |
| 65 'http/http_chunked_decoder_unittest.cc', | 66 'http/http_chunked_decoder_unittest.cc', |
| 66 'http/http_network_layer_unittest.cc', | 67 'http/http_network_layer_unittest.cc', |
| 67 'http/http_network_transaction_unittest.cc', | 68 'http/http_network_transaction_unittest.cc', |
| 68 'http/http_response_headers_unittest.cc', | 69 'http/http_response_headers_unittest.cc', |
| 69 'http/http_transaction_unittest.cc', | 70 'http/http_transaction_unittest.cc', |
| 70 'http/http_transaction_unittest.h', | 71 'http/http_transaction_unittest.h', |
| 71 'http/http_util_unittest.cc', | 72 'http/http_util_unittest.cc', |
| 72 'http/http_vary_data_unittest.cc', | 73 'http/http_vary_data_unittest.cc', |
| 73 ]), | 74 ]), |
| 74 MSVSFilter('ftp', [ | |
| 75 'ftp/ftp_auth_cache_unittest.cc', | |
| 76 ]), | |
| 77 MSVSFilter('base', [ | 75 MSVSFilter('base', [ |
| 78 'base/base64_unittest.cc', | 76 'base/base64_unittest.cc', |
| 79 'base/bzip2_filter_unittest.cc', | 77 'base/bzip2_filter_unittest.cc', |
| 80 'base/client_socket_pool_unittest.cc', | 78 'base/client_socket_pool_unittest.cc', |
| 81 'base/cookie_monster_unittest.cc', | 79 'base/cookie_monster_unittest.cc', |
| 82 'base/cookie_policy_unittest.cc', | 80 'base/cookie_policy_unittest.cc', |
| 83 'base/data_url_unittest.cc', | 81 'base/data_url_unittest.cc', |
| 84 'base/directory_lister_unittest.cc', | 82 'base/directory_lister_unittest.cc', |
| 85 'base/escape_unittest.cc', | 83 'base/escape_unittest.cc', |
| 86 'base/file_stream_unittest.cc', | 84 'base/file_stream_unittest.cc', |
| 87 'base/filter_unittest.cc', | 85 'base/filter_unittest.cc', |
| 88 'base/gzip_filter_unittest.cc', | 86 'base/gzip_filter_unittest.cc', |
| 89 'base/host_resolver_unittest.cc', | 87 'base/host_resolver_unittest.cc', |
| 90 'base/listen_socket_unittest.cc', | 88 'base/listen_socket_unittest.cc', |
| 91 'base/listen_socket_unittest.h', | 89 'base/listen_socket_unittest.h', |
| 92 'base/mime_sniffer_unittest.cc', | 90 'base/mime_sniffer_unittest.cc', |
| 93 'base/mime_util_unittest.cc', | 91 'base/mime_util_unittest.cc', |
| 94 'base/net_util_unittest.cc', | 92 'base/net_util_unittest.cc', |
| 95 'base/registry_controlled_domain_unittest.cc', | 93 'base/registry_controlled_domain_unittest.cc', |
| 96 'base/sdch_filter_unittest.cc', | 94 'base/sdch_filter_unittest.cc', |
| 97 'base/ssl_client_socket_unittest.cc', | 95 'base/ssl_client_socket_unittest.cc', |
| 98 'base/ssl_config_service_unittest.cc', | 96 'base/ssl_config_service_unittest.cc', |
| 99 'base/tcp_client_socket_unittest.cc', | 97 'base/tcp_client_socket_unittest.cc', |
| 100 'base/telnet_server_unittest.cc', | 98 'base/telnet_server_unittest.cc', |
| 101 'base/test_completion_callback_unittest.cc', | 99 'base/test_completion_callback_unittest.cc', |
| 102 'base/wininet_util_unittest.cc', | 100 'base/wininet_util_unittest.cc', |
| 103 'base/x509_certificate_unittest.cc', | 101 'base/x509_certificate_unittest.cc', |
| 104 ]), | 102 ]), |
| 103 MSVSFilter('ftp', [ |
| 104 'ftp/ftp_auth_cache_unittest.cc', |
| 105 ]), |
| 105 MSVSFilter('url_request', [ | 106 MSVSFilter('url_request', [ |
| 106 'url_request/url_request_unittest.cc', | 107 'url_request/url_request_unittest.cc', |
| 107 'url_request/url_request_unittest.h', | 108 'url_request/url_request_unittest.h', |
| 108 ]), | 109 ]), |
| 109 MSVSFilter('proxy', [ | 110 MSVSFilter('proxy', [ |
| 110 'proxy/proxy_script_fetcher_unittest.cc', | 111 'proxy/proxy_script_fetcher_unittest.cc', |
| 111 'proxy/proxy_service_unittest.cc', | 112 'proxy/proxy_service_unittest.cc', |
| 112 ]), | 113 ]), |
| 113 ]), | 114 ]), |
| 114 ]) | 115 ]) |
| 115 | 116 |
| 116 if not env.Bit('windows'): | 117 if not env.Bit('windows'): |
| 117 input_files.Remove( | 118 input_files.Remove( |
| 118 'base/wininet_util_unittest.cc', | 119 'base/wininet_util_unittest.cc', |
| 119 'build/precompiled_net$OBJSUFFIX', | 120 'precompiled_net$OBJSUFFIX', |
| 120 ) | 121 ) |
| 121 | 122 |
| 122 if env.Bit('linux'): | 123 if env.Bit('linux'): |
| 123 # TODO(port): | 124 # TODO(port): |
| 124 input_files.Remove( | 125 input_files.Remove( |
| 125 'base/sdch_filter_unittest.cc', | 126 'base/sdch_filter_unittest.cc', |
| 126 'base/ssl_config_service_unittest.cc', | 127 'base/ssl_config_service_unittest.cc', |
| 127 ) | 128 ) |
| 128 | 129 |
| 129 if env.Bit('mac'): | 130 if env.Bit('mac'): |
| 130 input_files.Extend([ | 131 input_files.Extend([ |
| 131 '../base/platform_test_mac$OBJSUFFIX', | 132 '../base/platform_test_mac$OBJSUFFIX', |
| 132 ]) | 133 ]) |
| 133 | 134 |
| 134 # TODO(port): | 135 # TODO(port): |
| 135 input_files.Remove( | 136 input_files.Remove( |
| 136 'base/x509_certificate_unittest.cc', | 137 'base/x509_certificate_unittest.cc', |
| 137 'base/sdch_filter_unittest.cc', | 138 'base/sdch_filter_unittest.cc', |
| 138 'base/ssl_config_service_unittest.cc', | 139 'base/ssl_config_service_unittest.cc', |
| 139 'url_request/url_request_unittest.cc', | 140 'url_request/url_request_unittest.cc', |
| 140 ) | 141 ) |
| 141 | 142 |
| 142 net_unittests = env.ChromeTestProgram('net_unittests', input_files) | 143 net_unittests = env.ChromeTestProgram('net_unittests', input_files) |
| 143 | 144 |
| 144 p = env.ChromeMSVSProject('$NET_DIR/build/net_unittests.vcproj', | 145 p = env.ChromeMSVSProject('$NET_DIR/build/net_unittests.vcproj', |
| 145 dest='$CHROME_SRC_DIR/net/build/net_unittests.vcproj', | 146 dest='$CHROME_SRC_DIR/net/build/net_unittests.vcproj', |
| 147 guid='{E99DA267-BE90-4F45-88A1-6919DB2C7567}', |
| 148 keyword='Win32Proj', |
| 146 dependencies = [ | 149 dependencies = [ |
| 147 '$BASE_DIR/build/base.vcproj', | 150 '$BASE_DIR/build/base.vcproj', |
| 148 '$BZIP2_DIR/bzip2.vcproj', | 151 '$BZIP2_DIR/bzip2.vcproj', |
| 149 '$NET_DIR/build/net.vcproj', | 152 '$NET_DIR/build/net.vcproj', |
| 150 '$MODP_B64_DIR/modp_b64.vcproj', | 153 '$MODP_B64_DIR/modp_b64.vcproj', |
| 151 '$ZLIB_DIR/zlib.vcproj', | 154 '$ZLIB_DIR/zlib.vcproj', |
| 152 '$ICU38_DIR/build/icu.vcproj', | 155 '$ICU38_DIR/build/icu.vcproj', |
| 153 '$TESTING_DIR/gtest.vcproj', | 156 '$TESTING_DIR/gtest.vcproj', |
| 154 '$GOOGLEURL_DIR/build/googleurl.vcproj', | 157 '$GOOGLEURL_DIR/build/googleurl.vcproj', |
| 155 '$SDCH_DIR/sdch.vcproj', | 158 '$SDCH_DIR/sdch.vcproj', |
| 156 ], | 159 ], |
| 157 guid='{E99DA267-BE90-4F45-88A1-6919DB2C7567}', | |
| 158 # TODO: restore when we can derive all info, | 160 # TODO: restore when we can derive all info, |
| 159 # on all platforms, from the windows build targets. | 161 # on all platforms, from the windows build targets. |
| 160 #buildtargets=net_unittests, | 162 #buildtargets=net_unittests, |
| 161 files=input_files, | 163 files=input_files, |
| 162 ConfigurationType='1') | 164 ConfigurationType='1') |
| 163 | 165 |
| 164 p.AddConfig('Debug|Win32', | 166 p.AddConfig('Debug|Win32', |
| 165 InheritedPropertySheets=[ | 167 InheritedPropertySheets=[ |
| 166 '$(SolutionDir)../build/common.vsprops', | 168 '$(SolutionDir)../build/common.vsprops', |
| 167 '$(SolutionDir)../build/debug.vsprops', | 169 '$(SolutionDir)../build/debug.vsprops', |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 UsePrecompiledHeader='1'), | 230 UsePrecompiledHeader='1'), |
| 229 ]) | 231 ]) |
| 230 | 232 |
| 231 # TODO: Remove when we can derive this information | 233 # TODO: Remove when we can derive this information |
| 232 p.AddFileConfig('build/precompiled_net.cc', | 234 p.AddFileConfig('build/precompiled_net.cc', |
| 233 'Release|Win32', | 235 'Release|Win32', |
| 234 ExcludedFromBuild='true', | 236 ExcludedFromBuild='true', |
| 235 tools=[ | 237 tools=[ |
| 236 'VCCLCompilerTool', | 238 'VCCLCompilerTool', |
| 237 ]) | 239 ]) |
| OLD | NEW |