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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/reliability/reliability_tests.scons

Issue 17603: Generate all chrome .vcproj files: (Closed) Base URL: svn://chrome-svn/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 | « chrome/test/plugin/plugin_tests.scons ('k') | chrome/test/security_tests/security_tests.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/reliability/reliability_tests.scons
===================================================================
--- chrome/test/reliability/reliability_tests.scons (revision 8251)
+++ chrome/test/reliability/reliability_tests.scons (working copy)
@@ -62,34 +62,119 @@
],
)
-input_files = [
- '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
+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('Common', [
+ '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+ '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+ 'reliability_test_suite.h',
+ 'run_all_unittests.cc',
+ '$CHROME_DIR/test/testing_browser_process.h',
'$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+ '$CHROME_DIR/test/ui/ui_test.h',
'$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+ ]),
+ MSVSFilter('MemoryUsage', [
+ '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
+ '$CHROME_DIR/test/perf/mem_usage.h',
+ ]),
+ MSVSFilter('TestPageLoader', [
'page_load_test.cc',
- 'run_all_unittests.cc',
-]
+ 'page_load_test.h',
+ ]),
+])
+if not env.Bit('windows'):
+ # Windows-specific.
+ input_files.Remove(
+ '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+ '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+ )
+
# TODO(port):
if env.Bit('windows'):
env.ChromeTestProgram('reliability_tests', input_files)
-env.ChromeMSVSProject('$CHROME_DIR/test/reliability/reliability_tests.vcproj',
- dependencies = [
- '$CHROME_DIR/test/automation/automation.vcproj',
- '$BASE_DIR/build/base.vcproj',
- '$NET_DIR/build/net.vcproj',
- '$CHROME_DIR/browser/browser.vcproj',
- '$MODP_B64_DIR/modp_b64.vcproj',
- '$CHROME_DIR/app/chrome_exe.vcproj',
- '$ZLIB_DIR/zlib.vcproj',
- '$CHROME_DIR/common/common.vcproj',
- '$ICU38_DIR/build/icu.vcproj',
- '$BASE_DIR/build/base_gfx.vcproj',
- '$TESTING_DIR/gtest.vcproj',
- '$LIBPNG_DIR/libpng.vcproj',
- '$SKIA_DIR/skia.vcproj',
- '$GOOGLEURL_DIR/build/googleurl.vcproj',
- '$CHROME_DIR/browser/views/browser_views.vcproj',
- ],
- guid='{8A3E1774-1DE9-445C-982D-3EE37C8A752A}')
+p = env.ChromeMSVSProject('reliability_tests.vcproj',
+ dest=('$CHROME_SRC_DIR/chrome/'
+ + 'test/reliability/reliability_tests.vcproj'),
+ guid='{8A3E1774-1DE9-445C-982D-3EE37C8A752A}',
+ dependencies = [
+ '$CHROME_DIR/test/automation/automation.vcproj',
+ '$BASE_DIR/build/base.vcproj',
+ '$NET_DIR/build/net.vcproj',
+ '$CHROME_DIR/browser/browser.vcproj',
+ '$MODP_B64_DIR/modp_b64.vcproj',
+ '$CHROME_DIR/app/chrome_exe.vcproj',
+ '$ZLIB_DIR/zlib.vcproj',
+ '$CHROME_DIR/common/common.vcproj',
+ '$ICU38_DIR/build/icu.vcproj',
+ '$BASE_DIR/build/base_gfx.vcproj',
+ '$TESTING_DIR/gtest.vcproj',
+ '$LIBPNG_DIR/libpng.vcproj',
+ '$SKIA_DIR/skia.vcproj',
+ '$GOOGLEURL_DIR/build/googleurl.vcproj',
+ '$CHROME_DIR/browser/views/browser_views.vcproj',
+ ],
+ # TODO(sgk): when we can intuit the hierarchy
+ # from the built targets.
+ #buildtargets=TODO,
+ files=input_files,
+ local_directory_prefix='./',
+ tools=[
+ 'VCPreBuildEventTool',
+ 'VCCustomBuildTool',
+ 'VCXMLDataGeneratorTool',
+ 'VCWebServiceProxyGeneratorTool',
+ 'VCMIDLTool',
+ 'VCCLCompilerTool',
+ 'VCManagedResourceCompilerTool',
+ 'VCResourceCompilerTool',
+ 'VCPreLinkEventTool',
+ MSVSTool('VCLinkerTool',
+ AdditionalDependencies='winmm.lib'),
+ 'VCALinkTool',
+ 'VCManifestTool',
+ 'VCXDCMakeTool',
+ 'VCBscMakeTool',
+ 'VCFxCopTool',
+ 'VCAppVerifierTool',
+ 'VCWebDeploymentTool',
+ 'VCPostBuildEventTool',
+ ],
+ ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/common.vsprops',
+ '$(SolutionDir)../build/debug.vsprops',
+ '../../tools/build/win/precompiled_wtl.vsprops',
+ '../../tools/build/win/unit_test.vsprops',
+ '../../tools/build/win/ui_test.vsprops',
+ '../../tools/build/win/test_memory_usage.vsprops',
+ '../../tools/build/win/reliability_test.vsprops',
+ '$(SolutionDir)../skia/using_skia.vsprops',
+ '$(SolutionDir)../testing/using_gtest.vsprops',
+ ])
+
+p.AddConfig('Release|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/common.vsprops',
+ '$(SolutionDir)../build/release.vsprops',
+ '../../tools/build/win/unit_test.vsprops',
+ '../../tools/build/win/ui_test.vsprops',
+ '../../tools/build/win/test_memory_usage.vsprops',
+ '../../tools/build/win/reliability_test.vsprops',
+ '$(SolutionDir)../skia/using_skia.vsprops',
+ '$(SolutionDir)../testing/using_gtest.vsprops',
+ ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+ 'Debug|Win32',
+ tools=[
+ MSVSTool('VCCLCompilerTool',
+ UsePrecompiledHeader='1'),
+ ])
« no previous file with comments | « chrome/test/plugin/plugin_tests.scons ('k') | chrome/test/security_tests/security_tests.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698