diff options
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/automation/SConscript | 2 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/SConscript | 13 | ||||
| -rw-r--r-- | chrome/test/memory_test/SConscript | 1 | ||||
| -rw-r--r-- | chrome/test/reliability/SConscript | 34 | ||||
| -rw-r--r-- | chrome/test/startup/SConscript | 2 |
5 files changed, 21 insertions, 31 deletions
diff --git a/chrome/test/automation/SConscript b/chrome/test/automation/SConscript index 1b9d786..71a09c1 100644 --- a/chrome/test/automation/SConscript +++ b/chrome/test/automation/SConscript @@ -30,5 +30,5 @@ input_files = [ lib = env.ChromeStaticLibrary('automation', input_files) i = env.Install('$TARGET_ROOT', lib) -#env.Alias('chrome', i) +env.Alias('chrome', i) diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript index 7b0fdda..f788335 100644 --- a/chrome/test/interactive_ui/SConscript +++ b/chrome/test/interactive_ui/SConscript @@ -33,21 +33,13 @@ 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', ], ) @@ -82,14 +74,13 @@ 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) diff --git a/chrome/test/memory_test/SConscript b/chrome/test/memory_test/SConscript index 454a1b3..75a595f 100644 --- a/chrome/test/memory_test/SConscript +++ b/chrome/test/memory_test/SConscript @@ -31,7 +31,6 @@ env_test.Prepend( 'gtest', env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'libpng', - 'modp_b64', 'net', 'skia', 'zlib', diff --git a/chrome/test/reliability/SConscript b/chrome/test/reliability/SConscript index 3504e61..0922599 100644 --- a/chrome/test/reliability/SConscript +++ b/chrome/test/reliability/SConscript @@ -22,27 +22,22 @@ env_test.Prepend( '$CHROME_SRC_DIR', ], LIBS = [ - 'automation', - 'base', - 'base_gfx', - 'browser', - 'browser_views', - 'common', 'googleurl', + 'skia', + 'libpng', 'gtest', + 'base_gfx', env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'libpng', - 'modp_b64', - 'net', - 'skia', + 'common', 'zlib', - - 'comsupp', - 'oleacc', - 'psapi', - 'rpcrt4', - 'winmm', + 'browser', + 'browser_views', + 'base', + 'automation', ], +) + +env_test.Prepend( LINKFLAGS = [ '/INCREMENTAL', '/DEBUG', @@ -58,6 +53,13 @@ env_test.Prepend( '/ignore:4199', '/nxcompat', ], + LIBS = [ + 'comsupp.lib', + 'oleacc.lib', + 'psapi.lib', + 'rpcrt4.lib', + 'winmm.lib', + ], ) input_files = [ diff --git a/chrome/test/startup/SConscript b/chrome/test/startup/SConscript index ab57d9c..9e95689 100644 --- a/chrome/test/startup/SConscript +++ b/chrome/test/startup/SConscript @@ -32,8 +32,6 @@ env_test.Prepend( 'browser_views', 'base', 'automation', - 'modp_b64', - 'net', ], ) |