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 /chrome/test/unit/unit_tests.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 'chrome/test/unit/unit_tests.scons')
| -rw-r--r-- | chrome/test/unit/unit_tests.scons | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons index 3848d30..3c25fb7 100644 --- a/chrome/test/unit/unit_tests.scons +++ b/chrome/test/unit/unit_tests.scons @@ -26,12 +26,12 @@ env.SConscript([ '$ZLIB_DIR/using_zlib.scons', ], {'env':env}) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.SConscript([ '$SDCH_DIR/using_sdch.scons', ], {'env':env}) -if env['PLATFORM'] in ('posix', 'darwin'): +if env.Bit('posix'): env.SConscript([ '$LIBEVENT_DIR/using_libevent.scons', ], {'env':env}) @@ -60,14 +60,14 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( CPPPATH = [ '$CHROME_DIR/tools/build/win', ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): # TODO(port): Port or mark as Windows-specific. env.Prepend( LIBS = [ @@ -109,7 +109,7 @@ if env['PLATFORM'] == 'win32': unit_test_files = [] -if env['PLATFORM'] in ('posix', 'win32'): +if not env.Bit('mac'): # TODO(port): Port to Mac. unit_test_files.extend([ 'run_all_unittests.cc', @@ -143,7 +143,7 @@ if env['PLATFORM'] in ('posix', 'win32'): '$CHROME_DIR/renderer/greasemonkey_slave_unittest.cc', ]) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): # TODO(port): Port these. unit_test_files.extend([ '$CHROME_DIR/browser/autocomplete/autocomplete_unittest.cc', @@ -244,7 +244,7 @@ if env['PLATFORM'] == 'win32': '$CHROME_DIR/test/data/resource.res', ]) -if env['PLATFORM'] in ('posix', 'win32'): +if not env.Bit('mac'): # TODO(port): This should work on all platforms. unit_tests = env.ChromeTestProgram('unit_tests', unit_test_files) |