summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-03 21:21:54 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-03 21:21:54 +0000
commitb56791c36d461ea0902ede1f0d2fd3044e9ed595 (patch)
tree85b761aa2449b985051d376f8074f43633947f5e /chrome/test
parentf7df58905b11fa7df6fa01d2523e2136d6d774d0 (diff)
downloadchromium_src-b56791c36d461ea0902ede1f0d2fd3044e9ed595.zip
chromium_src-b56791c36d461ea0902ede1f0d2fd3044e9ed595.tar.gz
chromium_src-b56791c36d461ea0902ede1f0d2fd3044e9ed595.tar.bz2
Convert chrome SConscript files to psuedo-builder calls.
TBR: evanm,bradnelson git-svn-id: svn://svn.chromium.org/chrome/trunk/src@306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/activex_test_control/SConscript2
-rw-r--r--chrome/test/automation/SConscript2
-rw-r--r--chrome/test/chrome_plugin/SConscript2
-rw-r--r--chrome/test/interactive_ui/SConscript2
-rw-r--r--chrome/test/mini_installer_test/SConscript2
-rw-r--r--chrome/test/page_cycler/SConscript2
-rw-r--r--chrome/test/plugin/SConscript2
-rw-r--r--chrome/test/reliability/SConscript2
-rw-r--r--chrome/test/security_tests/SConscript2
-rw-r--r--chrome/test/selenium/SConscript2
-rw-r--r--chrome/test/startup/SConscript2
-rw-r--r--chrome/test/tab_switching/SConscript2
12 files changed, 12 insertions, 12 deletions
diff --git a/chrome/test/activex_test_control/SConscript b/chrome/test/activex_test_control/SConscript
index 6f459c1..46e12b3 100644
--- a/chrome/test/activex_test_control/SConscript
+++ b/chrome/test/activex_test_control/SConscript
@@ -86,7 +86,7 @@ input_files = [
'chrome_test_control.cc',
]
-dll = env.SharedLibrary(['activex_test_control', 'activex_test_control.lib'],
+dll = env.ChromeSharedLibrary(['activex_test_control', 'activex_test_control.lib'],
input_files)
i = env.Install('$TARGET_ROOT', dll)
diff --git a/chrome/test/automation/SConscript b/chrome/test/automation/SConscript
index 79286f2..fb402ff 100644
--- a/chrome/test/automation/SConscript
+++ b/chrome/test/automation/SConscript
@@ -52,7 +52,7 @@ input_files = [
'window_proxy.cc',
]
-lib = env.StaticLibrary('automation', input_files)
+lib = env.ChromeStaticLibrary('automation', input_files)
i = env.Install('$TARGET_ROOT', lib)
env.Alias('chrome', i)
diff --git a/chrome/test/chrome_plugin/SConscript b/chrome/test/chrome_plugin/SConscript
index 134c868..d95bf07 100644
--- a/chrome/test/chrome_plugin/SConscript
+++ b/chrome/test/chrome_plugin/SConscript
@@ -89,7 +89,7 @@ libs = [
'$BASE_DIR/base.lib',
]
-dll = env.SharedLibrary('test_chrome_plugin', input_files + libs)
+dll = env.ChromeSharedLibrary('test_chrome_plugin', input_files + libs)
i = env.Install('$TARGET_ROOT', dll)
env.Alias('chrome', i)
diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript
index 54d7fc3..efb7cb18 100644
--- a/chrome/test/interactive_ui/SConscript
+++ b/chrome/test/interactive_ui/SConscript
@@ -122,7 +122,7 @@ libs = [
]
-exe = env_test.Program(['interactive_ui_tests',
+exe = env_test.ChromeTestProgram(['interactive_ui_tests',
'interactive_ui_tests.pdb'],
input_files + libs)
i = env_test.Install('$TARGET_ROOT', exe)
diff --git a/chrome/test/mini_installer_test/SConscript b/chrome/test/mini_installer_test/SConscript
index 8413c3f..3b06470 100644
--- a/chrome/test/mini_installer_test/SConscript
+++ b/chrome/test/mini_installer_test/SConscript
@@ -101,7 +101,7 @@ libs = [
'$BASE_DIR/base.lib',
]
-exe = env_test.Program(['mini_installer_test',
+exe = env_test.ChromeTestProgram(['mini_installer_test',
'mini_installer_test.pdb'],
input_files + libs)
i = env_test.Install('$TARGET_ROOT', exe)
diff --git a/chrome/test/page_cycler/SConscript b/chrome/test/page_cycler/SConscript
index 59b1a8a..1f22faa 100644
--- a/chrome/test/page_cycler/SConscript
+++ b/chrome/test/page_cycler/SConscript
@@ -117,7 +117,7 @@ libs = [
]
-exe = env_test.Program(['page_cycler_tests',
+exe = env_test.ChromeTestProgram(['page_cycler_tests',
'page_cycler_tests.pdb'],
input_files + libs)
i = env_test.Install('$TARGET_ROOT', exe)
diff --git a/chrome/test/plugin/SConscript b/chrome/test/plugin/SConscript
index 43a192b..b0c7d15 100644
--- a/chrome/test/plugin/SConscript
+++ b/chrome/test/plugin/SConscript
@@ -120,7 +120,7 @@ libs = [
]
-exe = env_test.Program(['plugin_tests',
+exe = env_test.ChromeTestProgram(['plugin_tests',
'plugin_tests.pdb'],
input_files + libs)
i = env_test.Install('$TARGET_ROOT', exe)
diff --git a/chrome/test/reliability/SConscript b/chrome/test/reliability/SConscript
index 22dde0e..cca1b6b 100644
--- a/chrome/test/reliability/SConscript
+++ b/chrome/test/reliability/SConscript
@@ -115,7 +115,7 @@ libs = [
]
-exe = env_test.Program(['reliability_tests',
+exe = env_test.ChromeTestProgram(['reliability_tests',
'reliability_tests.pdb'],
input_files + libs)
i = env_test.Install('$TARGET_ROOT', exe)
diff --git a/chrome/test/security_tests/SConscript b/chrome/test/security_tests/SConscript
index d903295..653858c 100644
--- a/chrome/test/security_tests/SConscript
+++ b/chrome/test/security_tests/SConscript
@@ -82,7 +82,7 @@ input_files = [
'$SANDBOX_DIR/tests/validation_tests/commands${OBJSUFFIX}',
]
-dll = env.SharedLibrary('security_tests', input_files)
+dll = env.ChromeSharedLibrary('security_tests', input_files)
i = env.Install('$TARGET_ROOT', dll)
env.Alias('chrome', i)
diff --git a/chrome/test/selenium/SConscript b/chrome/test/selenium/SConscript
index b1473c1..9d1ab25 100644
--- a/chrome/test/selenium/SConscript
+++ b/chrome/test/selenium/SConscript
@@ -112,7 +112,7 @@ libs = [
'$CHROME_DIR/test/automation/automation.lib',
]
-exe = env_test.Program(['selenium_tests',
+exe = env_test.ChromeTestProgram(['selenium_tests',
'selenium_tests.pdb'],
input_files + libs)
i = env_test.Install('$TARGET_ROOT', exe)
diff --git a/chrome/test/startup/SConscript b/chrome/test/startup/SConscript
index a0e13e0..3f8d1e1 100644
--- a/chrome/test/startup/SConscript
+++ b/chrome/test/startup/SConscript
@@ -111,7 +111,7 @@ libs = [
'$CHROME_DIR/test/automation/automation.lib',
]
-exe = env_test.Program(['startup_tests',
+exe = env_test.ChromeTestProgram(['startup_tests',
'startup_tests.pdb'],
input_files + libs)
i = env_test.Install('$TARGET_ROOT', exe)
diff --git a/chrome/test/tab_switching/SConscript b/chrome/test/tab_switching/SConscript
index cd9c310..e41ce9a 100644
--- a/chrome/test/tab_switching/SConscript
+++ b/chrome/test/tab_switching/SConscript
@@ -115,7 +115,7 @@ libs = [
#"..\..\Debug\obj\tab_switching_test\precompiled_wtl.obj"
-exe = env_test.Program(['tab_switching_test',
+exe = env_test.ChromeTestProgram(['tab_switching_test',
'tab_switching_test.pdb'],
input_files + libs)
i = env_test.Install('$TARGET_ROOT', exe)