diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-05 00:46:18 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-05 00:46:18 +0000 |
| commit | 771e47c22478e28a0783a62cacba00d48402d7b8 (patch) | |
| tree | af41098371d73f0bedd88e914e64f8f73ddc20a9 | |
| parent | 952cc40307a2309fde272079e8706113d609a450 (diff) | |
| download | chromium_src-771e47c22478e28a0783a62cacba00d48402d7b8.zip chromium_src-771e47c22478e28a0783a62cacba00d48402d7b8.tar.gz chromium_src-771e47c22478e28a0783a62cacba00d48402d7b8.tar.bz2 | |
Avoid having the Hammer modules strip _WINDOWS for test programs,
since doing so conflicts with the way we build the .pch file
(and our explicit settings for the rest of object files).
Review URL: http://codereview.chromium.org/9380
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4716 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | sandbox/tests/integration_tests/sbox_integration_tests.scons | 5 | ||||
| -rw-r--r-- | sandbox/tests/unit_tests/sbox_unittests.scons | 5 | ||||
| -rw-r--r-- | sandbox/tests/validation_tests/sbox_validation_tests.scons | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/sandbox/tests/integration_tests/sbox_integration_tests.scons b/sandbox/tests/integration_tests/sbox_integration_tests.scons index 13476d1..ad0f39a 100644 --- a/sandbox/tests/integration_tests/sbox_integration_tests.scons +++ b/sandbox/tests/integration_tests/sbox_integration_tests.scons @@ -76,6 +76,5 @@ input_files = [ '../common/controller$OBJSUFFIX', ] -integration_tests = env.ChromeTestProgram('sbox_integration_tests', input_files) -i = env.Install('$TARGET_ROOT', integration_tests) -env.Alias('sandbox', i) +env.ChromeTestProgram('sbox_integration_tests', input_files, + COMPONENT_PLATFORM_SETUP=None) diff --git a/sandbox/tests/unit_tests/sbox_unittests.scons b/sandbox/tests/unit_tests/sbox_unittests.scons index 2ce1759..f311ede 100644 --- a/sandbox/tests/unit_tests/sbox_unittests.scons +++ b/sandbox/tests/unit_tests/sbox_unittests.scons @@ -74,6 +74,5 @@ input_files = [ '../common/controller$OBJSUFFIX', ] -sbox_unittests = env.ChromeTestProgram('sbox_unittests', input_files) -i = env.Install('$TARGET_ROOT', sbox_unittests) -env.Alias('sandbox', i) +env.ChromeTestProgram('sbox_unittests', input_files, + COMPONENT_PLATFORM_SETUP=None) diff --git a/sandbox/tests/validation_tests/sbox_validation_tests.scons b/sandbox/tests/validation_tests/sbox_validation_tests.scons index 38b488b..7320034 100644 --- a/sandbox/tests/validation_tests/sbox_validation_tests.scons +++ b/sandbox/tests/validation_tests/sbox_validation_tests.scons @@ -69,6 +69,5 @@ input_files = [ '../common/controller$OBJSUFFIX', ] -validation_tests = env.ChromeTestProgram('sbox_validation_tests', input_files) -i = env.Install('$TARGET_ROOT', validation_tests) -env.Alias('sandbox', i) +env.ChromeTestProgram('sbox_validation_tests', input_files, + COMPONENT_PLATFORM_SETUP=None) |