Rolling back CL 3578, discovered hammer.bat had not been updated yet.

Review URL: http://codereview.chromium.org/7507

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3582 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 16 deletions

diff --git a/net/SConscript b/net/SConscript
index b862b91..37d6c18 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,9 +221,6 @@ 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',
@@ -247,6 +244,7 @@ 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',
@@ -256,7 +254,6 @@ 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':
@@ -289,12 +286,12 @@ if env['PLATFORM'] in ('posix', 'win32'):
 
   net_perftests = env_tests.ChromeTestProgram(
       'net_perftests',
-      ['disk_cache/disk_cache_perftest.cc',
-       disk_cache_test_util,
+      ['disk_cache/disk_cache_test_util.cc',
+       'disk_cache/disk_cache_perftest.cc',
        'base/cookie_monster_perftest.cc',
        # TODO(sgk): avoid using .cc from base directly
-       '$OBJ_ROOT/base/run_all_perftests$OBJSUFFIX',
-       '$OBJ_ROOT/base/perftimer$OBJSUFFIX']
+       '$BASE_DIR/run_all_perftests$OBJSUFFIX',
+       '$BASE_DIR/perftimer$OBJSUFFIX']
   )
 
   install_targets.extend([
@@ -305,13 +302,13 @@ if env['PLATFORM'] == 'win32':
   stress_cache = env_tests.ChromeTestProgram(
       'stress_cache',
       ['disk_cache/stress_cache.cc',
-       disk_cache_test_util],
+       'disk_cache/disk_cache_test_util.cc']
   )
 
   crash_cache = env_tests.ChromeTestProgram(
       'crash_cache',
       ['tools/crash_cache/crash_cache.cc',
-       disk_cache_test_util],
+       'disk_cache/disk_cache_test_util.cc']
   )
 
   install_targets.extend([
@@ -320,14 +317,14 @@ if env['PLATFORM'] == 'win32':
   ])
 
 
-# Install tests where the buildbot expects them.
-installed_tests = env.Install('$MAIN_DIR/Hammer', install_targets)
+# Create install of tests.
+installed_tests = env.Install('$TARGET_ROOT', install_targets)
 
 
 if env['PLATFORM'] == 'win32':
-  env_res.Prepend(
+  env_res.Append(
       CPPPATH = [
-          '$ROOT_DIR',
+          '..',
       ],
       RCFLAGS = [
           ['/l', '0x409'],