diff options
Diffstat (limited to 'chrome/test')
21 files changed, 631 insertions, 672 deletions
diff --git a/chrome/test/activex_test_control/SConscript b/chrome/test/activex_test_control/SConscript deleted file mode 100644 index a5426f5..0000000 --- a/chrome/test/activex_test_control/SConscript +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -Import('env') - -env = env.Clone() - - -env.Prepend( - CPPPATH = [ - '.', - '$CHROME_SRC_DIR', - ], - LINKFLAGS = [ - '/INCREMENTAL', - - '/MANIFEST', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/DEBUG', - ], - LIBS = [ - 'comsuppw.lib', - ], -) - -env.TypeLibrary('activex_test_control.idl') - -input_files = [ - 'activex_test_control.cc', - 'activex_test_control.def', - 'chrome_test_control.cc', -] - -dll = env.ChromeSharedLibrary('activex_test_control', input_files) - -i = env.Install('$TARGET_ROOT', dll) -env.Alias('chrome', i) - diff --git a/chrome/test/activex_test_control/activex_test_control.scons b/chrome/test/activex_test_control/activex_test_control.scons new file mode 100644 index 0000000..39beb08 --- /dev/null +++ b/chrome/test/activex_test_control/activex_test_control.scons @@ -0,0 +1,47 @@ +# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +Import('env') + +env = env.Clone() + +env.Prepend( + CPPPATH = [ + '.', + '$CHROME_SRC_DIR', + ], +) + +if env['PLATFORM'] == 'win32': + env.Prepend( + LINKFLAGS = [ + '/INCREMENTAL', + + '/MANIFEST', + '/DELAYLOAD:"dwmapi.dll"', + '/DELAYLOAD:"uxtheme.dll"', + '/MACHINE:X86', + '/FIXED:No', + + '/safeseh', + '/dynamicbase', + '/ignore:4199', + '/nxcompat', + + '/DEBUG', + ], + LIBS = [ + 'comsuppw.lib', + ], + ) + +env.TypeLibrary('activex_test_control.idl') + +input_files = [ + 'activex_test_control.cc', + 'activex_test_control.def', + 'chrome_test_control.cc', +] + +env.ChromeSharedLibrary('activex_test_control', input_files) diff --git a/chrome/test/automation/SConscript b/chrome/test/automation/automation.scons index 11cead9..198f8d0 100644 --- a/chrome/test/automation/SConscript +++ b/chrome/test/automation/automation.scons @@ -6,13 +6,12 @@ Import('env') env = env.Clone() +env.ApplySConscript([ + '$SKIA_DIR/using_skia.scons', +]) + env.Prepend( CPPPATH = [ - #'../../..', - #'$GTEST_DIR/include', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', '$CHROME_SRC_DIR', ], ) diff --git a/chrome/test/chrome_plugin/SConscript b/chrome/test/chrome_plugin/test_chrome_plugin.scons index 8e6ed50..e2934cd 100644 --- a/chrome/test/chrome_plugin/SConscript +++ b/chrome/test/chrome_plugin/test_chrome_plugin.scons @@ -6,23 +6,18 @@ Import('env') env = env.Clone() +env.ApplySConscript([ + '$BASE_DIR/using_base.scons', + '$CHROME_SRC_DIR/build/using_googleurl.scons', + '$ICU38_DIR/using_icu38.scons', +]) env.Prepend( CPPPATH = [ '$CHROME_SRC_DIR', ], - LIBS = [ - 'googleurl', - env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'base', - ], ) -input_files = [ - 'test_chrome_plugin.cc', -] - - if env['PLATFORM'] == 'win32': env.Prepend( LINKFLAGS = [ @@ -46,12 +41,13 @@ if env['PLATFORM'] == 'win32': ], ) +input_files = [ + 'test_chrome_plugin.cc', +] + +if env['PLATFORM'] == 'win32': input_files.extend([ 'test_chrome_plugin.def', ]) -dll = env.ChromeSharedLibrary('test_chrome_plugin', input_files) - -i = env.Install('$TARGET_ROOT', dll) -env.Alias('chrome', i) - +env.ChromeSharedLibrary('test_chrome_plugin', input_files) diff --git a/chrome/test/memory_test/memory_test.scons b/chrome/test/memory_test/memory_test.scons new file mode 100644 index 0000000..f3b350d --- /dev/null +++ b/chrome/test/memory_test/memory_test.scons @@ -0,0 +1,66 @@ +# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +Import('env') + +env = env.Clone() + +env.ApplySConscript([ + '$BASE_DIR/using_base.scons', + '$BASE_DIR/gfx/using_base_gfx.scons', + '$CHROME_SRC_DIR/build/using_googleurl.scons', + '$GTEST_DIR/../using_gtest.scons', + '$ICU38_DIR/using_icu38.scons', + '$LIBPNG_DIR/using_libpng.scons', + '$MODP_B64_DIR/using_modp_b64.scons', + '$NET_DIR/using_net.scons', + '$SKIA_DIR/using_skia.scons', + '$ZLIB_DIR/using_zlib.scons', +]) + +env.Prepend( + CPPDEFINES = [ + 'UI_TEST', + 'UNIT_TEST', + ], + CPPPATH = [ + '$CHROME_SRC_DIR', + ], + LIBS = [ + 'automation', + 'browser', + 'browser_views', + 'common', + ], +) + +if env['PLATFORM'] == 'win32': + env.Prepend( + LINKFLAGS = [ + '/INCREMENTAL', + '/DEBUG', + + '/DELAYLOAD:"dwmapi.dll"', + '/DELAYLOAD:"uxtheme.dll"', + + '/MACHINE:X86', + '/FIXED:No', + + '/safeseh', + '/dynamicbase', + '/ignore:4199', + '/nxcompat', + ], + ) + +input_files = [ + '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX', + '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', + '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', + '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', + '$CHROME_DIR/test/test_file_util$OBJSUFFIX', + 'memory_test.cc', +] + +env.ChromeTestProgram('memory_test', input_files) diff --git a/chrome/test/mini_installer_test/SConscript b/chrome/test/mini_installer_test/SConscript deleted file mode 100644 index 8664b97..0000000 --- a/chrome/test/mini_installer_test/SConscript +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -Import('env_test') - - -env_test = env_test.Clone() - - -env_test.Prepend( - CPPDEFINES = [ - 'UNIT_TEST', - ], - CPPPATH = [ - '$GTEST_DIR/include', - '$GTEST_DIR', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'util', - 'gtest', - env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'base', - ], -) - -env_test.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'comsupp.lib', - 'oleacc.lib', - 'rpcrt4.lib', - 'shlwapi.lib', - ], -) - -input_files = [ - '$CHROME_DIR/installer/setup/setup_constants$OBJSUFFIX', - '$CHROME_DIR/installer/util/run_all_unittests$OBJSUFFIX', - 'chrome_mini_installer.cc', - 'mini_installer_test_constants.cc', - 'test.cc', -] - -exe = env_test.ChromeTestProgram('mini_installer_test', input_files) -i = env_test.Install('$TARGET_ROOT', exe) - -env_test.Alias('chrome', i) - diff --git a/chrome/test/mini_installer_test/mini_installer_test.scons b/chrome/test/mini_installer_test/mini_installer_test.scons new file mode 100644 index 0000000..32da07b --- /dev/null +++ b/chrome/test/mini_installer_test/mini_installer_test.scons @@ -0,0 +1,68 @@ +# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +Import('env') + + +env = env.Clone() + +env.ApplySConscript([ + '$BASE_DIR/using_base.scons', + '$GTEST_DIR/../using_gtest.scons', + '$ICU38_DIR/using_icu38.scons', + + '$BASE_DIR/gfx/using_base_gfx.scons', + '$CHROME_DIR/third_party/wtl/using_wtl.scons', + '$CHROME_SRC_DIR/build/using_googleurl.scons', + '$LIBPNG_DIR/using_libpng.scons', + '$LIBXML_DIR/using_libxml.scons', + '$MODP_B64_DIR/using_modp_b64.scons', + '$NET_DIR/using_net.scons', + '$SKIA_DIR/using_skia.scons', + '$ZLIB_DIR/using_zlib.scons', +]) + +env.Prepend( + CPPPATH = [ + '$CHROME_SRC_DIR', + ], + LIBS = [ + 'util', + ], +) + +if env['PLATFORM'] == 'win32': + env.Prepend( + LINKFLAGS = [ + '/INCREMENTAL', + '/DEBUG', + + '/DELAYLOAD:"dwmapi.dll"', + '/DELAYLOAD:"uxtheme.dll"', + + '/MACHINE:X86', + '/FIXED:No', + + '/safeseh', + '/dynamicbase', + '/ignore:4199', + '/nxcompat', + ], + LIBS = [ + 'comsupp', + 'oleacc', + 'rpcrt4', + 'shlwapi', + ], + ) + +input_files = [ + '$CHROME_DIR/installer/setup/setup_constants$OBJSUFFIX', + '$CHROME_DIR/installer/util/run_all_unittests$OBJSUFFIX', + 'chrome_mini_installer.cc', + 'mini_installer_test_constants.cc', + 'test.cc', +] + +env.ChromeTestProgram('mini_installer_test', input_files) diff --git a/chrome/test/page_cycler/SConscript b/chrome/test/page_cycler/SConscript deleted file mode 100644 index 82530dc..0000000 --- a/chrome/test/page_cycler/SConscript +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -Import('env_test') - -env_test = env_test.Clone() - - -env_test.Prepend( - CPPDEFINES = [ - 'UI_TEST', - 'UNIT_TEST', - ], - CPPPATH = [ - '$GTEST_DIR/include', - '$GTEST_DIR', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'googleurl', - 'skia', - 'libpng', - 'gtest', - 'base_gfx', - env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'common', - 'zlib', - 'modp_b64', - 'browser', - 'browser_views', - 'net', - 'base', - 'automation', - ], -) - -env_test.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'comsupp.lib', - 'oleacc.lib', - 'psapi.lib', - 'rpcrt4.lib', - 'winmm.lib', - ], -) - - -input_files = [ - '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - '$CHROME_DIR/test/test_file_util$OBJSUFFIX', - 'page_cycler_test.cc', -] - -exe = env_test.ChromeTestProgram('page_cycler_tests', input_files) -i = env_test.Install('$TARGET_ROOT', exe) - -env_test.Alias('chrome', i) - diff --git a/chrome/test/page_cycler/page_cycler_tests.scons b/chrome/test/page_cycler/page_cycler_tests.scons new file mode 100644 index 0000000..78f26ae --- /dev/null +++ b/chrome/test/page_cycler/page_cycler_tests.scons @@ -0,0 +1,72 @@ +# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +Import('env') + +env = env.Clone() + +env.ApplySConscript([ + '$BASE_DIR/using_base.scons', + '$BASE_DIR/gfx/using_base_gfx.scons', + '$CHROME_SRC_DIR/build/using_googleurl.scons', + '$GTEST_DIR/../using_gtest.scons', + '$ICU38_DIR/using_icu38.scons', + '$LIBPNG_DIR/using_libpng.scons', + '$MODP_B64_DIR/using_modp_b64.scons', + '$NET_DIR/using_net.scons', + '$SKIA_DIR/using_skia.scons', + '$ZLIB_DIR/using_zlib.scons', +]) + +env.Prepend( + CPPDEFINES = [ + 'UI_TEST', + ], + CPPPATH = [ + '$CHROME_SRC_DIR', + ], + LIBS = [ + 'automation', + 'browser', + 'browser_views', + 'common', + ], +) + +if env['PLATFORM'] == 'win32': + env.Prepend( + LINKFLAGS = [ + '/INCREMENTAL', + '/DEBUG', + + '/DELAYLOAD:"dwmapi.dll"', + '/DELAYLOAD:"uxtheme.dll"', + + '/MACHINE:X86', + '/FIXED:No', + + '/safeseh', + '/dynamicbase', + '/ignore:4199', + '/nxcompat', + ], + LIBS = [ + 'comsupp', + 'oleacc', + 'psapi', + 'rpcrt4', + 'winmm', + ], + ) + +input_files = [ + '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX', + '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', + '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', + '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', + '$CHROME_DIR/test/test_file_util$OBJSUFFIX', + 'page_cycler_test.cc', +] + +env.ChromeTestProgram('page_cycler_tests', input_files) diff --git a/chrome/test/plugin/SConscript b/chrome/test/plugin/SConscript deleted file mode 100644 index 1fdc1d3..0000000 --- a/chrome/test/plugin/SConscript +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -Import('env_test') - -env_test = env_test.Clone() - - -env_test.Prepend( - CPPDEFINES = [ - 'UI_TEST', - 'UNIT_TEST', - 'LIBXSLT_STATIC', - 'LIBXML_STATIC', - ], - CPPPATH = [ - '$GTEST_DIR/include', - '$GTEST_DIR', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', - '$CHROME_SRC_DIR', - '$LIBXSLT_DIR', - '$LIBXML_DIR/includ', - ], - LIBS = [ - 'googleurl', - 'security_tests', - 'skia', - 'libpng', - 'gtest', - 'base_gfx', - env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'common', - 'zlib', - 'modp_b64', - 'browser', - 'browser_views', - 'net', - 'base', - 'automation', - ], -) - -env_test.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"ws2_32.dll"', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'comsupp.lib', - 'oleacc.lib', - 'rpcrt4.lib', - 'winmm.lib', - ], -) - -input_files = [ - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - '$CHROME_DIR/test/test_file_util$OBJSUFFIX', - 'plugin_test.cpp', -] - - -exe = env_test.ChromeTestProgram('plugin_tests', input_files) -i = env_test.Install('$TARGET_ROOT', exe) - -env_test.Alias('chrome', i) - diff --git a/chrome/test/plugin/plugin_tests.scons b/chrome/test/plugin/plugin_tests.scons new file mode 100644 index 0000000..677f72d --- /dev/null +++ b/chrome/test/plugin/plugin_tests.scons @@ -0,0 +1,75 @@ +# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +Import('env') + +env = env.Clone() + +env.ApplySConscript([ + '$BASE_DIR/using_base.scons', + '$BASE_DIR/gfx/using_base_gfx.scons', + '$CHROME_SRC_DIR/build/using_googleurl.scons', + '$GTEST_DIR/../using_gtest.scons', + '$ICU38_DIR/using_icu38.scons', + '$LIBPNG_DIR/using_libpng.scons', + '$LIBXML_DIR/using_libxml.scons', + '$LIBXSLT_DIR/using_libxslt.scons', + '$MODP_B64_DIR/using_modp_b64.scons', + '$NET_DIR/using_net.scons', + '$SKIA_DIR/using_skia.scons', + '$ZLIB_DIR/using_zlib.scons', +]) + +env.Prepend( + CPPDEFINES = [ + 'UI_TEST', + ], + CPPPATH = [ + '$CHROME_SRC_DIR', + ], + LIBS = [ + 'automation', + 'browser', + 'browser_views', + 'common', + 'security_tests', + ], +) + +if env['PLATFORM'] == 'win32': + env.Prepend( + LINKFLAGS = [ + '/INCREMENTAL', + '/DEBUG', + + '/DELAYLOAD:"ws2_32.dll"', + '/DELAYLOAD:"dwmapi.dll"', + '/DELAYLOAD:"uxtheme.dll"', + + '/MACHINE:X86', + '/FIXED:No', + + '/safeseh', + '/dynamicbase', + '/ignore:4199', + '/nxcompat', + ], + LIBS = [ + 'comsupp', + 'oleacc', + 'rpcrt4', + 'winmm', + ], + ) + +input_files = [ + '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', + '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', + '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', + '$CHROME_DIR/test/test_file_util$OBJSUFFIX', + 'plugin_test.cpp', +] + + +env.ChromeTestProgram('plugin_tests', input_files) diff --git a/chrome/test/reliability/SConscript b/chrome/test/reliability/SConscript deleted file mode 100644 index 3504e61..0000000 --- a/chrome/test/reliability/SConscript +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -Import('env_test') - -env_test = env_test.Clone() - - -env_test.Prepend( - CPPDEFINES = [ - 'RELIABILITY_TEST', # seems to be unused - 'UI_TEST', - 'UNIT_TEST', - ], - CPPPATH = [ - '$GTEST_DIR/include', - '$GTEST_DIR', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'automation', - 'base', - 'base_gfx', - 'browser', - 'browser_views', - 'common', - 'googleurl', - 'gtest', - env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'libpng', - 'modp_b64', - 'net', - 'skia', - 'zlib', - - 'comsupp', - 'oleacc', - 'psapi', - 'rpcrt4', - 'winmm', - ], - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], -) - -input_files = [ - '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - '$CHROME_DIR/test/test_file_util$OBJSUFFIX', - 'page_load_test.cc', - 'run_all_unittests.cc', -] - -exe = env_test.ChromeTestProgram('reliability_tests', input_files) -i = env_test.Install('$TARGET_ROOT', exe) - -env_test.Alias('chrome', i) - diff --git a/chrome/test/reliability/reliability_tests.scons b/chrome/test/reliability/reliability_tests.scons new file mode 100644 index 0000000..27ff310 --- /dev/null +++ b/chrome/test/reliability/reliability_tests.scons @@ -0,0 +1,74 @@ +# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +Import('env') + +env = env.Clone() + +env.ApplySConscript([ + '$BASE_DIR/using_base.scons', + '$BASE_DIR/gfx/using_base_gfx.scons', + '$CHROME_SRC_DIR/build/using_googleurl.scons', + '$GTEST_DIR/../using_gtest.scons', + '$ICU38_DIR/using_icu38.scons', + '$LIBPNG_DIR/using_libpng.scons', + '$LIBXML_DIR/using_libxml.scons', + '$MODP_B64_DIR/using_modp_b64.scons', + '$NET_DIR/using_net.scons', + '$SKIA_DIR/using_skia.scons', + '$ZLIB_DIR/using_zlib.scons', +]) + +env.Prepend( + CPPDEFINES = [ + 'RELIABILITY_TEST', # seems to be unused + 'UI_TEST', + ], + CPPPATH = [ + '$CHROME_SRC_DIR', + ], + LIBS = [ + 'automation', + 'browser', + 'browser_views', + 'common', + ], +) + +if env['PLATFORM'] == 'win32': + env.Prepend( + LINKFLAGS = [ + '/INCREMENTAL', + '/DEBUG', + + '/DELAYLOAD:"dwmapi.dll"', + '/DELAYLOAD:"uxtheme.dll"', + + '/MACHINE:X86', + '/FIXED:No', + + '/safeseh', + '/dynamicbase', + '/ignore:4199', + '/nxcompat', + ], + LIBS = [ + 'comsupp', + 'oleacc', + 'psapi', + 'rpcrt4', + 'winmm', + ], + ) + +input_files = [ + '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX', + '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', + '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', + '$CHROME_DIR/test/test_file_util$OBJSUFFIX', + 'page_load_test.cc', + 'run_all_unittests.cc', +] + +env.ChromeTestProgram('reliability_tests', input_files) diff --git a/chrome/test/security_tests/SConscript b/chrome/test/security_tests/SConscript deleted file mode 100644 index 7e6ef65..0000000 --- a/chrome/test/security_tests/SConscript +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -Import('env') - -env = env.Clone() - - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], -) - -env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - - '/MANIFEST', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/DEBUG', - ], - LIBS = [ - 'DelayImp.lib', - ], -) - -input_files = [ - 'ipc_security_tests.cc', - 'security_tests.cc', - '$SANDBOX_DIR/tests/validation_tests/commands${OBJSUFFIX}', -] - -dll = env.ChromeSharedLibrary('security_tests', input_files) -i = env.Install('$TARGET_ROOT', dll) -env.Alias('chrome', i) diff --git a/chrome/test/security_tests/security_tests.scons b/chrome/test/security_tests/security_tests.scons new file mode 100644 index 0000000..a3a9c3a --- /dev/null +++ b/chrome/test/security_tests/security_tests.scons @@ -0,0 +1,44 @@ +# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +Import('env') + +env = env.Clone() + +env.Prepend( + CPPPATH = [ + '$CHROME_SRC_DIR', + ], +) + +if env['PLATFORM'] == 'win32': + env.Prepend( + LINKFLAGS = [ + '/INCREMENTAL', + + '/MANIFEST', + '/DELAYLOAD:"dwmapi.dll"', + '/DELAYLOAD:"uxtheme.dll"', + '/MACHINE:X86', + '/FIXED:No', + + '/safeseh', + '/dynamicbase', + '/ignore:4199', + '/nxcompat', + + '/DEBUG', + ], + LIBS = [ + 'DelayImp.lib', + ], + ) + +input_files = [ + 'ipc_security_tests.cc', + 'security_tests.cc', + '$SANDBOX_DIR/tests/validation_tests/commands${OBJSUFFIX}', +] + +env.ChromeSharedLibrary('security_tests', input_files) diff --git a/chrome/test/selenium/SConscript b/chrome/test/selenium/SConscript deleted file mode 100644 index 6153dc8..0000000 --- a/chrome/test/selenium/SConscript +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -Import('env_test') - -env_test = env_test.Clone() - -env_test.Prepend( - CPPDEFINES = [ - 'UI_TEST', - 'UNIT_TEST', - ], - CPPPATH = [ - '$GTEST_DIR/include', - '$GTEST_DIR', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'googleurl', - 'skia', - 'libpng', - 'gtest', - 'base_gfx', - env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'common', - 'zlib', - 'modp_b64', - 'browser', - 'browser_views', - 'net', - 'base', - 'automation', - ], -) - -env_test.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'winmm.lib', - 'rpcrt4.lib', - 'oleacc.lib', - 'comsupp.lib', - ], -) - -input_files = [ - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - '$CHROME_DIR/test/test_file_util$OBJSUFFIX', - 'selenium_test.cc', -] - -exe = env_test.ChromeTestProgram('selenium_tests', input_files) -i = env_test.Install('$TARGET_ROOT', exe) - -env_test.Alias('chrome', i) - diff --git a/chrome/test/memory_test/SConscript b/chrome/test/selenium/selenium_tests.scons index 454a1b3..23259ee 100644 --- a/chrome/test/memory_test/SConscript +++ b/chrome/test/selenium/selenium_tests.scons @@ -2,12 +2,24 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -Import('env_test') +Import('env') -env_test = env_test.Clone() +env = env.Clone() +env.ApplySConscript([ + '$BASE_DIR/using_base.scons', + '$BASE_DIR/gfx/using_base_gfx.scons', + '$CHROME_SRC_DIR/build/using_googleurl.scons', + '$GTEST_DIR/../using_gtest.scons', + '$ICU38_DIR/using_icu38.scons', + '$LIBPNG_DIR/using_libpng.scons', + '$MODP_B64_DIR/using_modp_b64.scons', + '$NET_DIR/using_net.scons', + '$SKIA_DIR/using_skia.scons', + '$ZLIB_DIR/using_zlib.scons', +]) -env_test.Prepend( +env.Prepend( CPPDEFINES = [ 'UI_TEST', 'UNIT_TEST', @@ -22,24 +34,14 @@ env_test.Prepend( ], LIBS = [ 'automation', - 'base', - 'base_gfx', 'browser', 'browser_views', 'common', - 'googleurl', - 'gtest', - env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'libpng', - 'modp_b64', - 'net', - 'skia', - 'zlib', ], ) -if env_test['PLATFORM'] == 'win32': - env_test.Prepend( +if env['PLATFORM'] == 'win32': + env.Prepend( LINKFLAGS = [ '/INCREMENTAL', '/DEBUG', @@ -55,19 +57,20 @@ if env_test['PLATFORM'] == 'win32': '/ignore:4199', '/nxcompat', ], + LIBS = [ + 'winmm', + 'rpcrt4', + 'oleacc', + 'comsupp', + ], ) input_files = [ - '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX', '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', '$CHROME_DIR/test/test_file_util$OBJSUFFIX', - 'memory_test.cc', + 'selenium_test.cc', ] -exe = env_test.ChromeTestProgram('memory_test', input_files) -i = env_test.Install('$TARGET_ROOT', exe) - -env_test.Alias('chrome', i) - +env.ChromeTestProgram('selenium_tests', input_files) diff --git a/chrome/test/startup/SConscript b/chrome/test/startup/SConscript deleted file mode 100644 index ab57d9c..0000000 --- a/chrome/test/startup/SConscript +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -Import('env_test') - -env_test = env_test.Clone() - -env_test.Prepend( - CPPDEFINES = [ - 'UI_TEST', - 'UNIT_TEST', - ], - CPPPATH = [ - '$GTEST_DIR/include', - '$GTEST_DIR', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'googleurl', - 'skia', - 'libpng', - 'gtest', - 'base_gfx', - env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'common', - 'zlib', - 'browser', - 'browser_views', - 'base', - 'automation', - 'modp_b64', - 'net', - ], -) - -env_test.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'winmm.lib', - 'rpcrt4.lib', - 'oleacc.lib', - 'comsupp.lib', - ], -) - -input_files = [ - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - '$CHROME_DIR/test/test_file_util$OBJSUFFIX', - 'feature_startup_test.cc', - 'startup_test.cc', -] - -exe = env_test.ChromeTestProgram('startup_tests', input_files) -i = env_test.Install('$TARGET_ROOT', exe) - -env_test.Alias('chrome', i) - diff --git a/chrome/test/startup/startup_tests.scons b/chrome/test/startup/startup_tests.scons new file mode 100644 index 0000000..88be476 --- /dev/null +++ b/chrome/test/startup/startup_tests.scons @@ -0,0 +1,71 @@ +# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +Import('env') + +env = env.Clone() + +env.ApplySConscript([ + '$BASE_DIR/using_base.scons', + '$BASE_DIR/gfx/using_base_gfx.scons', + '$CHROME_SRC_DIR/build/using_googleurl.scons', + '$GTEST_DIR/../using_gtest.scons', + '$ICU38_DIR/using_icu38.scons', + '$LIBPNG_DIR/using_libpng.scons', + '$MODP_B64_DIR/using_modp_b64.scons', + '$NET_DIR/using_net.scons', + '$SKIA_DIR/using_skia.scons', + '$ZLIB_DIR/using_zlib.scons', +]) + +env.Prepend( + CPPDEFINES = [ + 'UI_TEST', + ], + CPPPATH = [ + '$CHROME_SRC_DIR', + ], + LIBS = [ + 'automation', + 'browser', + 'browser_views', + 'common', + ], +) + +if env['PLATFORM'] == 'win32': + env.Prepend( + LINKFLAGS = [ + '/INCREMENTAL', + '/DEBUG', + + '/DELAYLOAD:"dwmapi.dll"', + '/DELAYLOAD:"uxtheme.dll"', + + '/MACHINE:X86', + '/FIXED:No', + + '/safeseh', + '/dynamicbase', + '/ignore:4199', + '/nxcompat', + ], + LIBS = [ + 'comsupp', + 'oleacc', + 'rpcrt4', + 'winmm', + ], + ) + +input_files = [ + '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', + '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', + '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', + '$CHROME_DIR/test/test_file_util$OBJSUFFIX', + 'feature_startup_test.cc', + 'startup_test.cc', +] + +env.ChromeTestProgram('startup_tests', input_files) diff --git a/chrome/test/tab_switching/SConscript b/chrome/test/tab_switching/SConscript deleted file mode 100644 index 7fd9974d..0000000 --- a/chrome/test/tab_switching/SConscript +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -Import('env_test') - -env_test = env_test.Clone() - -env_test.Prepend( - CPPDEFINES = [ - 'UI_TEST', - 'UNIT_TEST', - ], - CPPPATH = [ - '$GTEST_DIR/include', - '$GTEST_DIR', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'googleurl', - 'skia', - 'libpng', - 'gtest', - 'base_gfx', - env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'common', - 'zlib', - 'modp_b64', - 'browser', - 'browser_views', - 'net', - 'base', - 'automation', - ], -) - -env_test.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'winmm.lib', - 'psapi.lib', - 'rpcrt4.lib', - 'oleacc.lib', - 'comsupp.lib', - ], -) - -input_files = [ - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - '$CHROME_DIR/test/test_file_util$OBJSUFFIX', - 'tab_switching_test.cc', -] - -#"..\..\Debug\obj\tab_switching_test\precompiled_wtl.obj" - -exe = env_test.ChromeTestProgram('tab_switching_test', input_files) -i = env_test.Install('$TARGET_ROOT', exe) - -env_test.Alias('chrome', i) - diff --git a/chrome/test/tab_switching/tab_switching_test.scons b/chrome/test/tab_switching/tab_switching_test.scons new file mode 100644 index 0000000..0856f50 --- /dev/null +++ b/chrome/test/tab_switching/tab_switching_test.scons @@ -0,0 +1,74 @@ +# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +Import('env') + +env = env.Clone() + +env.ApplySConscript([ + '$BASE_DIR/using_base.scons', + '$BASE_DIR/gfx/using_base_gfx.scons', + '$CHROME_SRC_DIR/build/using_googleurl.scons', + '$GTEST_DIR/../using_gtest.scons', + '$ICU38_DIR/using_icu38.scons', + '$LIBPNG_DIR/using_libpng.scons', + '$MODP_B64_DIR/using_modp_b64.scons', + '$NET_DIR/using_net.scons', + '$SKIA_DIR/using_skia.scons', + '$ZLIB_DIR/using_zlib.scons', +]) + +env.Prepend( + CPPDEFINES = [ + 'UI_TEST', + ], + CPPPATH = [ + '$CHROME_SRC_DIR', + ], + LIBS = [ + 'automation', + 'browser', + 'browser_views', + 'common', + ], +) + +if env['PLATFORM'] == 'win32': + env.Prepend( + LINKFLAGS = [ + '/INCREMENTAL', + '/DEBUG', + + '/DELAYLOAD:"dwmapi.dll"', + '/DELAYLOAD:"uxtheme.dll"', + + '/MACHINE:X86', + '/FIXED:No', + + '/safeseh', + '/dynamicbase', + '/ignore:4199', + '/nxcompat', + ], + LIBS = [ + 'comsupp', + 'oleacc', + 'psapi', + 'rpcrt4', + 'winmm', + ], + ) + +input_files = [ + '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', + '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', + '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', + '$CHROME_DIR/test/test_file_util$OBJSUFFIX', + 'tab_switching_test.cc', +] + +#"..\..\Debug\obj\tab_switching_test\precompiled_wtl.obj" + +env.ChromeTestProgram('tab_switching_test', input_files) + |