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 /base/base_unittests.scons | |
| 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 'base/base_unittests.scons')
| -rw-r--r-- | base/base_unittests.scons | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/base/base_unittests.scons b/base/base_unittests.scons index 7aa039a..a606ebb 100644 --- a/base/base_unittests.scons +++ b/base/base_unittests.scons @@ -20,12 +20,12 @@ env.ApplySConscript([ '$ZLIB_DIR/using_zlib.scons', ]) -if env['PLATFORM'] in ('posix', 'darwin'): +if env.Bit('posix'): env.ApplySConscript([ '$LIBEVENT_DIR/using_libevent.scons', ]) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( CCFLAGS = [ '/TP', @@ -33,7 +33,7 @@ if env['PLATFORM'] == 'win32': ], ) -if env['PLATFORM'] == 'posix': +if env.Bit('linux'): env.Append( # We need 'Xss' (X Screen Saver) in LIBS if we want idletimer_unittest LIBS = [ @@ -99,7 +99,7 @@ input_files = [ 'gfx/rect_unittest.cc', ] -if env['PLATFORM'] in ('posix', 'darwin'): +if env.Bit('posix'): # Remove files that still need to be ported from the input_files list. # TODO(port): delete files from this list as they get ported. to_be_ported_files = [ @@ -112,7 +112,7 @@ if env['PLATFORM'] in ('posix', 'darwin'): for remove in to_be_ported_files: input_files.remove(remove) -if env['PLATFORM'] == 'darwin': +if env.Bit('mac'): # Remove files that still need to be ported from the input_files list. # TODO(port): delete files from this list as they get ported. to_be_ported_files = [ @@ -123,7 +123,7 @@ if env['PLATFORM'] == 'darwin': input_files.remove(remove) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): # Windows-specific tests. input_files.extend([ 'directory_watcher_unittest.cc', @@ -136,7 +136,7 @@ if env['PLATFORM'] == 'win32': 'wmi_util_unittest.cc', ]) -if env['PLATFORM'] == 'darwin': +if env.Bit('mac'): # Mac-specific tests. input_files.extend([ 'mac_util_unittest.cc', |