diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-04 18:11:39 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-04 18:11:39 +0000 |
| commit | 372d63e5389ff61ac6043302a14711497be2999f (patch) | |
| tree | 98f5eacc467f410fbc36f3e795326a8507df9765 /chrome/test/interactive_ui | |
| parent | eb0c1e406f837d590055021a753015feb67b6fc9 (diff) | |
| download | chromium_src-372d63e5389ff61ac6043302a14711497be2999f.zip chromium_src-372d63e5389ff61ac6043302a14711497be2999f.tar.gz chromium_src-372d63e5389ff61ac6043302a14711497be2999f.tar.bz2 | |
Cross-platform: Let SCons abstract library names by getting rid of .lib suffixes when linking with the libraries we build, replacing the lists of explicitly-suffixed "source files" with library base names in the environment LIBS variables. This requires having ChromeStaticLibrary() install .lib files in a $BUILD_TYPE/Libs directory, and adding that directory to $LIBPATH.
R=evanm,bradnelson
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/interactive_ui')
| -rw-r--r-- | chrome/test/interactive_ui/SConscript | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript index d472554..5262af5 100644 --- a/chrome/test/interactive_ui/SConscript +++ b/chrome/test/interactive_ui/SConscript @@ -50,6 +50,25 @@ env_test.Prepend( '$LIBXSLT_DIR',
'$LIBXML_DIR/include',
],
+ LIBS = [
+ 'automation',
+ 'base',
+ 'base_gfx',
+ 'browser',
+ 'bzip2',
+ 'common',
+ 'googleurl',
+ 'gtest',
+ 'icuuc',
+ 'libpng',
+ 'modp_b64',
+ 'net',
+ 'skia',
+ 'zlib',
+ ],
+)
+
+env_test.Prepend(
LINKFLAGS = [
'/INCREMENTAL',
'/DEBUG',
@@ -83,27 +102,9 @@ input_files = [ '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
]
-libs = [
- '$GOOGLEURL_DIR/googleurl.lib',
- '$SKIA_DIR/skia.lib',
- '$LIBPNG_DIR/libpng.lib',
- '$TESTING_DIR/gtest.lib',
- '$BASE_DIR/gfx/base_gfx.lib',
- '$ICU38_DIR/icuuc.lib',
- '$CHROME_DIR/common/common.lib',
- '$ZLIB_DIR/zlib.lib',
- '$MODP_B64_DIR/modp_b64.lib',
- '$CHROME_DIR/browser/browser.lib',
- '$NET_DIR/net.lib',
- '$BZIP2_DIR/bzip2.lib',
- '$BASE_DIR/base.lib',
- '$CHROME_DIR/test/automation/automation.lib',
-]
-
-
exe = env_test.ChromeTestProgram(['interactive_ui_tests',
'interactive_ui_tests.pdb'],
- input_files + libs)
+ input_files)
i = env_test.Install('$TARGET_ROOT', exe)
env_test.Alias('chrome', i)
|