summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-17 02:25:22 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-17 02:25:22 +0000
commitcaeb7a0ca33ec99cd3dc68e95ca23ca4aa7e8068 (patch)
tree26d23c79d97efa44f69d1b447ae4618bf34fc609 /chrome/test
parent75ddd63be217e7fed76f90578a8918ab75b3ead8 (diff)
downloadchromium_src-caeb7a0ca33ec99cd3dc68e95ca23ca4aa7e8068.zip
chromium_src-caeb7a0ca33ec99cd3dc68e95ca23ca4aa7e8068.tar.gz
chromium_src-caeb7a0ca33ec99cd3dc68e95ca23ca4aa7e8068.tar.bz2
Generate all chrome .vcproj files:
* Path name translation (/ to \) of various MSVSTool attributes. * Explicit keyword= arguments to MSVSProject. This will likely go away eventually in favor of uniform behavior. * Add a relative_path_substitutions array that can be used to substitute in Visual Studio variable like $(OutDir). * Add a local_directory_prefix that can be set to './' to only affect files in the current directory. * Additional Keyword ordering in Tool attributes to continue to match the default order Visual Studio generates. * Add a Derived() proxy class that can wrap a File node to tell the .vcproj generation that we want the derived file, not its source(s), in the file list. * In the individual *.scons files, add the necessary files (mostly .h files) to file lists, and update MSVSProject() calls with the additional necessary information. Result is identical .vcproj files modulo the following differences: * Four locales .vcproj files (da, en-US, he and zh-TW) with source file orders that don't match the other locale .vcproj files have re-ordered file lists to match the rest. * Cosmetic XML changes (white space, ending tags) in: chrome/app/chrome_dll.vcproj chrome/app/generated_resources.vcproj net/build/net_resources.vcproj * Removal or addition of ./ prefixes from various files that don't match the other file specifications within their individual .vcproj files: chrome/installer/util/util.vcproj net/build/net.vcproj net/build/net_unittests.vcproj * Add missing empty sections (<ToolFiles>, <References>, <Globals>) for consistency with other .vcproj files: chrome/tools/test/image_diff/image_diff.vcproj third_party/libpng/libpng.vcproj third_party/zlib/zlib.vcproj * Add missing RootNameSpace attribute: chrome/test/automation/automation.vcproj testing/gtest.vcproj * Use && instead of \r\n as a command separator, to sidestep XML-generation problems: chrome/app/chrome_exe.vcproj * Remove unnecessary (?) duplicate files in the file list: chrome/browser/views/browser_views.vcproj (event_utils.cc and event_utils.h were duplicated) Review URL: http://codereview.chromium.org/17603 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8253 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/activex_test_control/activex_test_control.scons65
-rw-r--r--chrome/test/automated_ui_tests/automated_ui_tests.scons139
-rw-r--r--chrome/test/automation/automation.scons56
-rw-r--r--chrome/test/chrome_plugin/test_chrome_plugin.scons93
-rw-r--r--chrome/test/interactive_ui/interactive_ui_tests.scons233
-rw-r--r--chrome/test/memory_test/memory_test.scons121
-rw-r--r--chrome/test/mini_installer_test/mini_installer_test.scons100
-rw-r--r--chrome/test/page_cycler/page_cycler_tests.scons125
-rw-r--r--chrome/test/perf/perftests.scons186
-rw-r--r--chrome/test/plugin/plugin_tests.scons128
-rw-r--r--chrome/test/reliability/reliability_tests.scons131
-rw-r--r--chrome/test/security_tests/security_tests.scons55
-rw-r--r--chrome/test/selenium/selenium_tests.scons117
-rw-r--r--chrome/test/startup/startup_tests.scons111
-rw-r--r--chrome/test/tab_switching/tab_switching_test.scons124
-rw-r--r--chrome/test/ui/ui_tests.scons363
-rw-r--r--chrome/test/unit/unit_tests.scons288
17 files changed, 2005 insertions, 430 deletions
diff --git a/chrome/test/activex_test_control/activex_test_control.scons b/chrome/test/activex_test_control/activex_test_control.scons
index bfbbbcf..15ce4ef 100644
--- a/chrome/test/activex_test_control/activex_test_control.scons
+++ b/chrome/test/activex_test_control/activex_test_control.scons
@@ -40,16 +40,71 @@ if env.Bit('windows'):
if env.Bit('windows'):
env.TypeLibrary('activex_test_control.idl')
-input_files = [
+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('resource', [
+ 'activex_test_control.rc',
+ 'activex_test_control.rgs',
+ 'chrome_test_control.bmp',
+ 'chrome_test_control.rgs',
+ ]),
'activex_test_control.cc',
'activex_test_control.def',
+ 'activex_test_control.idl',
'chrome_test_control.cc',
-]
+ 'chrome_test_control.h',
+ 'chrome_test_control_cp.h',
+ 'resource.h',
+])
# TODO(port):
if env.Bit('windows'):
env.ChromeSharedLibrary('activex_test_control', input_files)
-env.ChromeMSVSProject(('$CHROME_DIR/test/activex_test_control/' +
- 'activex_test_control.vcproj'),
- guid='{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}')
+p = env.ChromeMSVSProject('activex_test_control.vcproj',
+ dest=('$CHROME_SRC_DIR/chrome/test/'
+ + 'activex_test_control/'
+ + 'activex_test_control.vcproj'),
+ keyword='AtlProj',
+ guid='{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}',
+ # TODO(sgk): when we can intuit the hierarchy
+ # from the built targets.
+ #buildtargets=TODO,
+ files=input_files,
+ relative_path_prefix='./',
+ tools=[
+ 'VCPreBuildEventTool',
+ 'VCCustomBuildTool',
+ 'VCXMLDataGeneratorTool',
+ 'VCWebServiceProxyGeneratorTool',
+ 'VCMIDLTool',
+ 'VCCLCompilerTool',
+ 'VCManagedResourceCompilerTool',
+ 'VCResourceCompilerTool',
+ 'VCPreLinkEventTool',
+ 'VCLinkerTool',
+ 'VCALinkTool',
+ 'VCManifestTool',
+ 'VCXDCMakeTool',
+ 'VCBscMakeTool',
+ 'VCFxCopTool',
+ 'VCAppVerifierTool',
+ 'VCWebDeploymentTool',
+ 'VCPostBuildEventTool',
+ ],
+ ConfigurationType='2')
+
+
+p.AddConfig('Debug|Win32',
+ InheritedPropertySheets=[
+ './activex_test_control.vsprops',
+ '$(SolutionDir)../build/debug.vsprops',
+ ])
+
+p.AddConfig('Release|Win32',
+ InheritedPropertySheets=[
+ './activex_test_control.vsprops',
+ '$(SolutionDir)../build/release.vsprops',
+ ])
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.scons b/chrome/test/automated_ui_tests/automated_ui_tests.scons
index 269d02a..e0de9ac 100644
--- a/chrome/test/automated_ui_tests/automated_ui_tests.scons
+++ b/chrome/test/automated_ui_tests/automated_ui_tests.scons
@@ -63,37 +63,124 @@ if env.Bit('windows'):
],
)
-input_files = [
- 'automated_ui_tests.cc',
-
- '$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',
'$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+ '$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('AutomatedUITest', [
+ 'automated_ui_tests.cc',
+ 'automated_ui_tests.h',
+ ]),
+])
+
+if not env.Bit('windows'):
+ 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('automated_ui_tests', input_files)
-env.ChromeMSVSProject('$CHROME_DIR/test/automated_ui_tests/automated_ui_tests.vcproj',
- dependencies = [
- '$CHROME_DIR/test/automation/automation.vcproj',
- '$BASE_DIR/build/base.vcproj',
- '$LIBXML_DIR/build/libxml_config.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',
- '$LIBXML_DIR/build/libxml.vcproj',
- '$CHROME_DIR/browser/views/browser_views.vcproj',
- ],
- guid='{D2250C20-3A94-4FB9-AF73-11BC5B73884B}')
+p = env.ChromeMSVSProject('automated_ui_tests.vcproj',
+ dest=('$CHROME_SRC_DIR/chrome/test/'
+ + 'automated_ui_tests/'
+ + 'automated_ui_tests.vcproj'),
+ root_namespace='page_cycler_tests',
+ guid='{D2250C20-3A94-4FB9-AF73-11BC5B73884B}',
+ dependencies = [
+ '$CHROME_DIR/test/automation/automation.vcproj',
+ '$BASE_DIR/build/base.vcproj',
+ '$LIBXML_DIR/build/libxml_config.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',
+ '$LIBXML_DIR/build/libxml.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',
+ 'VCLinkerTool',
+ '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',
+ '$(SolutionDir)../skia/using_skia.vsprops',
+ ('$(SolutionDir)../'
+ + 'third_party/libxml/build/using_libxml.vsprops'),
+ '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+ '../../tools/build/win/test_memory_usage.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',
+ '$(SolutionDir)../skia/using_skia.vsprops',
+ ('$(SolutionDir)../'
+ + 'third_party/libxml/build/using_libxml.vsprops'),
+ '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+ '$(SolutionDir)../testing/using_gtest.vsprops',
+ ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+ 'Debug|Win32',
+ tools=[
+ MSVSTool('VCCLCompilerTool',
+ UsePrecompiledHeader='1'),
+ ])
diff --git a/chrome/test/automation/automation.scons b/chrome/test/automation/automation.scons
index 2708f8b..76e731c 100644
--- a/chrome/test/automation/automation.scons
+++ b/chrome/test/automation/automation.scons
@@ -17,19 +17,67 @@ env.Prepend(
],
)
-input_files = [
+input_files = ChromeFileList([
'autocomplete_edit_proxy.cc',
+ 'autocomplete_edit_proxy.h',
+ 'automation_constants.h',
'automation_handle_tracker.cc',
+ 'automation_handle_tracker.h',
+ 'automation_messages.h',
+ 'automation_messages_internal.h',
'automation_proxy.cc',
+ 'automation_proxy.h',
'browser_proxy.cc',
+ 'browser_proxy.h',
'constrained_window_proxy.cc',
+ 'constrained_window_proxy.h',
'tab_proxy.cc',
+ 'tab_proxy.h',
'window_proxy.cc',
-]
+ 'window_proxy.h',
+])
# TODO(port):
if env.Bit('windows'):
env.ChromeLibrary('automation', input_files)
-env.ChromeMSVSProject('$CHROME_DIR/test/automation/automation.vcproj',
- guid='{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}')
+p = env.ChromeMSVSProject('automation.vcproj',
+ dest=('$CHROME_SRC_DIR/chrome/'
+ + 'test/automation/automation.vcproj'),
+ guid='{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}',
+ # TODO(sgk): when we can intuit the hierarchy
+ # from the built targets.
+ #buildtargets=TODO,
+ files=input_files,
+ relative_path_prefix='./',
+ tools=[
+ 'VCPreBuildEventTool',
+ 'VCCustomBuildTool',
+ 'VCXMLDataGeneratorTool',
+ 'VCWebServiceProxyGeneratorTool',
+ 'VCMIDLTool',
+ 'VCCLCompilerTool',
+ 'VCManagedResourceCompilerTool',
+ 'VCResourceCompilerTool',
+ 'VCPreLinkEventTool',
+ 'VCLibrarianTool',
+ 'VCALinkTool',
+ 'VCXDCMakeTool',
+ 'VCBscMakeTool',
+ 'VCFxCopTool',
+ 'VCPostBuildEventTool',
+ ],
+ ConfigurationType='4')
+
+
+p.AddConfig('Debug|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/debug.vsprops',
+ './automation.vsprops',
+ ])
+
+p.AddConfig('Release|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/release.vsprops',
+ './automation.vsprops',
+ ])
diff --git a/chrome/test/chrome_plugin/test_chrome_plugin.scons b/chrome/test/chrome_plugin/test_chrome_plugin.scons
index ca6ad83..699bcc0 100644
--- a/chrome/test/chrome_plugin/test_chrome_plugin.scons
+++ b/chrome/test/chrome_plugin/test_chrome_plugin.scons
@@ -41,22 +41,89 @@ if env.Bit('windows'):
],
)
-input_files = [
+input_files = ChromeFileList([
'test_chrome_plugin.cc',
-]
+ 'test_chrome_plugin.def',
+ 'test_chrome_plugin.h',
+])
-if env.Bit('windows'):
- input_files.extend([
+if not env.Bit('windows'):
+ input_files.Remove(
'test_chrome_plugin.def',
- ])
+ )
env.ChromeSharedLibrary('test_chrome_plugin', input_files)
-env.ChromeMSVSProject('$CHROME_DIR/test/chrome_plugin/test_chrome_plugin.vcproj',
- dependencies = [
- '$BASE_DIR/build/base.vcproj',
- '$ICU38_DIR/build/icu.vcproj',
- '$ICU38_DIR/build/icudt.vcproj',
- '$GOOGLEURL_DIR/build/googleurl.vcproj',
- ],
- guid='{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}')
+p = env.ChromeMSVSProject('test_chrome_plugin.vcproj',
+ dest=('$CHROME_SRC_DIR/chrome/test/'
+ + 'chrome_plugin/test_chrome_plugin.vcproj'),
+ root_namespace='startup_tests',
+ guid='{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}',
+ dependencies = [
+ '$BASE_DIR/build/base.vcproj',
+ '$ICU38_DIR/build/icu.vcproj',
+ '$ICU38_DIR/build/icudt.vcproj',
+ '$GOOGLEURL_DIR/build/googleurl.vcproj',
+ ],
+ # TODO(sgk): when we can intuit the hierarchy
+ # from the built targets.
+ #buildtargets=TODO,
+ files=input_files,
+ relative_path_prefix='./',
+ ConfigurationType='2')
+
+
+p.AddConfig('Debug|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/debug.vsprops',
+ './test_chrome_plugin.vsprops',
+ ],
+ tools=[
+ 'VCPreBuildEventTool',
+ 'VCCustomBuildTool',
+ 'VCXMLDataGeneratorTool',
+ 'VCWebServiceProxyGeneratorTool',
+ 'VCMIDLTool',
+ MSVSTool('VCCLCompilerTool',
+ UsePrecompiledHeader='0'),
+ 'VCManagedResourceCompilerTool',
+ 'VCResourceCompilerTool',
+ 'VCPreLinkEventTool',
+ MSVSTool('VCLinkerTool',
+ AdditionalDependencies='winmm.lib'),
+ 'VCALinkTool',
+ 'VCManifestTool',
+ 'VCXDCMakeTool',
+ 'VCBscMakeTool',
+ 'VCFxCopTool',
+ 'VCAppVerifierTool',
+ 'VCWebDeploymentTool',
+ 'VCPostBuildEventTool',
+ ])
+
+p.AddConfig('Release|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/release.vsprops',
+ './test_chrome_plugin.vsprops',
+ ],
+ tools=[
+ 'VCPreBuildEventTool',
+ 'VCCustomBuildTool',
+ 'VCXMLDataGeneratorTool',
+ 'VCWebServiceProxyGeneratorTool',
+ 'VCMIDLTool',
+ 'VCCLCompilerTool',
+ 'VCManagedResourceCompilerTool',
+ 'VCResourceCompilerTool',
+ 'VCPreLinkEventTool',
+ MSVSTool('VCLinkerTool',
+ AdditionalDependencies='winmm.lib'),
+ 'VCALinkTool',
+ 'VCManifestTool',
+ 'VCXDCMakeTool',
+ 'VCBscMakeTool',
+ 'VCFxCopTool',
+ 'VCAppVerifierTool',
+ 'VCWebDeploymentTool',
+ 'VCPostBuildEventTool',
+ ])
diff --git a/chrome/test/interactive_ui/interactive_ui_tests.scons b/chrome/test/interactive_ui/interactive_ui_tests.scons
index 769405d..dfe56a9 100644
--- a/chrome/test/interactive_ui/interactive_ui_tests.scons
+++ b/chrome/test/interactive_ui/interactive_ui_tests.scons
@@ -89,70 +89,189 @@ if env.Bit('windows'):
],
)
-input_files = [
- '$CHROME_DIR/browser/browser_focus_uitest.cc',
- '$CHROME_DIR/browser/views/bookmark_bar_view_test.cc',
- '$CHROME_DIR/browser/views/constrained_window_impl_interactive_uitest.cc',
- '$CHROME_DIR/browser/views/tabs/tab_dragging_test.cc',
- '$CHROME_DIR/test/interactive_ui/npapi_interactive_test.cc',
- '$CHROME_DIR/test/testing_profile$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/test/ui/npapi_test_helper$OBJSUFFIX',
+ '$CHROME_DIR/test/ui/npapi_test_helper.h',
+ '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+ '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
'$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+ '$CHROME_DIR/test/testing_profile$OBJSUFFIX',
+ '$CHROME_DIR/test/testing_profile.h',
'$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+ '$CHROME_DIR/test/ui/ui_test.h',
'$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
-
'view_event_test_base.cc',
-]
+ 'view_event_test_base.h',
+ ]),
+ MSVSFilter('TestBookmarkBarView', [
+ '$CHROME_DIR/browser/views/bookmark_bar_view_test.cc',
+ ]),
+ MSVSFilter('TestFindInPage', [
+ '$CHROME_DIR/browser/views/find_bar_win_interactive_uitest.cc',
+ ]),
+ MSVSFilter('TestFocus', [
+ '$CHROME_DIR/browser/browser_focus_uitest.cc',
+ '$CHROME_DIR/browser/views/constrained_window_impl_interactive_uitest.cc',
+ ]),
+ MSVSFilter('TestTabDragging', [
+ '$CHROME_DIR/browser/views/tabs/tab_dragging_test.cc',
+ ]),
+ MSVSFilter('TestNPAPI', [
+ 'npapi_interactive_test.cc',
+ ]),
+])
+
+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('interactive_ui_tests', input_files)
-env.ChromeMSVSProject('$CHROME_DIR/test/interactive_ui/interactive_ui.vcproj',
- name='interactive_ui_tests',
- dependencies = [
- '$CHROME_DIR/test/automation/automation.vcproj',
- '$BASE_DIR/build/base.vcproj',
- '$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
- '$CHROME_DIR/plugin/plugin.vcproj',
- '$LIBJPEG_DIR/libjpeg.vcproj',
- '$BZIP2_DIR/bzip2.vcproj',
- '$NET_DIR/build/net.vcproj',
- ('$WEBKIT_DIR/build/JavaScriptCore/' +
- 'JavaScriptCore_pcre.vcproj'),
- '$WEBKIT_DIR/build/port/port.vcproj',
- '$CHROME_DIR/browser/debugger/debugger.vcproj',
- '$WEBKIT_DIR/default_plugin/default_plugin.vcproj',
- '$CHROME_DIR/browser/browser.vcproj',
- '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj',
- '$SQLITE_DIR/sqlite.vcproj',
- '$CHROME_DIR/views/views.vcproj',
- '$MODP_B64_DIR/modp_b64.vcproj',
- '$CHROME_DIR/app/chrome_exe.vcproj',
- ('$CHROME_DIR/test/chrome_plugin/' +
- 'test_chrome_plugin.vcproj'),
- '$ZLIB_DIR/zlib.vcproj',
- '$CHROME_DIR/common/common.vcproj',
- '$ICU38_DIR/build/icu.vcproj',
- '$CHROME_DIR/renderer/renderer.vcproj',
- '$BASE_DIR/build/base_gfx.vcproj',
- '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj',
- ('$CHROME_DIR/browser/resources/' +
- 'browser_resources.vcproj'),
- '$RLZ_DIR/rlz.vcproj',
- '$TESTING_DIR/gtest.vcproj',
- '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj',
- '$LIBPNG_DIR/libpng.vcproj',
- '$WEBKIT_DIR/build/glue/glue.vcproj',
- '$CHROME_DIR/app/locales/en-US.vcproj',
- '$SKIA_DIR/skia.vcproj',
- '$CHROME_DIR/third_party/hunspell/hunspell.vcproj',
- '$GOOGLEURL_DIR/build/googleurl.vcproj',
- '$CHROME_DIR/installer/util/util.vcproj',
- '$WEBKIT_DIR/activex_shim/activex_shim.vcproj',
- '$SDCH_DIR/sdch.vcproj',
- '$CHROME_DIR/browser/views/browser_views.vcproj',
- '$LIBXSLT_DIR/build/libxslt.vcproj',
- '$CHROME_DIR/app/theme/theme_dll.vcproj',
- ],
- guid='{018D4F38-6272-448F-A864-976DA09F05D0}')
+p = env.ChromeMSVSProject('interactive_ui.vcproj',
+ name='interactive_ui_tests',
+ root_namespace='manual_ui',
+ dest=('$CHROME_SRC_DIR/chrome/test/'
+ + 'interactive_ui/interactive_ui.vcproj'),
+ guid='{018D4F38-6272-448F-A864-976DA09F05D0}',
+ dependencies = [
+ '$CHROME_DIR/test/automation/automation.vcproj',
+ '$BASE_DIR/build/base.vcproj',
+ '$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
+ '$CHROME_DIR/plugin/plugin.vcproj',
+ '$LIBJPEG_DIR/libjpeg.vcproj',
+ '$BZIP2_DIR/bzip2.vcproj',
+ '$NET_DIR/build/net.vcproj',
+ ('$WEBKIT_DIR/build/JavaScriptCore/' +
+ 'JavaScriptCore_pcre.vcproj'),
+ '$WEBKIT_DIR/build/port/port.vcproj',
+ '$CHROME_DIR/browser/debugger/debugger.vcproj',
+ ('$WEBKIT_DIR/default_plugin/'
+ + 'default_plugin.vcproj'),
+ '$CHROME_DIR/browser/browser.vcproj',
+ '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj',
+ '$SQLITE_DIR/sqlite.vcproj',
+ '$CHROME_DIR/views/views.vcproj',
+ '$MODP_B64_DIR/modp_b64.vcproj',
+ '$CHROME_DIR/app/chrome_exe.vcproj',
+ ('$CHROME_DIR/test/chrome_plugin/' +
+ 'test_chrome_plugin.vcproj'),
+ '$ZLIB_DIR/zlib.vcproj',
+ '$CHROME_DIR/common/common.vcproj',
+ '$ICU38_DIR/build/icu.vcproj',
+ '$CHROME_DIR/renderer/renderer.vcproj',
+ '$BASE_DIR/build/base_gfx.vcproj',
+ '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj',
+ ('$CHROME_DIR/browser/resources/' +
+ 'browser_resources.vcproj'),
+ '$RLZ_DIR/rlz.vcproj',
+ '$TESTING_DIR/gtest.vcproj',
+ '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj',
+ '$LIBPNG_DIR/libpng.vcproj',
+ '$WEBKIT_DIR/build/glue/glue.vcproj',
+ '$CHROME_DIR/app/locales/en-US.vcproj',
+ '$SKIA_DIR/skia.vcproj',
+ ('$CHROME_DIR/third_party/'
+ + 'hunspell/hunspell.vcproj'),
+ '$GOOGLEURL_DIR/build/googleurl.vcproj',
+ '$CHROME_DIR/installer/util/util.vcproj',
+ '$WEBKIT_DIR/activex_shim/activex_shim.vcproj',
+ '$SDCH_DIR/sdch.vcproj',
+ '$CHROME_DIR/browser/views/browser_views.vcproj',
+ '$LIBXSLT_DIR/build/libxslt.vcproj',
+ '$CHROME_DIR/app/theme/theme_dll.vcproj',
+ ],
+ # TODO(sgk): when we can intuit the hierarchy
+ # from the built targets.
+ #buildtargets=TODO,
+ files=input_files,
+ local_directory_prefix='./',
+ 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',
+ '$(SolutionDir)../third_party/libpng/using_libpng.vsprops',
+ '$(SolutionDir)../third_party/zlib/using_zlib.vsprops',
+ '$(SolutionDir)../skia/using_skia.vsprops',
+ ('$(SolutionDir)../'
+ + 'third_party/libxml/build/using_libxml.vsprops'),
+ '../../../third_party/icu38/build/using_icu.vsprops',
+ '$(SolutionDir)../testing/using_gtest.vsprops',
+ '../../third_party/hunspell/using_hunspell.vsprops',
+ ],
+ tools=[
+ 'VCPreBuildEventTool',
+ 'VCCustomBuildTool',
+ 'VCXMLDataGeneratorTool',
+ 'VCWebServiceProxyGeneratorTool',
+ 'VCMIDLTool',
+ 'VCCLCompilerTool',
+ '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',
+ '../../tools/build/win/unit_test.vsprops',
+ '$(SolutionDir)../third_party/libpng/using_libpng.vsprops',
+ '$(SolutionDir)../third_party/zlib/using_zlib.vsprops',
+ '$(SolutionDir)../skia/using_skia.vsprops',
+ ('$(SolutionDir)../'
+ + 'third_party/libxml/build/using_libxml.vsprops'),
+ '../../../third_party/icu38/build/using_icu.vsprops',
+ '$(SolutionDir)../testing/using_gtest.vsprops',
+ '../../third_party/hunspell/using_hunspell.vsprops',
+ ],
+ tools=[
+ 'VCPreBuildEventTool',
+ 'VCCustomBuildTool',
+ 'VCXMLDataGeneratorTool',
+ 'VCWebServiceProxyGeneratorTool',
+ 'VCMIDLTool',
+ 'VCCLCompilerTool',
+ 'VCManagedResourceCompilerTool',
+ 'VCResourceCompilerTool',
+ 'VCPreLinkEventTool',
+ MSVSTool('VCLinkerTool',
+ AdditionalDependencies='winmm.lib'),
+ 'VCALinkTool',
+ 'VCManifestTool',
+ 'VCXDCMakeTool',
+ 'VCBscMakeTool',
+ 'VCFxCopTool',
+ 'VCAppVerifierTool',
+ 'VCWebDeploymentTool',
+ 'VCPostBuildEventTool',
+ ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+ 'Debug|Win32',
+ tools=[
+ MSVSTool('VCCLCompilerTool',
+ UsePrecompiledHeader='1'),
+ ])
diff --git a/chrome/test/memory_test/memory_test.scons b/chrome/test/memory_test/memory_test.scons
index a7b094c..fb3a316 100644
--- a/chrome/test/memory_test/memory_test.scons
+++ b/chrome/test/memory_test/memory_test.scons
@@ -54,32 +54,113 @@ if env.Bit('windows'):
],
)
-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',
'$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+ '$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('TestMemory', [
'memory_test.cc',
-]
+ ]),
+])
+
+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('memory_test', input_files)
-env.ChromeMSVSProject('$CHROME_DIR/test/memory_test/memory_test.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',
- '$ZLIB_DIR/zlib.vcproj',
- '$CHROME_DIR/common/common.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='{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}')
+p = env.ChromeMSVSProject('memory_test.vcproj',
+ dest=('$CHROME_SRC_DIR/chrome/'
+ + 'test/memory_test/memory_test.vcproj'),
+ guid='{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}',
+ 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',
+ '$ZLIB_DIR/zlib.vcproj',
+ '$CHROME_DIR/common/common.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',
+ '$(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',
+ '$(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'),
+ ])
diff --git a/chrome/test/mini_installer_test/mini_installer_test.scons b/chrome/test/mini_installer_test/mini_installer_test.scons
index c54cbdd..6d8b12d 100644
--- a/chrome/test/mini_installer_test/mini_installer_test.scons
+++ b/chrome/test/mini_installer_test/mini_installer_test.scons
@@ -57,23 +57,99 @@ if env.Bit('windows'):
],
)
-input_files = [
- '$CHROME_DIR/installer/setup/setup_constants$OBJSUFFIX',
- '$CHROME_DIR/installer/util/run_all_unittests$OBJSUFFIX',
+input_files = ChromeFileList([
'chrome_mini_installer.cc',
+ 'chrome_mini_installer.h',
'mini_installer_test_constants.cc',
+ 'mini_installer_test_constants.h',
+ '$CHROME_DIR/installer/util/run_all_unittests$OBJSUFFIX',
+ '$CHROME_DIR/installer/setup/setup_constants$OBJSUFFIX',
'test.cc',
-]
+])
# TODO(port):
if env.Bit('windows'):
env.ChromeTestProgram('mini_installer_test', input_files)
-env.ChromeMSVSProject('$CHROME_DIR/test/mini_installer_test/mini_installer_test.vcproj',
- dependencies = [
- '$BASE_DIR/build/base.vcproj',
- '$ICU38_DIR/build/icu.vcproj',
- '$TESTING_DIR/gtest.vcproj',
- '$CHROME_DIR/installer/util/util.vcproj',
- ],
- guid='{4B6E199A-034A-49BD-AB93-458DD37E45B1}')
+p = env.ChromeMSVSProject('mini_installer_test.vcproj',
+ dest=('$CHROME_SRC_DIR/chrome/test/'
+ + 'mini_installer_test/'
+ + 'mini_installer_test.vcproj'),
+ guid='{4B6E199A-034A-49BD-AB93-458DD37E45B1}',
+ keyword='Win32Proj',
+ dependencies = [
+ '$BASE_DIR/build/base.vcproj',
+ '$ICU38_DIR/build/icu.vcproj',
+ '$TESTING_DIR/gtest.vcproj',
+ '$CHROME_DIR/installer/util/util.vcproj',
+ ],
+ # TODO(sgk): when we can intuit the hierarchy
+ # from the built targets.
+ #buildtargets=TODO,
+ files=input_files,
+ local_directory_prefix='./',
+ ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/common.vsprops',
+ '$(SolutionDir)../build/debug.vsprops',
+ '$(SolutionDir)/tools/build/win/unit_test.vsprops',
+ '$(SolutionDir)../testing/using_gtest.vsprops',
+ ],
+ tools=[
+ 'VCPreBuildEventTool',
+ 'VCCustomBuildTool',
+ 'VCXMLDataGeneratorTool',
+ 'VCWebServiceProxyGeneratorTool',
+ 'VCMIDLTool',
+ 'VCCLCompilerTool',
+ 'VCManagedResourceCompilerTool',
+ 'VCResourceCompilerTool',
+ 'VCPreLinkEventTool',
+ MSVSTool('VCLinkerTool',
+ IgnoreDefaultLibraryNames=''),
+ 'VCALinkTool',
+ MSVSTool('VCManifestTool',
+ AdditionalManifestFiles=('$(SolutionDir)installer/'
+ + 'mini_installer/'
+ + 'mini_installer.exe.manifest')),
+ 'VCXDCMakeTool',
+ 'VCBscMakeTool',
+ 'VCFxCopTool',
+ 'VCAppVerifierTool',
+ 'VCWebDeploymentTool',
+ 'VCPostBuildEventTool',
+ ])
+
+p.AddConfig('Release|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/common.vsprops',
+ '$(SolutionDir)../build/release.vsprops',
+ '$(SolutionDir)/tools/build/win/unit_test.vsprops',
+ '$(SolutionDir)../testing/using_gtest.vsprops',
+ ],
+ tools=[
+ 'VCPreBuildEventTool',
+ 'VCCustomBuildTool',
+ 'VCXMLDataGeneratorTool',
+ 'VCWebServiceProxyGeneratorTool',
+ 'VCMIDLTool',
+ 'VCCLCompilerTool',
+ 'VCManagedResourceCompilerTool',
+ 'VCResourceCompilerTool',
+ 'VCPreLinkEventTool',
+ 'VCLinkerTool',
+ 'VCALinkTool',
+ MSVSTool('VCManifestTool',
+ AdditionalManifestFiles=('$(SolutionDir)installer/'
+ + 'mini_installer/'
+ + 'mini_installer.exe.manifest')),
+ 'VCXDCMakeTool',
+ 'VCBscMakeTool',
+ 'VCFxCopTool',
+ 'VCAppVerifierTool',
+ 'VCWebDeploymentTool',
+ 'VCPostBuildEventTool',
+ ])
diff --git a/chrome/test/page_cycler/page_cycler_tests.scons b/chrome/test/page_cycler/page_cycler_tests.scons
index f04bba7..b265b25 100644
--- a/chrome/test/page_cycler/page_cycler_tests.scons
+++ b/chrome/test/page_cycler/page_cycler_tests.scons
@@ -60,34 +60,115 @@ if env.Bit('windows'):
],
)
-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',
'$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+ '$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('TestPageCycler', [
'page_cycler_test.cc',
-]
+ ]),
+])
+
+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('page_cycler_tests', input_files)
-env.ChromeMSVSProject('$CHROME_DIR/test/page_cycler/page_cycler_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='{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}')
+p = env.ChromeMSVSProject('page_cycler_tests.vcproj',
+ dest=('$CHROME_SRC_DIR/chrome/'
+ + 'test/page_cycler/page_cycler_tests.vcproj'),
+ guid='{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}',
+ 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',
+ '$(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',
+ '$(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'),
+ ])
diff --git a/chrome/test/perf/perftests.scons b/chrome/test/perf/perftests.scons
index 2767199..b645d38 100644
--- a/chrome/test/perf/perftests.scons
+++ b/chrome/test/perf/perftests.scons
@@ -35,16 +35,6 @@ if env.Bit('posix'):
'$LIBEVENT_DIR/using_libevent.scons',
], {'env':env})
-input_files = [
- 'perftests.cc',
- 'url_parse_perftest.cc',
- '$BASE_DIR/perftimer$OBJSUFFIX',
- '$CHROME_DIR/browser/safe_browsing/database_perftest.cc',
- '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX',
- '$CHROME_DIR/browser/visitedlink_perftest.cc',
- '$CHROME_DIR/common/json_value_serializer_perftest.cc',
-]
-
if env.Bit('windows'):
env.Prepend(
LIBS = [
@@ -54,64 +44,148 @@ if env.Bit('windows'):
]
)
+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('TestVisitedLink', [
+ '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX',
+ '$CHROME_DIR/browser/visitedlink_perftest.cc',
+ ]),
+ MSVSFilter('Common', [
+ 'perftests.cc',
+ '$BASE_DIR/perftimer$OBJSUFFIX',
+ ]),
+ MSVSFilter('TestURLParser', [
+ 'url_parse_perftest.cc',
+ ]),
+ MSVSFilter('TestJSONSerializer', [
+ '$CHROME_DIR/common/json_value_serializer_perftest.cc',
+ ]),
+ MSVSFilter('TestSafeBrowsing', [
+ '$CHROME_DIR/browser/safe_browsing/database_perftest.cc',
+ ]),
+])
+
if env.Bit('linux'):
# TODO(port): Port these files.
- remove_files = [
+ input_files.Remove(
'url_parse_perftest.cc',
'$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX',
'$CHROME_DIR/browser/visitedlink_perftest.cc',
- ]
- for file in remove_files:
- input_files.remove(file)
+ )
if env.Bit('mac'):
# TODO(port): Port these files.
- remove_files = [
+ input_files.Remove(
'url_parse_perftest.cc',
'$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX',
'$CHROME_DIR/browser/visitedlink_perftest.cc',
- ]
- for file in remove_files:
- input_files.remove(file)
+ )
if not env.Bit('mac'):
env.ChromeTestProgram('perf_tests', input_files)
-env.ChromeMSVSProject('$CHROME_DIR/test/perf/perftests.vcproj',
- name='perf_tests',
- dependencies = [
- '$BASE_DIR/build/base.vcproj',
- '$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
- '$CHROME_DIR/plugin/plugin.vcproj',
- '$LIBJPEG_DIR/libjpeg.vcproj',
- '$BZIP2_DIR/bzip2.vcproj',
- '$NET_DIR/build/net.vcproj',
- '$WEBKIT_DIR/build/JavaScriptCore/JavaScriptCore_pcre.vcproj',
- '$WEBKIT_DIR/build/port/port.vcproj',
- '$CHROME_DIR/browser/debugger/debugger.vcproj',
- '$WEBKIT_DIR/default_plugin/default_plugin.vcproj',
- '$CHROME_DIR/browser/browser.vcproj',
- '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj',
- '$SQLITE_DIR/sqlite.vcproj',
- '$CHROME_DIR/views/views.vcproj',
- '$MODP_B64_DIR/modp_b64.vcproj',
- '$ZLIB_DIR/zlib.vcproj',
- '$CHROME_DIR/common/common.vcproj',
- '$ICU38_DIR/build/icu.vcproj',
- '$CHROME_DIR/renderer/renderer.vcproj',
- '$BASE_DIR/build/base_gfx.vcproj',
- '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj',
- '$TESTING_DIR/gtest.vcproj',
- '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj',
- '$LIBPNG_DIR/libpng.vcproj',
- '$WEBKIT_DIR/build/glue/glue.vcproj',
- '$SKIA_DIR/skia.vcproj',
- '$CHROME_DIR/third_party/hunspell/hunspell.vcproj',
- '$GOOGLEURL_DIR/build/googleurl.vcproj',
- '$CHROME_DIR/installer/util/util.vcproj',
- '$WEBKIT_DIR/activex_shim/activex_shim.vcproj',
- '$SDCH_DIR/sdch.vcproj',
- '$CHROME_DIR/browser/views/browser_views.vcproj',
- '$LIBXSLT_DIR/build/libxslt.vcproj',
- ],
- guid='{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}')
+p = env.ChromeMSVSProject('perftests.vcproj',
+ name='perf_tests',
+ dest=('$CHROME_SRC_DIR/chrome/'
+ + 'test/perf/perftests.vcproj'),
+ guid='{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}',
+ keyword='Win32Proj',
+ dependencies = [
+ '$BASE_DIR/build/base.vcproj',
+ '$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
+ '$CHROME_DIR/plugin/plugin.vcproj',
+ '$LIBJPEG_DIR/libjpeg.vcproj',
+ '$BZIP2_DIR/bzip2.vcproj',
+ '$NET_DIR/build/net.vcproj',
+ ('$WEBKIT_DIR/build/'
+ + 'JavaScriptCore/JavaScriptCore_pcre.vcproj'),
+ '$WEBKIT_DIR/build/port/port.vcproj',
+ '$CHROME_DIR/browser/debugger/debugger.vcproj',
+ ('$WEBKIT_DIR/default_plugin/'
+ + 'default_plugin.vcproj'),
+ '$CHROME_DIR/browser/browser.vcproj',
+ '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj',
+ '$SQLITE_DIR/sqlite.vcproj',
+ '$CHROME_DIR/views/views.vcproj',
+ '$MODP_B64_DIR/modp_b64.vcproj',
+ '$ZLIB_DIR/zlib.vcproj',
+ '$CHROME_DIR/common/common.vcproj',
+ '$ICU38_DIR/build/icu.vcproj',
+ '$CHROME_DIR/renderer/renderer.vcproj',
+ '$BASE_DIR/build/base_gfx.vcproj',
+ '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj',
+ '$TESTING_DIR/gtest.vcproj',
+ '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj',
+ '$LIBPNG_DIR/libpng.vcproj',
+ '$WEBKIT_DIR/build/glue/glue.vcproj',
+ '$SKIA_DIR/skia.vcproj',
+ ('$CHROME_DIR/third_party/'
+ + 'hunspell/hunspell.vcproj'),
+ '$GOOGLEURL_DIR/build/googleurl.vcproj',
+ '$CHROME_DIR/installer/util/util.vcproj',
+ '$WEBKIT_DIR/activex_shim/activex_shim.vcproj',
+ '$SDCH_DIR/sdch.vcproj',
+ '$CHROME_DIR/browser/views/browser_views.vcproj',
+ '$LIBXSLT_DIR/build/libxslt.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',
+ MSVSTool('VCCLCompilerTool',
+ PreprocessorDefinitions=[
+ 'PERF_TEST',
+ '_CRT_RAND_S',
+ ]),
+ 'VCManagedResourceCompilerTool',
+ 'VCResourceCompilerTool',
+ 'VCPreLinkEventTool',
+ MSVSTool('VCLinkerTool',
+ AdditionalDependencies=[
+ 'shlwapi.lib',
+ 'rpcrt4.lib',
+ 'winmm.lib',
+ ],
+ SubSystem='1'),
+ 'VCALinkTool',
+ 'VCManifestTool',
+ 'VCXDCMakeTool',
+ 'VCBscMakeTool',
+ 'VCFxCopTool',
+ 'VCAppVerifierTool',
+ 'VCWebDeploymentTool',
+ 'VCPostBuildEventTool',
+ ],
+ ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/common.vsprops',
+ '$(SolutionDir)../build/debug.vsprops',
+ '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+ ('$(SolutionDir)../'
+ + 'third_party/libxml/build/using_libxml.vsprops'),
+ '$(SolutionDir)../testing/using_gtest.vsprops',
+ '$(SolutionDir)../skia/using_skia.vsprops',
+ ])
+
+p.AddConfig('Release|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/common.vsprops',
+ '$(SolutionDir)../build/release.vsprops',
+ '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+ ('$(SolutionDir)../'
+ + 'third_party/libxml/build/using_libxml.vsprops'),
+ '$(SolutionDir)../testing/using_gtest.vsprops',
+ '$(SolutionDir)../skia/using_skia.vsprops',
+ ])
diff --git a/chrome/test/plugin/plugin_tests.scons b/chrome/test/plugin/plugin_tests.scons
index d748a64..06dfb33 100644
--- a/chrome/test/plugin/plugin_tests.scons
+++ b/chrome/test/plugin/plugin_tests.scons
@@ -63,38 +63,114 @@ if env.Bit('windows'):
],
)
-input_files = [
+input_files = ChromeFileList([
+ 'plugin_test.cpp',
+ '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+ '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
'$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+ '$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',
- 'plugin_test.cpp',
-]
+])
+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('plugin_tests', input_files)
-env.ChromeMSVSProject('$CHROME_DIR/test/plugin/plugin_tests.vcproj',
- dependencies = [
- '$CHROME_DIR/test/automation/automation.vcproj',
- '$BASE_DIR/build/base.vcproj',
- '$NET_DIR/build/net.vcproj',
- ('$CHROME_DIR/test/activex_test_control/' +
- 'activex_test_control.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',
- ('$CHROME_DIR/test/security_tests/' +
- 'security_tests.vcproj'),
- '$GOOGLEURL_DIR/build/googleurl.vcproj',
- '$CHROME_DIR/browser/views/browser_views.vcproj',
- ],
- guid='{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}')
+p = env.ChromeMSVSProject('plugin_tests.vcproj',
+ dest=('$CHROME_SRC_DIR/chrome/'
+ + 'test/plugin/plugin_tests.vcproj'),
+ guid='{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}',
+ dependencies = [
+ '$CHROME_DIR/test/automation/automation.vcproj',
+ '$BASE_DIR/build/base.vcproj',
+ '$NET_DIR/build/net.vcproj',
+ ('$CHROME_DIR/test/activex_test_control/' +
+ 'activex_test_control.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',
+ ('$CHROME_DIR/test/security_tests/' +
+ 'security_tests.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',
+ ('$(SolutionDir)../'
+ + 'third_party/libxml/build/using_libxml.vsprops'),
+ ('$(SolutionDir)../'
+ + 'third_party/libxslt/build/using_libxslt.vsprops'),
+ '../../tools/build/win/unit_test.vsprops',
+ '../../tools/build/win/ui_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',
+ ('$(SolutionDir)../'
+ + 'third_party/libxml/build/using_libxml.vsprops'),
+ ('$(SolutionDir)../'
+ + 'third_party/libxslt/build/using_libxslt.vsprops'),
+ '../../tools/build/win/unit_test.vsprops',
+ '../../tools/build/win/ui_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'),
+ ])
diff --git a/chrome/test/reliability/reliability_tests.scons b/chrome/test/reliability/reliability_tests.scons
index 1c65f04..38767a8 100644
--- a/chrome/test/reliability/reliability_tests.scons
+++ b/chrome/test/reliability/reliability_tests.scons
@@ -62,34 +62,119 @@ if env.Bit('windows'):
],
)
-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'),
+ ])
diff --git a/chrome/test/security_tests/security_tests.scons b/chrome/test/security_tests/security_tests.scons
index 1797f07..cd825ce 100644
--- a/chrome/test/security_tests/security_tests.scons
+++ b/chrome/test/security_tests/security_tests.scons
@@ -35,15 +35,60 @@ if env.Bit('windows'):
],
)
-input_files = [
+input_files = ChromeFileList([
+ '$SANDBOX_DIR/tests/validation_tests/commands$OBJSUFFIX',
+ '$SANDBOX_DIR/tests/validation_tests/commands.h',
+ '$CHROME_DIR/test/injection_test_dll.h',
'ipc_security_tests.cc',
+ 'ipc_security_tests.h',
'security_tests.cc',
- '$SANDBOX_DIR/tests/validation_tests/commands${OBJSUFFIX}',
-]
+])
# TODO(port):
if env.Bit('windows'):
env.ChromeSharedLibrary('security_tests', input_files)
-env.ChromeMSVSProject('$CHROME_DIR/test/security_tests/security_tests.vcproj',
- guid='{E750512D-FC7C-4C98-BF04-0A0DAF882055}')
+p = env.ChromeMSVSProject('security_tests.vcproj',
+ dest=('$CHROME_SRC_DIR/chrome/'
+ + 'test/security_tests/security_tests.vcproj'),
+ guid='{E750512D-FC7C-4C98-BF04-0A0DAF882055}',
+ keyword='Win32Proj',
+ # 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',
+ 'VCLinkerTool',
+ 'VCALinkTool',
+ 'VCManifestTool',
+ 'VCXDCMakeTool',
+ 'VCBscMakeTool',
+ 'VCFxCopTool',
+ 'VCAppVerifierTool',
+ 'VCWebDeploymentTool',
+ 'VCPostBuildEventTool',
+ ],
+ ConfigurationType='2')
+
+
+p.AddConfig('Debug|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/common.vsprops',
+ '$(SolutionDir)../build/debug.vsprops',
+ ])
+
+p.AddConfig('Release|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/common.vsprops',
+ '$(SolutionDir)../build/release.vsprops',
+ ])
diff --git a/chrome/test/selenium/selenium_tests.scons b/chrome/test/selenium/selenium_tests.scons
index 7e29c94..f0c066a 100644
--- a/chrome/test/selenium/selenium_tests.scons
+++ b/chrome/test/selenium/selenium_tests.scons
@@ -65,33 +65,108 @@ if env.Bit('windows'):
],
)
-input_files = [
+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',
'$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+ '$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('TestSelenium', [
'selenium_test.cc',
-]
+ ]),
+])
+
+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('selenium_tests', input_files)
-env.ChromeMSVSProject('$CHROME_DIR/test/selenium/selenium_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='{E3749617-BA3D-4230-B54C-B758E56D9FA5}')
+p = env.ChromeMSVSProject('selenium_tests.vcproj',
+ dest=('$CHROME_SRC_DIR/chrome/'
+ + 'test/selenium/selenium_tests.vcproj'),
+ guid='{E3749617-BA3D-4230-B54C-B758E56D9FA5}',
+ 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',
+ '$(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',
+ '$(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'),
+ ])
diff --git a/chrome/test/startup/startup_tests.scons b/chrome/test/startup/startup_tests.scons
index 8f1faa0..29c0421 100644
--- a/chrome/test/startup/startup_tests.scons
+++ b/chrome/test/startup/startup_tests.scons
@@ -59,34 +59,103 @@ if env.Bit('windows'):
],
)
-input_files = [
+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.cc',
+ '$CHROME_DIR/tools/build/win/precompiled.h',
'$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+ '$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('TestStartup', [
'feature_startup_test.cc',
'startup_test.cc',
-]
+ ]),
+])
# TODO(port):
if env.Bit('windows'):
env.ChromeTestProgram('startup_tests', input_files)
-env.ChromeMSVSProject('$CHROME_DIR/test/startup/startup_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='{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}')
+p = env.ChromeMSVSProject('startup_tests.vcproj',
+ dest=('$CHROME_SRC_DIR/chrome/'
+ + 'test/startup/startup_tests.vcproj'),
+ guid='{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}',
+ 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.vsprops',
+ '../../tools/build/win/unit_test.vsprops',
+ '../../tools/build/win/ui_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',
+ '$(SolutionDir)../skia/using_skia.vsprops',
+ '$(SolutionDir)../testing/using_gtest.vsprops',
+ ])
+
+p.AddFileConfig('../../tools/build/win/precompiled.cc',
+ 'Debug|Win32',
+ tools=[
+ MSVSTool('VCCLCompilerTool',
+ UsePrecompiledHeader='1'),
+ ])
diff --git a/chrome/test/tab_switching/tab_switching_test.scons b/chrome/test/tab_switching/tab_switching_test.scons
index da0b296..e5c1efd 100644
--- a/chrome/test/tab_switching/tab_switching_test.scons
+++ b/chrome/test/tab_switching/tab_switching_test.scons
@@ -60,37 +60,113 @@ if env.Bit('windows'):
],
)
-input_files = [
+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',
'$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+ '$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('TabSwitchingTest', [
'tab_switching_test.cc',
-]
+ ]),
+])
-#"..\..\Debug\obj\tab_switching_test\precompiled_wtl.obj"
+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('tab_switching_test', input_files)
-env.ChromeMSVSProject('$CHROME_DIR/test/tab_switching/tab_switching.vcproj',
- name='tab_switching_test',
- 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/test/ui/ui_tests.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='{A34770EA-A574-43E8-9327-F79C04770E98}')
+p = env.ChromeMSVSProject('tab_switching.vcproj',
+ name='tab_switching_test',
+ dest=('$CHROME_SRC_DIR/chrome/'
+ + 'test/tab_switching/tab_switching.vcproj'),
+ guid='{A34770EA-A574-43E8-9327-F79C04770E98}',
+ 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/test/ui/ui_tests.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',
+ '$(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',
+ '$(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'),
+ ])
diff --git a/chrome/test/ui/ui_tests.scons b/chrome/test/ui/ui_tests.scons
index cdd9367..ada6b90 100644
--- a/chrome/test/ui/ui_tests.scons
+++ b/chrome/test/ui/ui_tests.scons
@@ -84,97 +84,308 @@ if env.Bit('windows'):
],
)
-ui_test_files = [
+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', [
+ 'npapi_test_helper.cc',
+ 'npapi_test_helper.h',
+ '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+ '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
'run_all_unittests.cc',
+ '$CHROME_DIR/test/testing_browser_process.h',
'ui_test.cc',
+ 'ui_test.h',
'ui_test_suite.cc',
-]
-
-if env.Bit('windows'):
- # TODO(port): mark which of these work and which don't.
- ui_test_files.extend([
- 'history_uitest.cc',
- 'inspector_controller_uitest.cc',
- 'layout_plugin_uitest.cpp',
- 'npapi_test_helper.cc',
- 'npapi_uitest.cpp',
- 'omnibox_uitest.cc',
-
- 'sandbox_uitests.cc',
-
+ 'ui_test_suite.h',
+ '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX',
+ '$NET_DIR/url_request/url_request_test_job.h',
+ ]),
+ MSVSFilter('TestChromeMain', [
'$CHROME_DIR/app/chrome_main_uitest.cc',
+ ]),
+ MSVSFilter('TestErrorPage', [
+ '$CHROME_DIR/browser/errorpage_uitest.cc',
+ ]),
+ MSVSFilter('TestBrowser', [
'$CHROME_DIR/browser/browser_uitest.cc',
- '$CHROME_DIR/browser/crash_recovery_uitest.cc',
+ MSVSFilter('TestImages', [
+ '$CHROME_DIR/browser/images_uitest.cc',
+ ]),
+ ]),
+ MSVSFilter('TestChromeLogging', [
+ '$CHROME_DIR/common/logging_chrome_uitest.cc',
+ ]),
+ MSVSFilter('TestDownload', [
'$CHROME_DIR/browser/download/download_uitest.cc',
- '$CHROME_DIR/browser/download/save_page_uitest.cc',
- '$CHROME_DIR/browser/errorpage_uitest.cc',
- '$CHROME_DIR/browser/history/redirect_uitest.cc',
+ ]),
+ MSVSFilter('TestIFrame', [
'$CHROME_DIR/browser/iframe_uitest.cc',
- '$CHROME_DIR/browser/images_uitest.cc',
- '$CHROME_DIR/browser/interstitial_page_uitest.cc',
- '$CHROME_DIR/browser/locale_tests_uitest.cc',
- '$CHROME_DIR/browser/login_prompt_uitest.cc',
- '$CHROME_DIR/browser/metrics_service_uitest.cc',
- '$CHROME_DIR/browser/printing/printing_layout_uitest.cc',
- '$CHROME_DIR/browser/resource_dispatcher_host_uitest.cc',
+ ]),
+ MSVSFilter('TestCache', [
+ '$CHROME_DIR/common/net/cache_uitest.cc',
+ ]),
+ MSVSFilter('TestSanity', [
'$CHROME_DIR/browser/sanity_uitest.cc',
+ ]),
+ MSVSFilter('TestAutomationProxy', [
+ '$CHROME_DIR/test/automation/automation_proxy_uitest.cc',
+ ]),
+ MSVSFilter('TestNPAPI', [
+ 'layout_plugin_uitest.cpp',
+ 'npapi_uitest.cpp',
+ ]),
+ MSVSFilter('TestSessionHistory', [
'$CHROME_DIR/browser/session_history_uitest.cc',
+ ]),
+ MSVSFilter('TestSessionRestore', [
'$CHROME_DIR/browser/sessions/session_restore_uitest.cc',
- '$CHROME_DIR/browser/ssl_uitest.cc',
+ ]),
+ MSVSFilter('TestTabRestore', [
'$CHROME_DIR/browser/tab_restore_uitest.cc',
- '$CHROME_DIR/browser/view_source_uitest.cc',
- '$CHROME_DIR/common/logging_chrome_uitest.cc',
- '$CHROME_DIR/common/net/cache_uitest.cc',
+ ]),
+ MSVSFilter('TestUnload', [
+ '$CHROME_DIR/browser/unload_uitest.cc',
+ ]),
+ MSVSFilter('TestAuthentication', [
+ '$CHROME_DIR/browser/login_prompt_uitest.cc',
+ ]),
+ MSVSFilter('TestPreferences', [
'$CHROME_DIR/common/pref_service_uitest.cc',
- '$CHROME_DIR/test/accessibility/accessibility_tests.cc',
- '$CHROME_DIR/test/accessibility/accessibility_util.cc',
- '$CHROME_DIR/test/accessibility/browser_impl.cc',
- '$CHROME_DIR/test/accessibility/keyboard_util.cc',
- '$CHROME_DIR/test/accessibility/registry_util.cc',
- '$CHROME_DIR/test/accessibility/tab_impl.cc',
- '$CHROME_DIR/test/automation/automation_proxy_uitest.cc',
+ ]),
+ MSVSFilter('TestViewSource', [
+ '$CHROME_DIR/browser/tab_contents/view_source_uitest.cc',
+ ]),
+ MSVSFilter('TestRedirects', [
+ '$CHROME_DIR/browser/history/redirect_uitest.cc',
+ ]),
+ MSVSFilter('TestResourceDispatcherHost', [
+ '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_uitest.cc',
+ ]),
+ MSVSFilter('TestFindInPage', [
+ '$CHROME_DIR/browser/views/find_bar_win_uitest.cc',
+ ]),
+ MSVSFilter('TestPageLoader', [
'$CHROME_DIR/test/perf/mem_usage.cc',
+ '$CHROME_DIR/test/perf/mem_usage.h',
'$CHROME_DIR/test/reliability/page_load_test$OBJSUFFIX',
- '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX',
- ])
+ '$CHROME_DIR/test/reliability/page_load_test.h',
+ ]),
+ MSVSFilter('TestSandbox', [
+ 'sandbox_uitests.cc',
+ ]),
+ MSVSFilter('TestInspector', [
+ 'inspector_controller_uitest.cc',
+ ]),
+ MSVSFilter('TestLocalizedBuilds', [
+ '$CHROME_DIR/browser/locale_tests_uitest.cc',
+ ]),
+ MSVSFilter('TestMetricsService', [
+ '$CHROME_DIR/browser/metrics/metrics_service_uitest.cc',
+ ]),
+ MSVSFilter('TestInterstitialPage', [
+ '$CHROME_DIR/browser/interstitial_page_uitest.cc',
+ ]),
+ MSVSFilter('TestSSL', [
+ '$CHROME_DIR/browser/ssl/ssl_uitest.cc',
+ ]),
+ MSVSFilter('TestAccessibility', [
+ '$CHROME_DIR/test/accessibility/accessibility_tests.cc',
+ MSVSFilter('Accessibility Client', [
+ '$CHROME_DIR/test/accessibility/accessibility_util.cc',
+ '$CHROME_DIR/test/accessibility/accessibility_util.h',
+ '$CHROME_DIR/test/accessibility/browser_impl.cc',
+ '$CHROME_DIR/test/accessibility/browser_impl.h',
+ '$CHROME_DIR/test/accessibility/constants.h',
+ '$CHROME_DIR/test/accessibility/keyboard_util.cc',
+ '$CHROME_DIR/test/accessibility/keyboard_util.h',
+ '$CHROME_DIR/test/accessibility/registry_util.cc',
+ '$CHROME_DIR/test/accessibility/registry_util.h',
+ '$CHROME_DIR/test/accessibility/tab_impl.cc',
+ '$CHROME_DIR/test/accessibility/tab_impl.h',
+ ]),
+ ]),
+ MSVSFilter('TestCrashRecovery', [
+ '$CHROME_DIR/browser/crash_recovery_uitest.cc',
+ ]),
+ MSVSFilter('TestPrinting', [
+ '$CHROME_DIR/browser/printing/printing_layout_uitest.cc',
+ '$CHROME_DIR/browser/printing/printing_test.h',
+ ]),
+ MSVSFilter('TestSavePage', [
+ '$CHROME_DIR/browser/download/save_page_uitest.cc',
+ ]),
+ MSVSFilter('TestOmnibox', [
+ 'omnibox_uitest.cc',
+ ]),
+ MSVSFilter('TestHistory', [
+ 'history_uitest.cc',
+ ]),
+])
+
+if not env.Bit('windows'):
+ # TODO(port): mark which of these work and which don't.
+ input_files.Remove(
+ 'history_uitest.cc',
+ 'inspector_controller_uitest.cc',
+ 'layout_plugin_uitest.cpp',
+ 'npapi_test_helper.cc',
+ 'npapi_uitest.cpp',
+ 'omnibox_uitest.cc',
+
+ 'sandbox_uitests.cc',
+
+ '$CHROME_DIR/app/chrome_main_uitest.cc',
+ '$CHROME_DIR/browser/browser_uitest.cc',
+ '$CHROME_DIR/browser/crash_recovery_uitest.cc',
+ '$CHROME_DIR/browser/download/download_uitest.cc',
+ '$CHROME_DIR/browser/download/save_page_uitest.cc',
+ '$CHROME_DIR/browser/errorpage_uitest.cc',
+ '$CHROME_DIR/browser/history/redirect_uitest.cc',
+ '$CHROME_DIR/browser/iframe_uitest.cc',
+ '$CHROME_DIR/browser/images_uitest.cc',
+ '$CHROME_DIR/browser/interstitial_page_uitest.cc',
+ '$CHROME_DIR/browser/locale_tests_uitest.cc',
+ '$CHROME_DIR/browser/login_prompt_uitest.cc',
+ '$CHROME_DIR/browser/metrics/metrics_service_uitest.cc',
+ '$CHROME_DIR/browser/printing/printing_layout_uitest.cc',
+ '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_uitest.cc',
+ '$CHROME_DIR/browser/sanity_uitest.cc',
+ '$CHROME_DIR/browser/session_history_uitest.cc',
+ '$CHROME_DIR/browser/sessions/session_restore_uitest.cc',
+ '$CHROME_DIR/browser/ssl/ssl_uitest.cc',
+ '$CHROME_DIR/browser/tab_contents/view_source_uitest.cc',
+ '$CHROME_DIR/browser/tab_restore_uitest.cc',
+ '$CHROME_DIR/browser/unload_uitest.cc',
+ '$CHROME_DIR/common/logging_chrome_uitest.cc',
+ '$CHROME_DIR/common/net/cache_uitest.cc',
+ '$CHROME_DIR/common/pref_service_uitest.cc',
+ '$CHROME_DIR/test/accessibility/accessibility_tests.cc',
+ '$CHROME_DIR/test/accessibility/accessibility_util.cc',
+ '$CHROME_DIR/test/accessibility/browser_impl.cc',
+ '$CHROME_DIR/test/accessibility/keyboard_util.cc',
+ '$CHROME_DIR/test/accessibility/registry_util.cc',
+ '$CHROME_DIR/test/accessibility/tab_impl.cc',
+ '$CHROME_DIR/test/automation/automation_proxy_uitest.cc',
+ '$CHROME_DIR/test/perf/mem_usage.cc',
+ '$CHROME_DIR/test/reliability/page_load_test$OBJSUFFIX',
+ '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX',
+ )
+if not env.Bit('windows'):
# Windows-specific tests.
- ui_test_files.extend([
+ input_files.Remove(
+ '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+ '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
'$CHROME_DIR/browser/views/find_bar_win_interactive_uitest.cc',
'$CHROME_DIR/browser/views/find_bar_win_uitest.cc',
- ])
-
-env.ChromeTestProgram('ui_tests', ui_test_files)
-
-env.ChromeMSVSProject('$CHROME_DIR/test/ui/ui_tests.vcproj',
- dependencies = [
- ('$WEBKIT_DIR/glue/plugins/test/' +
- 'npapi_test_plugin.vcproj'),
- '$CHROME_DIR/test/automation/automation.vcproj',
- '$BASE_DIR/build/base.vcproj',
- '$BZIP2_DIR/bzip2.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',
- '$CHROME_DIR/app/locales/he.vcproj',
- '$CHROME_DIR/app/locales/da.vcproj',
- '$BASE_DIR/build/base_gfx.vcproj',
- ('$WEBKIT_DIR/tools/npapi_layout_test_plugin/' +
- 'npapi_layout_test_plugin.vcproj'),
- '$TESTING_DIR/gtest.vcproj',
- '$LIBPNG_DIR/libpng.vcproj',
- '$CHROME_DIR/app/locales/en-US.vcproj',
- '$SKIA_DIR/skia.vcproj',
- ('$CHROME_DIR/test/security_tests/' +
- 'security_tests.vcproj'),
- '$CHROME_DIR/app/locales/zh-TW.vcproj',
- '$GOOGLEURL_DIR/build/googleurl.vcproj',
- '$SDCH_DIR/sdch.vcproj',
- '$LIBXML_DIR/build/libxml.vcproj',
- '$CHROME_DIR/browser/views/browser_views.vcproj',
- ],
- guid='{76235B67-1C27-4627-8A33-4B2E1EF93EDE}')
+ )
+
+env.ChromeTestProgram('ui_tests', input_files)
+
+p = env.ChromeMSVSProject('ui_tests.vcproj',
+ dest='$CHROME_SRC_DIR/chrome/test/ui/ui_tests.vcproj',
+ guid='{76235B67-1C27-4627-8A33-4B2E1EF93EDE}',
+ dependencies = [
+ ('$WEBKIT_DIR/glue/plugins/test/' +
+ 'npapi_test_plugin.vcproj'),
+ '$CHROME_DIR/test/automation/automation.vcproj',
+ '$BASE_DIR/build/base.vcproj',
+ '$BZIP2_DIR/bzip2.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',
+ '$CHROME_DIR/app/locales/he.vcproj',
+ '$CHROME_DIR/app/locales/da.vcproj',
+ '$BASE_DIR/build/base_gfx.vcproj',
+ ('$WEBKIT_DIR/tools/npapi_layout_test_plugin/'
+ + 'npapi_layout_test_plugin.vcproj'),
+ '$TESTING_DIR/gtest.vcproj',
+ '$LIBPNG_DIR/libpng.vcproj',
+ '$CHROME_DIR/app/locales/en-US.vcproj',
+ '$SKIA_DIR/skia.vcproj',
+ ('$CHROME_DIR/test/security_tests/'
+ + 'security_tests.vcproj'),
+ '$CHROME_DIR/app/locales/zh-TW.vcproj',
+ '$GOOGLEURL_DIR/build/googleurl.vcproj',
+ '$SDCH_DIR/sdch.vcproj',
+ '$LIBXML_DIR/build/libxml.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',
+ MSVSTool('VCCLCompilerTool',
+ AdditionalIncludeDirectories=[
+ '"$(OutDir)/obj/generated_resources"',
+ ]),
+ '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',
+ ('$(SolutionDir)../third_party/'
+ + 'libxml/build/using_libxml.vsprops'),
+ ('$(SolutionDir)../third_party/'
+ + 'libxslt/build/using_libxslt.vsprops'),
+ '../../tools/build/win/unit_test.vsprops',
+ '../../tools/build/win/ui_test.vsprops',
+ '../../tools/build/win/test_memory_usage.vsprops',
+ '$(SolutionDir)../skia/using_skia.vsprops',
+ '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+ '$(SolutionDir)/tools/build/win/js_engine.vsprops',
+ '$(SolutionDir)../testing/using_gtest.vsprops',
+ ])
+
+p.AddConfig('Release|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/common.vsprops',
+ '$(SolutionDir)../build/release.vsprops',
+ ('$(SolutionDir)../third_party/'
+ + 'libxml/build/using_libxml.vsprops'),
+ ('$(SolutionDir)../third_party/'
+ + 'libxslt/build/using_libxslt.vsprops'),
+ '../../tools/build/win/unit_test.vsprops',
+ '../../tools/build/win/ui_test.vsprops',
+ '$(SolutionDir)../skia/using_skia.vsprops',
+ '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+ '$(SolutionDir)/tools/build/win/js_engine.vsprops',
+ '$(SolutionDir)../testing/using_gtest.vsprops',
+ ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+ 'Debug|Win32',
+ tools=[
+ MSVSTool('VCCLCompilerTool',
+ UsePrecompiledHeader='1'),
+ ])
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons
index d036ec7..f7cbc9d 100644
--- a/chrome/test/unit/unit_tests.scons
+++ b/chrome/test/unit/unit_tests.scons
@@ -108,20 +108,177 @@ if env.Bit('windows'):
],
)
-unit_test_files = []
-
-unit_test_files.extend([
+input_files = ChromeFileList([
+ MSVSFilter('Common', [
+ '$CHROME_DIR/browser/browser_resources.h',
+ '$CHROME_DIR/browser/browser_resources.rc',
+ '$CHROME_DIR/test/browser_with_test_window_test.cc',
+ '$CHROME_DIR/test/browser_with_test_window_test.h',
+ 'chrome_test_suite.h',
+ '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+ '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+ 'run_all_unittests.cc',
+ '$CHROME_DIR/test/test_browser_window.h',
+ '$CHROME_DIR/test/test_notification_tracker.cc',
+ '$CHROME_DIR/test/test_notification_tracker.h',
+ '$CHROME_DIR/test/test_tab_contents.cc',
+ '$CHROME_DIR/test/test_tab_contents.h',
+ '$CHROME_DIR/test/testing_browser_process.h',
+ '$CHROME_DIR/test/testing_profile.cc',
+ '$CHROME_DIR/test/testing_profile.h',
+ '$CHROME_DIR/../net/url_request/url_request_test_job$OBJSUFFIX',
+ '$CHROME_DIR/../net/url_request/url_request_test_job.h',
+ ]),
+ MSVSFilter('hunspell', [
+ '$CHROME_DIR/tools/convert_dict/aff_reader$OBJSUFFIX',
+ '$CHROME_DIR/tools/convert_dict/aff_reader.h',
+ '$CHROME_DIR/third_party/hunspell/google/bdict.h',
+ '$CHROME_DIR/third_party/hunspell/google/bdict_reader$OBJSUFFIX',
+ '$CHROME_DIR/third_party/hunspell/google/bdict_reader.h',
+ '$CHROME_DIR/third_party/hunspell/google/bdict_writer$OBJSUFFIX',
+ '$CHROME_DIR/third_party/hunspell/google/bdict_writer.h',
+ '$CHROME_DIR/tools/convert_dict/dic_reader$OBJSUFFIX',
+ '$CHROME_DIR/tools/convert_dict/dic_reader.h',
+ '$CHROME_DIR/tools/convert_dict/hunspell_reader$OBJSUFFIX',
+ '$CHROME_DIR/tools/convert_dict/hunspell_reader.h',
+ '$CHROME_DIR/third_party/hunspell/google/hunspell_tests.cc',
+ ]),
+ '$CHROME_DIR/common/animation_unittest.cc',
+ '$CHROME_DIR/browser/autocomplete/autocomplete_unittest.cc',
+ '$CHROME_DIR/browser/back_forward_menu_model_unittest.cc',
+ '$CHROME_DIR/browser/safe_browsing/bloom_filter_unittest.cc',
+ '$CHROME_DIR/browser/bookmarks/bookmark_context_menu_test.cc',
+ '$CHROME_DIR/browser/bookmarks/bookmark_drag_data_unittest.cc',
+ '$CHROME_DIR/browser/views/bookmark_editor_view_unittest.cc',
+ '$CHROME_DIR/browser/bookmarks/bookmark_folder_tree_model_unittest.cc',
+ '$CHROME_DIR/browser/bookmarks/bookmark_html_writer_unittest.cc',
+ '$CHROME_DIR/browser/bookmarks/bookmark_model_unittest.cc',
+ '$CHROME_DIR/browser/bookmarks/bookmark_table_model_unittest.cc',
+ '$CHROME_DIR/browser/bookmarks/bookmark_utils_unittest.cc',
+ '$CHROME_DIR/browser/browser_commands_unittest.cc',
+ '$CHROME_DIR/common/bzip2_unittest.cc',
+ '$CHROME_DIR/browser/cache_manager_host_unittest.cc',
+ '$CHROME_DIR/common/chrome_plugin_unittest.cc',
+ '$CHROME_DIR/browser/chrome_thread_unittest.cc',
+ '$CHROME_DIR/browser/safe_browsing/chunk_range_unittest.cc',
+ '$CHROME_DIR/browser/controller_unittest.cc',
+ '$CHROME_DIR/browser/net/dns_host_info_unittest.cc',
+ '$CHROME_DIR/browser/net/dns_master_unittest.cc',
+ '$CHROME_DIR/browser/download/download_manager_unittest.cc',
+ '$CHROME_DIR/browser/download/download_request_manager_unittest.cc',
+ '$CHROME_DIR/common/gfx/emf_unittest.cc',
+ '$CHROME_DIR/browser/password_manager/encryptor_unittest.cc',
+ '$CHROME_DIR/browser/history/expire_history_backend_unittest.cc',
+ '$CHROME_DIR/browser/extensions/extension_protocols_unittest.cc',
+ '$CHROME_DIR/browser/extensions/extension_unittest.cc',
+ '$CHROME_DIR/browser/extensions/extensions_service_unittest.cc',
+ '$CHROME_DIR/browser/importer/firefox_importer_unittest.cc',
+ '$CHROME_DIR/views/focus_manager_unittest.cc',
+ '$CHROME_DIR/browser/google_url_tracker_unittest.cc',
+ '$CHROME_DIR/views/grid_layout_unittest.cc',
+ '$CHROME_DIR/../googleurl/src/gurl_unittest$OBJSUFFIX',
+ '$CHROME_DIR/browser/history/history_backend_unittest.cc',
+ '$CHROME_DIR/browser/autocomplete/history_contents_provider_unittest.cc',
+ '$CHROME_DIR/browser/history/history_querying_unittest.cc',
+ '$CHROME_DIR/browser/history/history_types_unittest.cc',
+ '$CHROME_DIR/browser/history/history_unittest.cc',
+ '$CHROME_DIR/browser/autocomplete/history_url_provider_unittest.cc',
+ '$CHROME_DIR/common/gfx/icon_util_unittest.cc',
+ '$CHROME_DIR/browser/importer/importer_unittest.cc',
+ '$CHROME_DIR/common/ipc_message_unittest.cc',
+ '$CHROME_DIR/common/ipc_sync_channel_unittest.cc',
+ '$CHROME_DIR/common/ipc_sync_channel_unittest.h',
'$CHROME_DIR/common/ipc_sync_message_unittest.cc',
+ '$CHROME_DIR/common/ipc_sync_message_unittest.h',
+ '$CHROME_DIR/common/jpeg_codec_unittest.cc',
+ '$CHROME_DIR/common/json_value_serializer_unittest.cc',
+ '$CHROME_DIR/browser/views/keyword_editor_view_unittest.cc',
+ '$CHROME_DIR/browser/autocomplete/keyword_provider_unittest.cc',
'$CHROME_DIR/common/l10n_util_unittest.cc',
+ '$CHROME_DIR/views/label_unittest.cc',
+ '$CHROME_DIR/browser/login_prompt_unittest.cc',
+ '$CHROME_DIR/browser/metrics/metrics_log_unittest.cc',
+ '$CHROME_DIR/browser/metrics/metrics_response_unittest.cc',
+ '$CHROME_DIR/renderer/mock_render_process.h',
+ '$CHROME_DIR/renderer/mock_render_thread.cc',
+ '$CHROME_DIR/renderer/mock_render_thread.h',
+ '$CHROME_DIR/common/mru_cache_unittest.cc',
+ '$CHROME_DIR/browser/navigation_controller_unittest.cc',
+ '$CHROME_DIR/common/notification_service_unittest.cc',
+ '$CHROME_DIR/common/os_exchange_data_unittest.cc',
+ '$CHROME_DIR/browser/printing/page_number_unittest.cc',
+ '$CHROME_DIR/browser/printing/page_overlays_unittest.cc',
+ '$CHROME_DIR/browser/printing/page_range_unittest.cc',
+ '$CHROME_DIR/browser/printing/page_setup_unittest.cc',
+ '$CHROME_DIR/browser/password_manager/password_form_manager_unittest.cc',
+ '$CHROME_DIR/common/pref_member_unittest.cc',
+ '$CHROME_DIR/common/pref_service_unittest.cc',
+ '$CHROME_DIR/browser/printing/print_job_unittest.cc',
+ '$CHROME_DIR/browser/printing/printing_test.h',
+ '$CHROME_DIR/browser/profile_manager_unittest.cc',
'$CHROME_DIR/common/property_bag_unittest.cc',
+ '$CHROME_DIR/browser/safe_browsing/protocol_manager_unittest.cc',
+ '$CHROME_DIR/browser/safe_browsing/protocol_parser_unittest.cc',
+ '$CHROME_DIR/browser/history/query_parser_unittest.cc',
+ '$CHROME_DIR/renderer/net/render_dns_master_unittest.cc',
+ '$CHROME_DIR/renderer/net/render_dns_queue_unittest.cc',
+ '$CHROME_DIR/renderer/render_view_unittest.cc',
+ '$CHROME_DIR/renderer/render_widget_unittest.cc',
+ '$CHROME_DIR/browser/renderer_security_policy_unittest.cc',
+ '$CHROME_DIR/test/data/resource.h',
+ '$CHROME_DIR/test/data/resource.rc',
+ '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_unittest.cc',
+ '$CHROME_DIR/common/resource_dispatcher_unittest.cc',
+ '$CHROME_DIR/browser/rlz/rlz_unittest.cc',
+ '$CHROME_DIR/browser/safe_browsing/safe_browsing_database_unittest.cc',
+ '$CHROME_DIR/browser/safe_browsing/safe_browsing_util_unittest.cc',
+ '$CHROME_DIR/browser/download/save_package_unittest.cc',
+ '$CHROME_DIR/browser/sessions/session_backend_unittest.cc',
+ '$CHROME_DIR/browser/sessions/session_service_test_helper.cc',
+ '$CHROME_DIR/browser/sessions/session_service_test_helper.h',
+ '$CHROME_DIR/browser/sessions/session_service_unittest.cc',
+ '$CHROME_DIR/browser/site_instance_unittest.cc',
+ '$CHROME_DIR/browser/history/snippet_unittest.cc',
+ '$CHROME_DIR/browser/spellcheck_unittest.cc',
+ '$CHROME_DIR/browser/history/starred_url_database_unittest.cc',
+ '$CHROME_DIR/browser/sessions/tab_restore_service_unittest.cc',
+ '$CHROME_DIR/browser/tabs/tab_strip_model_unittest.cc',
+ '$CHROME_DIR/views/table_view_unittest.cc',
+ '$CHROME_DIR/browser/search_engines/template_url_model_unittest.cc',
+ '$CHROME_DIR/browser/search_engines/template_url_parser_unittest.cc',
+ '$CHROME_DIR/browser/search_engines/template_url_prepopulate_data_unittest.cc',
+ '$CHROME_DIR/browser/search_engines/template_url_unittest.cc',
+ '$CHROME_DIR/browser/history/text_database_manager_unittest.cc',
+ '$CHROME_DIR/browser/history/text_database_unittest.cc',
+ '$CHROME_DIR/common/gfx/text_elider_unittest.cc',
+ '$CHROME_DIR/browser/history/thumbnail_database_unittest.cc',
+ '$CHROME_DIR/common/time_format_unittest.cc',
+ '$CHROME_DIR/views/tree_node_iterator_unittest.cc',
+ '$CHROME_DIR/browser/printing/units_unittest.cc',
'$CHROME_DIR/common/unzip_unittest.cc',
+ '$CHROME_DIR/../googleurl/src/url_canon_unittest$OBJSUFFIX',
+ '$CHROME_DIR/browser/history/url_database_unittest.cc',
+ '$CHROME_DIR/browser/net/url_fetcher_unittest.cc',
+ '$CHROME_DIR/browser/net/url_fixer_upper_unittest.cc',
+ '$CHROME_DIR/../googleurl/src/url_parse_unittest$OBJSUFFIX',
+ '$CHROME_DIR/../googleurl/src/url_util_unittest$OBJSUFFIX',
+ '$CHROME_DIR/browser/extensions/user_script_master_unittest.cc',
'$CHROME_DIR/renderer/user_script_slave_unittest.cc',
+ '$CHROME_DIR/views/view_unittest.cc',
'$CHROME_DIR/browser/history/visit_database_unittest.cc',
+ '$CHROME_DIR/browser/history/visit_tracker_unittest.cc',
+ '$CHROME_DIR/browser/visitedlink_unittest.cc',
+ '$CHROME_DIR/browser/tab_contents/web_contents_unittest.cc',
+ '$CHROME_DIR/browser/webdata/web_database_unittest.cc',
+ '$CHROME_DIR/browser/printing/win_printing_context_unittest.cc',
+ '$CHROME_DIR/common/win_util_unittest.cc',
+ '$CHROME_DIR/browser/window_sizer_unittest.cc',
+ '$CHROME_DIR/common/worker_thread_ticker_unittest.cc',
])
-if not env.Bit('mac'):
+if env.Bit('mac'):
# TODO(port): Port to Mac.
- unit_test_files.extend([
+ input_files.Remove(
'run_all_unittests.cc',
'$CHROME_DIR/browser/chrome_thread_unittest.cc',
@@ -157,11 +314,18 @@ if not env.Bit('mac'):
'$CHROME_DIR/test/test_notification_tracker.cc',
'$NET_DIR/base/ssl_test_util$OBJSUFFIX',
- ])
+ )
-if env.Bit('windows'):
+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',
+ )
+
+if not env.Bit('windows'):
# TODO(port): Port these.
- unit_test_files.extend([
+ input_files.Remove(
'$CHROME_DIR/browser/autocomplete/autocomplete_unittest.cc',
'$CHROME_DIR/browser/autocomplete/history_contents_provider_unittest.cc',
'$CHROME_DIR/browser/autocomplete/history_url_provider_unittest.cc',
@@ -174,13 +338,14 @@ if env.Bit('windows'):
'$CHROME_DIR/browser/bookmarks/bookmark_model_unittest.cc',
'$CHROME_DIR/browser/bookmarks/bookmark_table_model_unittest.cc',
'$CHROME_DIR/browser/bookmarks/bookmark_utils_unittest.cc',
+ '$CHROME_DIR/browser/browser_commands_unittest.cc',
'$CHROME_DIR/browser/cache_manager_host_unittest.cc',
'$CHROME_DIR/browser/controller_unittest.cc',
'$CHROME_DIR/browser/download/download_manager_unittest.cc',
'$CHROME_DIR/browser/download/download_request_manager_unittest.cc',
'$CHROME_DIR/browser/download/save_package_unittest.cc',
+ '$CHROME_DIR/browser/extensions/extension_protocols_unittest.cc',
'$CHROME_DIR/browser/extensions/user_script_master_unittest.cc',
- '$CHROME_DIR/browser/encryptor_unittest.cc',
'$CHROME_DIR/browser/google_url_tracker_unittest.cc',
'$CHROME_DIR/browser/history/expire_history_backend_unittest.cc',
'$CHROME_DIR/browser/history/history_backend_unittest.cc',
@@ -198,30 +363,32 @@ if env.Bit('windows'):
'$CHROME_DIR/browser/navigation_controller_unittest.cc',
'$CHROME_DIR/browser/net/dns_master_unittest.cc',
'$CHROME_DIR/browser/net/url_fixer_upper_unittest.cc',
- '$CHROME_DIR/browser/password_form_manager_unittest.cc',
+ '$CHROME_DIR/browser/password_manager/encryptor_unittest.cc',
+ '$CHROME_DIR/browser/password_manager/password_form_manager_unittest.cc',
'$CHROME_DIR/browser/printing/page_number_unittest.cc',
'$CHROME_DIR/browser/printing/page_overlays_unittest.cc',
'$CHROME_DIR/browser/printing/print_job_unittest.cc',
'$CHROME_DIR/browser/printing/win_printing_context_unittest.cc',
'$CHROME_DIR/browser/profile_manager_unittest.cc',
+ '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_unittest.cc',
'$CHROME_DIR/browser/renderer_security_policy_unittest.cc',
'$CHROME_DIR/browser/resource_dispatcher_host_unittest.cc',
'$CHROME_DIR/browser/rlz/rlz_unittest.cc',
'$CHROME_DIR/browser/safe_browsing/protocol_manager_unittest.cc',
+ '$CHROME_DIR/browser/search_engines/template_url_model_unittest.cc',
+ '$CHROME_DIR/browser/search_engines/template_url_parser_unittest.cc',
+ '$CHROME_DIR/browser/search_engines/template_url_prepopulate_data_unittest.cc',
+ '$CHROME_DIR/browser/search_engines/template_url_unittest.cc',
'$CHROME_DIR/browser/sessions/session_backend_unittest.cc',
'$CHROME_DIR/browser/sessions/session_service_test_helper.cc',
'$CHROME_DIR/browser/sessions/session_service_unittest.cc',
'$CHROME_DIR/browser/sessions/tab_restore_service_unittest.cc',
'$CHROME_DIR/browser/site_instance_unittest.cc',
+ '$CHROME_DIR/browser/tab_contents/web_contents_unittest.cc',
'$CHROME_DIR/browser/tabs/tab_strip_model_unittest.cc',
- '$CHROME_DIR/browser/search_engines/template_url_model_unittest.cc',
- '$CHROME_DIR/browser/search_engines/template_url_parser_unittest.cc',
- '$CHROME_DIR/browser/search_engines/template_url_prepopulate_data_unittest.cc',
- '$CHROME_DIR/browser/search_engines/template_url_unittest.cc',
'$CHROME_DIR/browser/views/bookmark_editor_view_unittest.cc',
'$CHROME_DIR/browser/views/keyword_editor_view_unittest.cc',
'$CHROME_DIR/browser/visitedlink_unittest.cc',
- '$CHROME_DIR/browser/web_contents_unittest.cc',
'$CHROME_DIR/browser/webdata/web_database_unittest.cc',
'$CHROME_DIR/browser/window_sizer_unittest.cc',
'$CHROME_DIR/common/chrome_plugin_unittest.cc',
@@ -234,12 +401,22 @@ if env.Bit('windows'):
'$CHROME_DIR/common/resource_dispatcher_unittest.cc',
'$CHROME_DIR/common/time_format_unittest.cc',
'$CHROME_DIR/common/win_util_unittest.cc',
+ '$CHROME_DIR/renderer/mock_render_thread.cc',
'$CHROME_DIR/renderer/net/render_dns_master_unittest.cc',
+ '$CHROME_DIR/renderer/render_view_unittest.cc',
'$CHROME_DIR/renderer/render_widget_unittest.cc',
+ '$CHROME_DIR/test/browser_with_test_window_test.cc',
'$CHROME_DIR/test/test_tab_contents.cc',
'$CHROME_DIR/test/testing_profile.cc',
+ '$CHROME_DIR/third_party/hunspell/google/bdict_reader$OBJSUFFIX',
+ '$CHROME_DIR/third_party/hunspell/google/bdict_writer$OBJSUFFIX',
+ '$CHROME_DIR/third_party/hunspell/google/hunspell_tests.cc',
+ '$CHROME_DIR/tools/convert_dict/aff_reader$OBJSUFFIX',
+ '$CHROME_DIR/tools/convert_dict/dic_reader$OBJSUFFIX',
+ '$CHROME_DIR/tools/convert_dict/hunspell_reader$OBJSUFFIX',
'$CHROME_DIR/views/focus_manager_unittest.cc',
'$CHROME_DIR/views/grid_layout_unittest.cc',
+ '$CHROME_DIR/views/label_unittest.cc',
'$CHROME_DIR/views/table_view_unittest.cc',
'$CHROME_DIR/views/tree_node_iterator_unittest.cc',
'$CHROME_DIR/views/view_unittest.cc',
@@ -251,17 +428,18 @@ if env.Bit('windows'):
'$CHROME_DIR/browser/browser_resources.res',
'$CHROME_DIR/test/data/resource.res',
- ])
+ )
if not env.Bit('mac'):
# TODO(port): This should work on all platforms.
- unit_tests = env.ChromeTestProgram('unit_tests', unit_test_files)
+ unit_tests = env.ChromeTestProgram('unit_tests', input_files)
i = env.Install('$TARGET_ROOT', unit_tests)
Alias('chrome', i)
-env.ChromeMSVSProject('$CHROME_DIR/test/unit/unittests.vcproj',
+p = env.ChromeMSVSProject('unittests.vcproj',
+ dest='$CHROME_SRC_DIR/chrome/test/unit/unittests.vcproj',
name='unit_tests',
dependencies = [
'$BASE_DIR/build/base.vcproj',
@@ -305,4 +483,76 @@ env.ChromeMSVSProject('$CHROME_DIR/test/unit/unittests.vcproj',
'$LIBXSLT_DIR/build/libxslt.vcproj',
'$CHROME_DIR/app/theme/theme_dll.vcproj',
],
- guid='{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}')
+ guid='{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}',
+ # 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',
+ MSVSTool('VCResourceCompilerTool',
+ AdditionalIncludeDirectories=[
+ '$(SolutionDir)..',
+ '"$(IntDir)"',
+ '"$(IntDir)"',
+ '"$(SolutionDir)"',
+ '"$(IntDir)/../"',
+ ]),
+ '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',
+ '$(SolutionDir)../third_party/libpng/using_libpng.vsprops',
+ '$(SolutionDir)../third_party/zlib/using_zlib.vsprops',
+ '$(SolutionDir)../skia/using_skia.vsprops',
+ '$(SolutionDir)../third_party/libxml/build/using_libxml.vsprops',
+ '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+ '$(SolutionDir)../testing/using_gtest.vsprops',
+ '../../third_party/hunspell/using_hunspell.vsprops',
+ '../../../third_party/npapi/using_npapi.vsprops',
+ ])
+
+p.AddConfig('Release|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/common.vsprops',
+ '$(SolutionDir)../build/release.vsprops',
+ '../../tools/build/win/unit_test.vsprops',
+ '$(SolutionDir)../third_party/libpng/using_libpng.vsprops',
+ '$(SolutionDir)../third_party/zlib/using_zlib.vsprops',
+ '$(SolutionDir)../skia/using_skia.vsprops',
+ '$(SolutionDir)../third_party/libxml/build/using_libxml.vsprops',
+ '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+ '$(SolutionDir)../testing/using_gtest.vsprops',
+ '../../third_party/hunspell/using_hunspell.vsprops',
+ '../../../third_party/npapi/using_npapi.vsprops',
+ ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+ 'Debug|Win32',
+ tools=[
+ MSVSTool('VCCLCompilerTool',
+ UsePrecompiledHeader='1'),
+ ])
generated by cgit v1.1 at 2025-01-16 05:49:43 +0000