diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-17 23:44:26 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-17 23:44:26 +0000 |
| commit | dfcec23417f5ac504a257f1c740404df69826792 (patch) | |
| tree | 2939b84952c63d2de47d2aaeaa4d469ab17cef79 /net | |
| parent | 63c2f1af4de7286e8f8b19f4921870a00fae64df (diff) | |
| download | chromium_src-dfcec23417f5ac504a257f1c740404df69826792.zip chromium_src-dfcec23417f5ac504a257f1c740404df69826792.tar.gz chromium_src-dfcec23417f5ac504a257f1c740404df69826792.tar.bz2 | |
Applying software construction toolkit patterns in scons build.
Review URL: http://codereview.chromium.org/6569
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/SConscript | 29 | ||||
| -rw-r--r-- | net/tools/tld_cleanup/SConscript | 3 |
2 files changed, 17 insertions, 15 deletions
diff --git a/net/SConscript b/net/SConscript index 37d6c18..b862b91 100644 --- a/net/SConscript +++ b/net/SConscript @@ -14,7 +14,7 @@ env.Prepend( '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', '$SDCH_DIR/open-vcdiff/src', - '..', + '$ROOT_DIR', ], ) @@ -166,7 +166,7 @@ env.ChromeStaticLibrary('net', input_files) env_tests.Prepend( CPPPATH = [ - '..', + '$ROOT_DIR', ], CPPDEFINES = [ 'UNIT_TEST', @@ -221,6 +221,9 @@ if env['PLATFORM'] in ('posix', 'darwin'): ) +disk_cache_test_util = env.ChromeObject('disk_cache/disk_cache_test_util.cc') + + unittest_files = [ 'base/auth_cache_unittest.cc', 'base/base64_unittest.cc', @@ -244,7 +247,6 @@ unittest_files = [ 'disk_cache/backend_unittest.cc', 'disk_cache/block_files_unittest.cc', 'disk_cache/disk_cache_test_base.cc', - 'disk_cache/disk_cache_test_util.cc', 'disk_cache/entry_unittest.cc', 'disk_cache/mapped_file_unittest.cc', 'disk_cache/storage_block_unittest.cc', @@ -254,6 +256,7 @@ unittest_files = [ 'http/http_chunked_decoder_unittest.cc', 'http/http_response_headers_unittest.cc', 'http/http_vary_data_unittest.cc', + disk_cache_test_util, ] if env['PLATFORM'] == 'win32': @@ -286,12 +289,12 @@ if env['PLATFORM'] in ('posix', 'win32'): net_perftests = env_tests.ChromeTestProgram( 'net_perftests', - ['disk_cache/disk_cache_test_util.cc', - 'disk_cache/disk_cache_perftest.cc', + ['disk_cache/disk_cache_perftest.cc', + disk_cache_test_util, 'base/cookie_monster_perftest.cc', # TODO(sgk): avoid using .cc from base directly - '$BASE_DIR/run_all_perftests$OBJSUFFIX', - '$BASE_DIR/perftimer$OBJSUFFIX'] + '$OBJ_ROOT/base/run_all_perftests$OBJSUFFIX', + '$OBJ_ROOT/base/perftimer$OBJSUFFIX'] ) install_targets.extend([ @@ -302,13 +305,13 @@ if env['PLATFORM'] == 'win32': stress_cache = env_tests.ChromeTestProgram( 'stress_cache', ['disk_cache/stress_cache.cc', - 'disk_cache/disk_cache_test_util.cc'] + disk_cache_test_util], ) crash_cache = env_tests.ChromeTestProgram( 'crash_cache', ['tools/crash_cache/crash_cache.cc', - 'disk_cache/disk_cache_test_util.cc'] + disk_cache_test_util], ) install_targets.extend([ @@ -317,14 +320,14 @@ if env['PLATFORM'] == 'win32': ]) -# Create install of tests. -installed_tests = env.Install('$TARGET_ROOT', install_targets) +# Install tests where the buildbot expects them. +installed_tests = env.Install('$MAIN_DIR/Hammer', install_targets) if env['PLATFORM'] == 'win32': - env_res.Append( + env_res.Prepend( CPPPATH = [ - '..', + '$ROOT_DIR', ], RCFLAGS = [ ['/l', '0x409'], diff --git a/net/tools/tld_cleanup/SConscript b/net/tools/tld_cleanup/SConscript index 5ab7e82..415bef7 100644 --- a/net/tools/tld_cleanup/SConscript +++ b/net/tools/tld_cleanup/SConscript @@ -8,7 +8,7 @@ env = env.Clone() env.Prepend( CPPPATH = [ - '../../..', + '$ROOT_DIR', ], LIBS = [ 'googleurl', @@ -49,4 +49,3 @@ i = env.Install('$TARGET_ROOT', exe_targets) env.Alias('net', i) env.Install('$TARGET_ROOT', exe_targets) - |