summaryrefslogtreecommitdiffstats
path: root/chrome/test/interactive_ui
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-30 05:35:44 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-30 05:35:44 +0000
commitd1b13d7b10e2edeb4faf23caec84a9851c0b3aa7 (patch)
tree6795a61276e10ddf48fc4c095ca18da479121c51 /chrome/test/interactive_ui
parent6ea265a8b1b6e1512992945efa08942f575ad4c1 (diff)
downloadchromium_src-d1b13d7b10e2edeb4faf23caec84a9851c0b3aa7.zip
chromium_src-d1b13d7b10e2edeb4faf23caec84a9851c0b3aa7.tar.gz
chromium_src-d1b13d7b10e2edeb4faf23caec84a9851c0b3aa7.tar.bz2
Accumulated SCons changes for Windows chrome build and other
recent additions (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/8725 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4205 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/interactive_ui')
-rw-r--r--chrome/test/interactive_ui/SConscript13
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)