diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 23:26:29 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 23:26:29 +0000 |
| commit | b96fc5dc177d311db220dc4039e74a9c0d871558 (patch) | |
| tree | 9bbc6ea3af7c0da75d4b6025d4b475dd62eec0b2 /sandbox/tests | |
| parent | db8635032b1f83436a072be14e425076a7bd8164 (diff) | |
| download | chromium_src-b96fc5dc177d311db220dc4039e74a9c0d871558.zip chromium_src-b96fc5dc177d311db220dc4039e74a9c0d871558.tar.gz chromium_src-b96fc5dc177d311db220dc4039e74a9c0d871558.tar.bz2 | |
Convert from using env['PLATFORM'] directly to using the more flexible
and better-thought-out Hammer env.Bits() idioms:
* env['PLATFORM'] == 'win32' => env.Bit('windows')
* env['PLATFORM'] == 'posix' => env.Bit('linux')
* env['PLATFORM'] == 'darwin' => env.Bit('mac')
New idioms:
* env.Bit('posix') => really does mean "any POSIX platform"
* env.AnyBits('mac', 'linux') => specifically mac or linux, excluding
other POSIX platforms
Where we were using compound conditionals (e.g., "env['PLATFORM'] in
('posix', 'darwin')") I tried to take my best shot at translating
the intent (i.e., "env.Bits('posix')" for something POSIX, "not
env.Bits('mac')" for something not yet ported to Mac, etc.)
Review URL: http://codereview.chromium.org/15051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/tests')
4 files changed, 4 insertions, 4 deletions
diff --git a/sandbox/tests/common/sandbox_common.scons b/sandbox/tests/common/sandbox_common.scons index b1b101c..6b50ba4 100644 --- a/sandbox/tests/common/sandbox_common.scons +++ b/sandbox/tests/common/sandbox_common.scons @@ -6,7 +6,7 @@ Import('env') env = env.Clone() -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Append( CCFLAGS = [ '/WX', # treat warnings as errors diff --git a/sandbox/tests/integration_tests/sbox_integration_tests.scons b/sandbox/tests/integration_tests/sbox_integration_tests.scons index 7c8ed97..71e927d 100644 --- a/sandbox/tests/integration_tests/sbox_integration_tests.scons +++ b/sandbox/tests/integration_tests/sbox_integration_tests.scons @@ -12,7 +12,7 @@ env.ApplySConscript([ '$SANDBOX_DIR/using_sandbox.scons', ]) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Append( CCFLAGS = [ '/WX', # treat warnings as errors diff --git a/sandbox/tests/unit_tests/sbox_unittests.scons b/sandbox/tests/unit_tests/sbox_unittests.scons index 02fc1b8..660a13a 100644 --- a/sandbox/tests/unit_tests/sbox_unittests.scons +++ b/sandbox/tests/unit_tests/sbox_unittests.scons @@ -12,7 +12,7 @@ env.ApplySConscript([ '$SANDBOX_DIR/using_sandbox.scons', ]) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Append( CCFLAGS = [ '/WX', # treat warnings as errors diff --git a/sandbox/tests/validation_tests/sbox_validation_tests.scons b/sandbox/tests/validation_tests/sbox_validation_tests.scons index ba4dcae..e23a3c7 100644 --- a/sandbox/tests/validation_tests/sbox_validation_tests.scons +++ b/sandbox/tests/validation_tests/sbox_validation_tests.scons @@ -12,7 +12,7 @@ env.ApplySConscript([ '$SANDBOX_DIR/using_sandbox.scons', ]) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Append( CCFLAGS = [ '/WX', # treat warnings as errors |