| OLD | NEW |
| 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 Import('env') | 5 Import('env') |
| 6 | 6 |
| 7 env = env.Clone() | 7 env = env.Clone() |
| 8 | 8 |
| 9 env.ApplySConscript([ | 9 env.ApplySConscript([ |
| 10 '$BASE_DIR/using_base.scons', | 10 '$BASE_DIR/using_base.scons', |
| 11 '$GTEST_DIR/../using_gtest.scons', | 11 '$GTEST_DIR/../using_gtest.scons', |
| 12 '$SANDBOX_DIR/using_sandbox.scons', | 12 '$SANDBOX_DIR/using_sandbox.scons', |
| 13 ]) | 13 ]) |
| 14 | 14 |
| 15 if env['PLATFORM'] == 'win32': | 15 if env.Bit('windows'): |
| 16 env.Append( | 16 env.Append( |
| 17 CCFLAGS = [ | 17 CCFLAGS = [ |
| 18 '/WX', # treat warnings as errors | 18 '/WX', # treat warnings as errors |
| 19 ], | 19 ], |
| 20 ) | 20 ) |
| 21 | 21 |
| 22 # TODO(bradnelson): This step generates integration_tests.pch.ib_tag | 22 # TODO(bradnelson): This step generates integration_tests.pch.ib_tag |
| 23 # SCons doesn't know. | 23 # SCons doesn't know. |
| 24 env_p = env.Clone() | 24 env_p = env.Clone() |
| 25 pch, obj = env_p.PCH(['integration_tests.pch', 'integration_tests.obj'], | 25 pch, obj = env_p.PCH(['integration_tests.pch', 'integration_tests.obj'], |
| (...skipping 16 matching lines...) Expand all Loading... |
| 42 '$SANDBOX_DIR/src/process_policy_test.cc', | 42 '$SANDBOX_DIR/src/process_policy_test.cc', |
| 43 '$SANDBOX_DIR/src/registry_policy_test.cc', | 43 '$SANDBOX_DIR/src/registry_policy_test.cc', |
| 44 '$SANDBOX_DIR/src/sync_policy_test.cc', | 44 '$SANDBOX_DIR/src/sync_policy_test.cc', |
| 45 '$SANDBOX_DIR/src/unload_dll_test.cc', | 45 '$SANDBOX_DIR/src/unload_dll_test.cc', |
| 46 | 46 |
| 47 '../common/controller$OBJSUFFIX', | 47 '../common/controller$OBJSUFFIX', |
| 48 ] | 48 ] |
| 49 | 49 |
| 50 env.ChromeTestProgram('sbox_integration_tests', input_files, | 50 env.ChromeTestProgram('sbox_integration_tests', input_files, |
| 51 COMPONENT_PLATFORM_SETUP=None) | 51 COMPONENT_PLATFORM_SETUP=None) |
| OLD | NEW |