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 /net/net_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 'net/net_unittests.scons')
| -rw-r--r-- | net/net_unittests.scons | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/net_unittests.scons b/net/net_unittests.scons index 713505c..f3457be 100644 --- a/net/net_unittests.scons +++ b/net/net_unittests.scons @@ -22,12 +22,12 @@ env.ApplySConscript([ '$ZLIB_DIR/using_zlib.scons', ]) -if env['PLATFORM'] in ('posix', 'darwin'): +if env.Bit('posix'): env.SConscript([ '$LIBEVENT_DIR/using_libevent.scons', ], {'env':env}) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( CCFLAGS = [ '/WX', @@ -85,14 +85,14 @@ input_files = [ 'url_request/url_request_unittest.cc', ] -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): input_files.extend([ 'base/wininet_util_unittest.cc', 'http/http_transaction_winhttp_unittest.cc', 'http/winhttp_request_throttle_unittest.cc', ]) -if env['PLATFORM'] == 'posix': +if env.Bit('linux'): # TODO(port): to_be_ported_files = [ 'base/x509_certificate_unittest.cc', @@ -101,7 +101,7 @@ if env['PLATFORM'] == 'posix': ] input_files = list(set(input_files) - set(to_be_ported_files)) -if env['PLATFORM'] == 'darwin': +if env.Bit('mac'): input_files.extend([ '../base/platform_test_mac$OBJSUFFIX', ]) |