diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 17:16:46 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 17:16:46 +0000 |
| commit | da6654b0465478b0549e593c1efb45bd44756965 (patch) | |
| tree | 487788278214089228f23098346c1d02b5acfec4 /chrome/test/memory_test | |
| parent | 1fbb43878f7f68c1770a12847ecd46c0f1413b3e (diff) | |
| download | chromium_src-da6654b0465478b0549e593c1efb45bd44756965.zip chromium_src-da6654b0465478b0549e593c1efb45bd44756965.tar.gz chromium_src-da6654b0465478b0549e593c1efb45bd44756965.tar.bz2 | |
Next round of SCons changes:
* Add 'gdm_fp' to the $LIBS setting in base\using_base.scons
(to be removed when that library moves into base\third_party).
* Have the grit Scanner search the Repository() copy of the source
file (necessary now that $TARGET_ROOT has changed).
* Change all the SConscript files underneath chrome\test and
chrome\tools to *.scons files, including updating their
contents with the current patterns.
* Add dependencies of the local_settings_*.res files on
the corresponding google_chrome_string_*.rc files, so they
get generated properly.
* Add generation of the chrome_exe.res resource file.
* Comment out some unnecessary .lib settings in the base
construction environment.
Review URL: http://codereview.chromium.org/10745
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/memory_test')
| -rw-r--r-- | chrome/test/memory_test/memory_test.scons (renamed from chrome/test/memory_test/SConscript) | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/chrome/test/memory_test/SConscript b/chrome/test/memory_test/memory_test.scons index 454a1b3..f3b350d 100644 --- a/chrome/test/memory_test/SConscript +++ b/chrome/test/memory_test/memory_test.scons @@ -2,44 +2,41 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -Import('env_test') +Import('env') -env_test = env_test.Clone() +env = env.Clone() +env.ApplySConscript([ + '$BASE_DIR/using_base.scons', + '$BASE_DIR/gfx/using_base_gfx.scons', + '$CHROME_SRC_DIR/build/using_googleurl.scons', + '$GTEST_DIR/../using_gtest.scons', + '$ICU38_DIR/using_icu38.scons', + '$LIBPNG_DIR/using_libpng.scons', + '$MODP_B64_DIR/using_modp_b64.scons', + '$NET_DIR/using_net.scons', + '$SKIA_DIR/using_skia.scons', + '$ZLIB_DIR/using_zlib.scons', +]) -env_test.Prepend( +env.Prepend( CPPDEFINES = [ 'UI_TEST', 'UNIT_TEST', ], CPPPATH = [ - '$GTEST_DIR/include', - '$GTEST_DIR', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', '$CHROME_SRC_DIR', ], LIBS = [ 'automation', - 'base', - 'base_gfx', 'browser', 'browser_views', 'common', - 'googleurl', - 'gtest', - env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'libpng', - 'modp_b64', - 'net', - 'skia', - 'zlib', ], ) -if env_test['PLATFORM'] == 'win32': - env_test.Prepend( +if env['PLATFORM'] == 'win32': + env.Prepend( LINKFLAGS = [ '/INCREMENTAL', '/DEBUG', @@ -66,8 +63,4 @@ input_files = [ 'memory_test.cc', ] -exe = env_test.ChromeTestProgram('memory_test', input_files) -i = env_test.Install('$TARGET_ROOT', exe) - -env_test.Alias('chrome', i) - +env.ChromeTestProgram('memory_test', input_files) |