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/perf | |
| 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/perf')
| -rw-r--r-- | chrome/test/perf/perftests.scons | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/chrome/test/perf/perftests.scons b/chrome/test/perf/perftests.scons index c089027..97e57d3 100644 --- a/chrome/test/perf/perftests.scons +++ b/chrome/test/perf/perftests.scons @@ -30,7 +30,7 @@ env.Prepend( ], ) -if env['PLATFORM'] in ('posix', 'darwin'): +if env.Bit('posix'): env.SConscript([ '$LIBEVENT_DIR/using_libevent.scons', ], {'env':env}) @@ -45,7 +45,7 @@ input_files = [ '$CHROME_DIR/common/json_value_serializer_perftest.cc', ] -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LIBS = [ 'rpcrt4', @@ -54,7 +54,7 @@ if env['PLATFORM'] == 'win32': ] ) -if env['PLATFORM'] != 'win32': +if env.Bit('linux'): # TODO(port): Port these files. remove_files = [ 'url_parse_perftest.cc', @@ -64,5 +64,15 @@ if env['PLATFORM'] != 'win32': for file in remove_files: input_files.remove(file) -if env['PLATFORM'] in ('posix', 'win32'): +if env.Bit('mac'): + # TODO(port): Port these files. + remove_files = [ + 'url_parse_perftest.cc', + '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX', + '$CHROME_DIR/browser/visitedlink_perftest.cc', + ] + for file in remove_files: + input_files.remove(file) + +if not env.Bit('mac'): env.ChromeTestProgram('perf_tests', input_files) |