Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6073)

Unified Diff: chrome/test/unit/unit_tests.scons

Issue 15051: Convert from using env['PLATFORM'] directly to using the more flexible... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/ui/ui_tests.scons ('k') | chrome/third_party/hunspell/SConscript » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/unit/unit_tests.scons
===================================================================
--- chrome/test/unit/unit_tests.scons (revision 7247)
+++ chrome/test/unit/unit_tests.scons (working copy)
@@ -26,12 +26,12 @@
'$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 @@
],
)
-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 @@
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 @@
'$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 @@
'$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)
« no previous file with comments | « chrome/test/ui/ui_tests.scons ('k') | chrome/third_party/hunspell/SConscript » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698