diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 17:43:13 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 17:43:13 +0000 |
| commit | 3c8808a2b5e3d01505443e4fdcba2a0e0620644a (patch) | |
| tree | b3150cff918ebb04227c55a9463f13cafc553cc6 /chrome/test/interactive_ui | |
| parent | a2cf67e5986cdbdba24eb2b4ee0ef7be810e7cc7 (diff) | |
| download | chromium_src-3c8808a2b5e3d01505443e4fdcba2a0e0620644a.zip chromium_src-3c8808a2b5e3d01505443e4fdcba2a0e0620644a.tar.gz chromium_src-3c8808a2b5e3d01505443e4fdcba2a0e0620644a.tar.bz2 | |
Accumulated SCons changes for Windows chrome build, round II:
Includes other recent additions, and doesn't fix everything,
but gets significant pieces back on track:
* New/additional library dependencies in various test executables
(too many to be worth listing).
* Portability: put library base names in $LIBS instead of explicitly
listing .lib files.
* Have interactive_ui re-use various object files from test/ui
instead of (re-)listing the .cc files.
* Add new files:
chrome\browser\bookmarks\bookmark_drag_data.cc
chrome\browser\bookmarks\bookmark_drag_utils.cc
chrome\browser\bookmarks\bookmark_table_model.cc
chrome\browser\browser_trial.cc
chrome\browser\download\download_request_manager_unittest.cc
chrome\browser\greasmonkey_master.cc
chrome\browser\spellcheck_unittest.cc
chrome\browser\views\find_bar_view.cc
chrome\browser\views\find_bar_win.cc
chrome\renderer\greasemonkey_slave.cc
* Remove old files:
chrome\browser\find_in_page_controller.cc
chrome\browser\find_in_page_view.cc
chrome\renderer\spellcheck_unittest.cc
* Remove relative reference to ../../app/google_update_settings$OBJSUFFIX.
* Get rid of by-hand /IMPLIB and /MAP flags.
* Prefix / suffix portability in the jscre library.
* Rename $LIBXML_DIR/scons => $LIBXML_DIR/DerivedSources.
* Add $CHROME_DIR/app/resources to CPPPATH.
* Add icu38 directories to CPPPATH for building chrome/views files.
Review URL: http://codereview.chromium.org/8742
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/interactive_ui')
| -rw-r--r-- | chrome/test/interactive_ui/SConscript | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript index f788335..7b0fdda 100644 --- a/chrome/test/interactive_ui/SConscript +++ b/chrome/test/interactive_ui/SConscript @@ -33,13 +33,21 @@ env_test.Prepend( 'browser_views', 'bzip2', 'common', + 'debugger', + 'glue', 'googleurl', 'gtest', + 'hunspell', env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'libpng', 'modp_b64', 'net', + 'renderer', 'skia', + 'sqlite', + 'views', + 'v8', + 'WebCore', 'zlib', ], ) @@ -74,13 +82,14 @@ input_files = [ '$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/ui/npapi_test_helper$OBJSUFFIX', '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', + '$CHROME_DIR/test/interactive_ui/npapi_interactive_test.cc', '$CHROME_DIR/test/test_file_util$OBJSUFFIX', + 'view_event_test_base.cc', - '$CHROME_DIR/test/ui/npapi_test_helper$OBJSUFFIX', - '$CHROME_DIR/test/interactive_ui/npapi_interactive_test.cc', ] exe = env_test.ChromeTestProgram('interactive_ui_tests', input_files) |