diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 05:55:47 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 05:55:47 +0000 |
| commit | 4f705b53daef7ac8f5bc34d5fb2e8b6ef6795cee (patch) | |
| tree | 5b58bd5a7f6f599db9e08435965fb81ca54c4930 /chrome/SConscript.automated_ui_tests | |
| parent | d1b13d7b10e2edeb4faf23caec84a9851c0b3aa7 (diff) | |
| download | chromium_src-4f705b53daef7ac8f5bc34d5fb2e8b6ef6795cee.zip chromium_src-4f705b53daef7ac8f5bc34d5fb2e8b6ef6795cee.tar.gz chromium_src-4f705b53daef7ac8f5bc34d5fb2e8b6ef6795cee.tar.bz2 | |
Revert r4205 to track down buildbot unit_tests failure.
Review URL: http://codereview.chromium.org/8730
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4206 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/SConscript.automated_ui_tests')
| -rw-r--r-- | chrome/SConscript.automated_ui_tests | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/chrome/SConscript.automated_ui_tests b/chrome/SConscript.automated_ui_tests index e8a973d..b4b15bb 100644 --- a/chrome/SConscript.automated_ui_tests +++ b/chrome/SConscript.automated_ui_tests @@ -24,27 +24,19 @@ env_test.Prepend( 'LIBXML_STATIC', ], LIBS = [ - 'automation', - 'base', - 'base_gfx', - 'browser', - 'browser_views', - 'common', + 'libxml', 'googleurl', + 'skia', + 'libpng', 'gtest', + 'base_gfx', env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'libpng', - 'libxml', - 'modp_b64', - 'net', - 'skia', 'zlib', - - 'comsupp', - 'oleacc', - 'psapi', - 'rpcrt4', + 'base', ], +) + +env_test.Prepend( LINKFLAGS = [ '/INCREMENTAL', @@ -62,8 +54,21 @@ env_test.Prepend( '/MACHINE:X86', '/FIXED:No', ], + LIBS = [ + 'comsupp.lib', + 'oleacc.lib', + 'psapi.lib', + 'rpcrt4.lib', + ], ) +libs = [ + 'common/common.lib', + 'browser/browser.lib', + 'browser/views/browser_views.lib', + 'test/automation/automation.lib', +] + test_files = [ 'test/automated_ui_tests/automated_ui_tests.cc', '$CHROME_DIR/test/test_file_util$OBJSUFFIX', @@ -73,7 +78,7 @@ test_files = [ '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', ] -exe = env_test.ChromeTestProgram('automated_ui_tests', test_files) +exe = env_test.ChromeTestProgram('automated_ui_tests', test_files + libs) i = env_test.Install('$TARGET_ROOT', exe) Alias('chrome', i) |