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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/net_unittests.scons

Issue 17327: Back out r7826, which broke the Linux build (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 11 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 | « net/net_perftests.scons ('k') | net/stress_cache.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net_unittests.scons
===================================================================
--- net/net_unittests.scons (revision 7829)
+++ net/net_unittests.scons (working copy)
@@ -34,46 +34,7 @@
],
)
-input_files = ChromeFileList([
- # TODO(sgk): violate standard indentation so we don't have to
- # reindent too much when we remove the explicit MSVSFilter() calls
- # in favor of generating the hierarchy to reflect the file system.
- MSVSFilter('support', [
- 'build/precompiled_net.cc',
- 'build/precompiled_net.h',
- 'base/run_all_unittests.cc',
- ]),
- MSVSFilter('tests', [
- MSVSFilter('disk_cache', [
- 'disk_cache/addr_unittest.cc',
- 'disk_cache/backend_unittest.cc',
- 'disk_cache/block_files_unittest.cc',
- 'disk_cache/disk_cache_test_base.cc',
- 'disk_cache/disk_cache_test_base.h',
- 'disk_cache/disk_cache_test_util.cc',
- 'disk_cache/disk_cache_test_util.h',
- 'disk_cache/entry_unittest.cc',
- 'disk_cache/mapped_file_unittest.cc',
- 'disk_cache/storage_block_unittest.cc',
- ]),
- MSVSFilter('http', [
- 'http/http_auth_cache_unittest.cc',
- 'http/http_auth_handler_basic_unittest.cc',
- 'http/http_auth_handler_digest_unittest.cc',
- 'http/http_auth_unittest.cc',
- 'http/http_cache_unittest.cc',
- 'http/http_chunked_decoder_unittest.cc',
- 'http/http_network_layer_unittest.cc',
- 'http/http_network_transaction_unittest.cc',
- 'http/http_response_headers_unittest.cc',
- 'http/http_transaction_unittest.cc',
- 'http/http_transaction_unittest.h',
- 'http/http_transaction_winhttp_unittest.cc',
- 'http/http_util_unittest.cc',
- 'http/http_vary_data_unittest.cc',
- 'http/winhttp_request_throttle_unittest.cc',
- ]),
- MSVSFilter('base', [
+input_files = [
'base/auth_cache_unittest.cc',
'base/base64_unittest.cc',
'base/bzip2_filter_unittest.cc',
@@ -88,33 +49,44 @@
'base/gzip_filter_unittest.cc',
'base/host_resolver_unittest.cc',
'base/listen_socket_unittest.cc',
- 'base/listen_socket_unittest.h',
'base/mime_sniffer_unittest.cc',
'base/mime_util_unittest.cc',
'base/net_util_unittest.cc',
'base/registry_controlled_domain_unittest.cc',
- 'base/sdch_filter_unittest.cc',
+ 'base/run_all_unittests.cc',
+ 'base/ssl_test_util.cc',
'base/ssl_client_socket_unittest.cc',
- 'base/ssl_config_service_unittest.cc',
'base/tcp_client_socket_unittest.cc',
'base/telnet_server_unittest.cc',
'base/test_completion_callback_unittest.cc',
- 'base/wininet_util_unittest.cc',
'base/x509_certificate_unittest.cc',
- ]),
- MSVSFilter('url_request', [
- 'url_request/url_request_unittest.cc',
- 'url_request/url_request_unittest.h',
- ]),
- MSVSFilter('proxy', [
+ 'disk_cache/addr_unittest.cc',
+ 'disk_cache/backend_unittest.cc',
+ 'disk_cache/block_files_unittest.cc',
+ 'disk_cache/disk_cache_test_base.cc',
+ 'disk_cache/disk_cache_test_util.cc',
+ 'disk_cache/entry_unittest.cc',
+ 'disk_cache/mapped_file_unittest.cc',
+ 'disk_cache/storage_block_unittest.cc',
+ 'http/http_auth_cache_unittest.cc',
+ 'http/http_auth_handler_basic_unittest.cc',
+ 'http/http_auth_handler_digest_unittest.cc',
+ 'http/http_auth_unittest.cc',
+ 'http/http_cache_unittest.cc',
+ 'http/http_chunked_decoder_unittest.cc',
+ 'http/http_network_layer_unittest.cc',
+ 'http/http_network_transaction_unittest.cc',
+ 'http/http_response_headers_unittest.cc',
+ 'http/http_transaction_unittest.cc',
+ 'http/http_util_unittest.cc',
+ 'http/http_vary_data_unittest.cc',
'proxy/proxy_script_fetcher_unittest.cc',
'proxy/proxy_service_unittest.cc',
- ]),
- ]),
-])
+ 'url_request/url_request_unittest.cc',
+]
-if not env.Bit('windows'):
- input_files.Remove([
+if env.Bit('windows'):
+ input_files.extend([
'base/wininet_util_unittest.cc',
'http/http_transaction_winhttp_unittest.cc',
'http/winhttp_request_throttle_unittest.cc',
@@ -122,122 +94,38 @@
if env.Bit('linux'):
# TODO(port):
- input_files.Remove([
+ to_be_ported_files = [
'base/sdch_filter_unittest.cc',
'base/ssl_config_service_unittest.cc',
- ])
+ ]
+ input_files = list(set(input_files) - set(to_be_ported_files))
if env.Bit('mac'):
- input_files.Extend([
+ input_files.extend([
'../base/platform_test_mac$OBJSUFFIX',
])
# TODO(port):
- input_files.Remove([
+ to_be_ported_files = [
'base/x509_certificate_unittest.cc',
'base/sdch_filter_unittest.cc',
'base/ssl_config_service_unittest.cc',
'url_request/url_request_unittest.cc',
- ])
+ ]
+ input_files = list(set(input_files) - set(to_be_ported_files))
-net_unittests = env.ChromeTestProgram('net_unittests', input_files)
+env.ChromeTestProgram('net_unittests', input_files)
-p = env.ChromeMSVSProject('$NET_DIR/build/net_unittests.vcproj',
- dependencies = [
- '$BASE_DIR/build/base.vcproj',
- '$BZIP2_DIR/bzip2.vcproj',
- '$NET_DIR/build/net.vcproj',
- '$MODP_B64_DIR/modp_b64.vcproj',
- '$ZLIB_DIR/zlib.vcproj',
- '$ICU38_DIR/build/icu.vcproj',
- '$TESTING_DIR/gtest.vcproj',
- '$GOOGLEURL_DIR/build/googleurl.vcproj',
- '$SDCH_DIR/sdch.vcproj',
- ],
- guid='{E99DA267-BE90-4F45-88A1-6919DB2C7567}',
- # TODO: restore when we can derive all info,
- # on all platforms, from the windows build targets.
- #buildtargets=net_unittests,
- files=input_files,
- ConfigurationType='1')
-
-p.AddConfig('Debug|Win32',
- InheritedPropertySheets=[
- '$(SolutionDir)../build/common.vsprops',
- '$(SolutionDir)../build/debug.vsprops',
- '$(SolutionDir)../testing/using_gtest.vsprops',
- ],
- tools=[
- 'VCPreBuildEventTool',
- 'VCCustomBuildTool',
- 'VCXMLDataGeneratorTool',
- 'VCWebServiceProxyGeneratorTool',
- 'VCMIDLTool',
- MSVSTool('VCCLCompilerTool',
- PrecompiledHeaderThrough='precompiled_net.h',
- ForcedIncludeFiles='precompiled_net.h',
- PreprocessorDefinitions='UNIT_TEST',
- UsePrecompiledHeader='2'),
- 'VCManagedResourceCompilerTool',
- 'VCResourceCompilerTool',
- 'VCPreLinkEventTool',
- 'VCLinkerTool',
- 'VCALinkTool',
- 'VCManifestTool',
- 'VCXDCMakeTool',
- 'VCBscMakeTool',
- 'VCFxCopTool',
- 'VCAppVerifierTool',
- 'VCWebDeploymentTool',
- 'VCPostBuildEventTool',
- ])
-
-p.AddConfig('Release|Win32',
- InheritedPropertySheets=[
- '$(SolutionDir)../build/common.vsprops',
- '$(SolutionDir)../build/release.vsprops',
- '$(SolutionDir)../testing/using_gtest.vsprops',
- ],
- tools=[
- 'VCPreBuildEventTool',
- 'VCCustomBuildTool',
- 'VCXMLDataGeneratorTool',
- 'VCWebServiceProxyGeneratorTool',
- 'VCMIDLTool',
- MSVSTool('VCCLCompilerTool',
- PreprocessorDefinitions='UNIT_TEST'),
- 'VCManagedResourceCompilerTool',
- 'VCResourceCompilerTool',
- 'VCPreLinkEventTool',
- 'VCLinkerTool',
- 'VCALinkTool',
- 'VCManifestTool',
- 'VCXDCMakeTool',
- 'VCBscMakeTool',
- 'VCFxCopTool',
- 'VCAppVerifierTool',
- 'VCWebDeploymentTool',
- 'VCPostBuildEventTool',
- ])
-
-# TODO: Remove when we can derive this information
-p.AddFileConfig('build/precompiled_net.cc',
- 'Debug|Win32',
- tools=[
- MSVSTool('VCCLCompilerTool',
- UsePrecompiledHeader='1'),
- ])
-
-# TODO: Remove when we can derive this information
-p.AddFileConfig('build/precompiled_net.cc',
- 'Release|Win32',
- ExcludedFromBuild='true',
- tools=[
- 'VCCLCompilerTool',
- ])
-
-env.AlwaysBuild(p)
-
-i = env.Command('$CHROME_SRC_DIR/net/build/net_unittests.vcproj', p,
- Copy('$TARGET', '$SOURCE'))
-Alias('msvs', i)
+env.ChromeMSVSProject('$NET_DIR/build/net_unittests.vcproj',
+ dependencies = [
+ '$BASE_DIR/build/base.vcproj',
+ '$BZIP2_DIR/bzip2.vcproj',
+ '$NET_DIR/build/net.vcproj',
+ '$MODP_B64_DIR/modp_b64.vcproj',
+ '$ZLIB_DIR/zlib.vcproj',
+ '$ICU38_DIR/build/icu.vcproj',
+ '$TESTING_DIR/gtest.vcproj',
+ '$GOOGLEURL_DIR/build/googleurl.vcproj',
+ '$SDCH_DIR/sdch.vcproj',
+ ],
+ guid='{E99DA267-BE90-4F45-88A1-6919DB2C7567}')
« no previous file with comments | « net/net_perftests.scons ('k') | net/stress_cache.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698