summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/activex_test_control/activex_test_control.scons2
-rw-r--r--chrome/test/automated_ui_tests/automated_ui_tests.scons2
-rw-r--r--chrome/test/chrome_plugin/test_chrome_plugin.scons4
-rw-r--r--chrome/test/interactive_ui/interactive_ui_tests.scons2
-rw-r--r--chrome/test/memory_test/memory_test.scons2
-rw-r--r--chrome/test/mini_installer_test/mini_installer_test.scons2
-rw-r--r--chrome/test/page_cycler/page_cycler_tests.scons2
-rw-r--r--chrome/test/perf/perftests.scons18
-rw-r--r--chrome/test/plugin/plugin_tests.scons2
-rw-r--r--chrome/test/reliability/reliability_tests.scons2
-rw-r--r--chrome/test/security_tests/security_tests.scons2
-rw-r--r--chrome/test/selenium/selenium_tests.scons2
-rw-r--r--chrome/test/startup/startup_tests.scons2
-rw-r--r--chrome/test/tab_switching/tab_switching_test.scons2
-rw-r--r--chrome/test/ui/ui_tests.scons4
-rw-r--r--chrome/test/unit/unit_tests.scons14
16 files changed, 37 insertions, 27 deletions
diff --git a/chrome/test/activex_test_control/activex_test_control.scons b/chrome/test/activex_test_control/activex_test_control.scons
index 39beb08..a971b48 100644
--- a/chrome/test/activex_test_control/activex_test_control.scons
+++ b/chrome/test/activex_test_control/activex_test_control.scons
@@ -13,7 +13,7 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Prepend(
LINKFLAGS = [
'/INCREMENTAL',
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.scons b/chrome/test/automated_ui_tests/automated_ui_tests.scons
index 93d1774..a483ab9 100644
--- a/chrome/test/automated_ui_tests/automated_ui_tests.scons
+++ b/chrome/test/automated_ui_tests/automated_ui_tests.scons
@@ -33,7 +33,7 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Prepend(
CPPPATH = [
'$CHROME_DIR/tools/build/win',
diff --git a/chrome/test/chrome_plugin/test_chrome_plugin.scons b/chrome/test/chrome_plugin/test_chrome_plugin.scons
index e2934cd..e7d3661 100644
--- a/chrome/test/chrome_plugin/test_chrome_plugin.scons
+++ b/chrome/test/chrome_plugin/test_chrome_plugin.scons
@@ -18,7 +18,7 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Prepend(
LINKFLAGS = [
'/INCREMENTAL',
@@ -45,7 +45,7 @@ input_files = [
'test_chrome_plugin.cc',
]
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
input_files.extend([
'test_chrome_plugin.def',
])
diff --git a/chrome/test/interactive_ui/interactive_ui_tests.scons b/chrome/test/interactive_ui/interactive_ui_tests.scons
index eda7f26..fe92cf0 100644
--- a/chrome/test/interactive_ui/interactive_ui_tests.scons
+++ b/chrome/test/interactive_ui/interactive_ui_tests.scons
@@ -62,7 +62,7 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Prepend(
LINKFLAGS = [
'/INCREMENTAL',
diff --git a/chrome/test/memory_test/memory_test.scons b/chrome/test/memory_test/memory_test.scons
index af86998..84871c9 100644
--- a/chrome/test/memory_test/memory_test.scons
+++ b/chrome/test/memory_test/memory_test.scons
@@ -35,7 +35,7 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Prepend(
LINKFLAGS = [
'/INCREMENTAL',
diff --git a/chrome/test/mini_installer_test/mini_installer_test.scons b/chrome/test/mini_installer_test/mini_installer_test.scons
index 32da07b..7014079 100644
--- a/chrome/test/mini_installer_test/mini_installer_test.scons
+++ b/chrome/test/mini_installer_test/mini_installer_test.scons
@@ -32,7 +32,7 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Prepend(
LINKFLAGS = [
'/INCREMENTAL',
diff --git a/chrome/test/page_cycler/page_cycler_tests.scons b/chrome/test/page_cycler/page_cycler_tests.scons
index dfb8cb8..46e35fc 100644
--- a/chrome/test/page_cycler/page_cycler_tests.scons
+++ b/chrome/test/page_cycler/page_cycler_tests.scons
@@ -34,7 +34,7 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Prepend(
LINKFLAGS = [
'/INCREMENTAL',
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)
diff --git a/chrome/test/plugin/plugin_tests.scons b/chrome/test/plugin/plugin_tests.scons
index da7e348..fb0508b 100644
--- a/chrome/test/plugin/plugin_tests.scons
+++ b/chrome/test/plugin/plugin_tests.scons
@@ -37,7 +37,7 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Prepend(
LINKFLAGS = [
'/INCREMENTAL',
diff --git a/chrome/test/reliability/reliability_tests.scons b/chrome/test/reliability/reliability_tests.scons
index 4b14f6d..8f6ad5f 100644
--- a/chrome/test/reliability/reliability_tests.scons
+++ b/chrome/test/reliability/reliability_tests.scons
@@ -36,7 +36,7 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Prepend(
LINKFLAGS = [
'/INCREMENTAL',
diff --git a/chrome/test/security_tests/security_tests.scons b/chrome/test/security_tests/security_tests.scons
index a3a9c3a..2fdf83f 100644
--- a/chrome/test/security_tests/security_tests.scons
+++ b/chrome/test/security_tests/security_tests.scons
@@ -12,7 +12,7 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Prepend(
LINKFLAGS = [
'/INCREMENTAL',
diff --git a/chrome/test/selenium/selenium_tests.scons b/chrome/test/selenium/selenium_tests.scons
index b359940..8d98dd1 100644
--- a/chrome/test/selenium/selenium_tests.scons
+++ b/chrome/test/selenium/selenium_tests.scons
@@ -40,7 +40,7 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Prepend(
LINKFLAGS = [
'/INCREMENTAL',
diff --git a/chrome/test/startup/startup_tests.scons b/chrome/test/startup/startup_tests.scons
index f857656..5ff685e 100644
--- a/chrome/test/startup/startup_tests.scons
+++ b/chrome/test/startup/startup_tests.scons
@@ -34,7 +34,7 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Prepend(
LINKFLAGS = [
'/INCREMENTAL',
diff --git a/chrome/test/tab_switching/tab_switching_test.scons b/chrome/test/tab_switching/tab_switching_test.scons
index d1932db..f4e63e9 100644
--- a/chrome/test/tab_switching/tab_switching_test.scons
+++ b/chrome/test/tab_switching/tab_switching_test.scons
@@ -34,7 +34,7 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Prepend(
LINKFLAGS = [
'/INCREMENTAL',
diff --git a/chrome/test/ui/ui_tests.scons b/chrome/test/ui/ui_tests.scons
index 202ce96..53113482 100644
--- a/chrome/test/ui/ui_tests.scons
+++ b/chrome/test/ui/ui_tests.scons
@@ -45,7 +45,7 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Prepend(
CPPPATH = [
'$CHROME_DIR/tools/build/win',
@@ -123,7 +123,7 @@ ui_test_files = [
'$NET_DIR/url_request/url_request_test_job$OBJSUFFIX',
]
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
ui_test_files.extend([
'$CHROME_DIR/browser/views/find_bar_win_interactive_uitest.cc',
'$CHROME_DIR/browser/views/find_bar_win_uitest.cc',
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)
generated by cgit v1.1 at 2025-01-22 15:45:04 +0000