diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-25 17:20:48 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-25 17:20:48 +0000 |
| commit | 7002ac6566bb5472a99d0f8f3f6f4932e86dab44 (patch) | |
| tree | 2102518edab4ba7adbbbd38e7934be3c341de65b /chrome/SConscript.ui_tests | |
| parent | 689e237ec010792fe78343d9eff48539050481b0 (diff) | |
| download | chromium_src-7002ac6566bb5472a99d0f8f3f6f4932e86dab44.zip chromium_src-7002ac6566bb5472a99d0f8f3f6f4932e86dab44.tar.gz chromium_src-7002ac6566bb5472a99d0f8f3f6f4932e86dab44.tar.bz2 | |
Fix SCons modules build on Windows:
* Add 'midl' Tool module.
* Filter out the default OS_WINDOWS= definition from the Hammer
modules, which messes up our build.
* Fix the $PLATFORMSDK_VISTA definition.
* Remove the current directory from the 'base' Alias (avoid cycles).
* Remove by-hand addition of .lib, .pdb and .ilk files to the target
list when build shared libraries (multiple places).
* Comment out a post-action Touch() of the themes/default resource.
(Thanks to bradnelson for many of the above individual fixes.)
Review URL: http://codereview.chromium.org/8207
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3980 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/SConscript.ui_tests')
| -rw-r--r-- | chrome/SConscript.ui_tests | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/SConscript.ui_tests b/chrome/SConscript.ui_tests index 07c8e4a..0c587b1 100644 --- a/chrome/SConscript.ui_tests +++ b/chrome/SConscript.ui_tests @@ -93,7 +93,6 @@ ui_test_files = [ 'browser/download/download_uitest.cc', 'browser/download/save_page_uitest.cc', 'browser/errorpage_uitest.cc', - 'browser/find_in_page_controller_uitest.cc', 'browser/history/redirect_uitest.cc', 'browser/iframe_uitest.cc', 'browser/images_uitest.cc', @@ -134,6 +133,12 @@ ui_test_files = [ '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', ] +if env_test['PLATFORM'] == 'win32': + ui_test_files.extend([ + 'find_bar_win_interactive_uitest.cc', + 'find_bar_win_uitest.cc', + ]) + ui_tests = env_test.ChromeTestProgram('ui_tests', ui_test_files + libs) i = env_test.Install('$TARGET_ROOT', ui_tests) |