diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 06:04:24 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 06:04:24 +0000 |
| commit | 69a613f3a95c188524ac8e590fb45396b047c9ee (patch) | |
| tree | 007131a97049053a3e2967fa2c1695c8c0583b1a /sandbox/src | |
| parent | 989b6e8061bff363e43f13f5aa9bacef6b321603 (diff) | |
| download | chromium_src-69a613f3a95c188524ac8e590fb45396b047c9ee.zip chromium_src-69a613f3a95c188524ac8e590fb45396b047c9ee.tar.gz chromium_src-69a613f3a95c188524ac8e590fb45396b047c9ee.tar.bz2 | |
Adding in new hammer patterns. Restored from rollback change 3578.
Review URL: http://codereview.chromium.org/7656
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3597 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/src')
| -rw-r--r-- | sandbox/src/SConscript | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sandbox/src/SConscript b/sandbox/src/SConscript index 8914ba2..961257b 100644 --- a/sandbox/src/SConscript +++ b/sandbox/src/SConscript @@ -10,6 +10,7 @@ env = env.Clone() # in the base env here, not just in env_tests. env.Prepend( CPPPATH = [ + '$ROOT_DIR', '$GTEST_DIR/include', '$GTEST_DIR', '../..', @@ -27,8 +28,10 @@ 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', @@ -158,6 +161,8 @@ 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') @@ -201,6 +206,8 @@ 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') @@ -233,7 +240,8 @@ 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', @@ -249,11 +257,10 @@ validation_tests = env_validation_tests.ChromeTestProgram( ) -# Install tests to a path where they can find their inputs. -installed_tests = env.Install('$OBJ_ROOT', +# Install tests to where the buildbot expects them for now. +installed_tests = env.Install('$MAIN_DIR/Hammer', unit_tests + validation_tests + integration_tests) # Setup alias for sandbox related targets. env.Alias('sandbox', ['.', installed_tests]) - |