diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 23:29:20 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 23:29:20 +0000 |
| commit | 1bdfd82cea4f30a5751a19c8283b05f34612a818 (patch) | |
| tree | d41f92852dc4b90c2bf4b469252e535761e27152 /sandbox/src | |
| parent | 126a6c706d0db79f5af75b1f019b831cf9680e70 (diff) | |
| download | chromium_src-1bdfd82cea4f30a5751a19c8283b05f34612a818.zip chromium_src-1bdfd82cea4f30a5751a19c8283b05f34612a818.tar.gz chromium_src-1bdfd82cea4f30a5751a19c8283b05f34612a818.tar.bz2 | |
Rolling back switch to hammer patterns again.
Review URL: http://codereview.chromium.org/7530
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/src')
| -rw-r--r-- | sandbox/src/SConscript | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sandbox/src/SConscript b/sandbox/src/SConscript index 961257b..8914ba2 100644 --- a/sandbox/src/SConscript +++ b/sandbox/src/SConscript @@ -10,7 +10,6 @@ env = env.Clone() # in the base env here, not just in env_tests. env.Prepend( CPPPATH = [ - '$ROOT_DIR', '$GTEST_DIR/include', '$GTEST_DIR', '../..', @@ -28,10 +27,8 @@ env.Append( ], ) -env.Dir('$OBJ_ROOT/sandbox/src').addRepository(env.Dir('$ROOT_DIR/sandbox')) - env_tests = env.Clone( - TESTS_DIR = 'tests', + TESTS_DIR = '../tests', INTEGRATION_TESTS_DIR = '$TESTS_DIR/integration_tests', UNIT_TESTS_DIR = '$TESTS_DIR/unit_tests', VALIDATION_TESTS_DIR = '$TESTS_DIR/validation_tests', @@ -161,8 +158,6 @@ unit_test_files = [ # TODO(bradnelson): This step generates unittests_tests.pch.ib_tag # SCons doesn't know. env_p = env_unit_tests.Clone() -# TODO(bradnelson): Make this automatic. -env_p['COMPONENT_PLATFORM_SETUP'](env_p, 'ComponentTestProgram') pch, obj = env_p.PCH(['$UNIT_TESTS_DIR/unit_tests.pch', '$UNIT_TESTS_DIR/unit_tests.obj'], '$UNIT_TESTS_DIR/unit_tests.cc') @@ -206,8 +201,6 @@ integration_test_files = [ # TODO(bradnelson): This step generates integration_tests.pch.ib_tag # SCons doesn't know. env_p = env_integration_tests.Clone() -# TODO(bradnelson): Make this automatic. -env_p['COMPONENT_PLATFORM_SETUP'](env_p, 'ComponentTestProgram') pch, obj = env_p.PCH(['$INTEGRATION_TESTS_DIR/integration_tests.pch', '$INTEGRATION_TESTS_DIR/integration_tests.obj'], '$INTEGRATION_TESTS_DIR/integration_tests.cc') @@ -240,8 +233,7 @@ validation_test_files = [ ] env_p = env_validation_tests.Clone() -# TODO(bradnelson): Make this automatic. -env_p['COMPONENT_PLATFORM_SETUP'](env_p, 'ComponentTestProgram') + # TODO(bradnelson): This step generates unittests_tests.pch.ib_tag # SCons doesn't know. pch, obj = env_p.PCH(['$VALIDATION_TESTS_DIR/unit_tests.pch', @@ -257,10 +249,11 @@ validation_tests = env_validation_tests.ChromeTestProgram( ) -# Install tests to where the buildbot expects them for now. -installed_tests = env.Install('$MAIN_DIR/Hammer', +# Install tests to a path where they can find their inputs. +installed_tests = env.Install('$OBJ_ROOT', unit_tests + validation_tests + integration_tests) # Setup alias for sandbox related targets. env.Alias('sandbox', ['.', installed_tests]) + |