diff options
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/activex_test_control/activex_test_control.scons | 12 | ||||
| -rw-r--r-- | chrome/test/automated_ui_tests/automated_ui_tests.scons | 26 | ||||
| -rw-r--r-- | chrome/test/automation/automation.scons | 7 | ||||
| -rw-r--r-- | chrome/test/chrome_plugin/test_chrome_plugin.scons | 9 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/interactive_ui_tests.scons | 53 | ||||
| -rw-r--r-- | chrome/test/memory_test/memory_test.scons | 22 | ||||
| -rw-r--r-- | chrome/test/mini_installer_test/mini_installer_test.scons | 13 | ||||
| -rw-r--r-- | chrome/test/page_cycler/page_cycler_tests.scons | 24 | ||||
| -rw-r--r-- | chrome/test/perf/perftests.scons | 39 | ||||
| -rw-r--r-- | chrome/test/plugin/plugin_tests.scons | 28 | ||||
| -rw-r--r-- | chrome/test/reliability/reliability_tests.scons | 24 | ||||
| -rw-r--r-- | chrome/test/security_tests/security_tests.scons | 7 | ||||
| -rw-r--r-- | chrome/test/selenium/selenium_tests.scons | 24 | ||||
| -rw-r--r-- | chrome/test/startup/startup_tests.scons | 24 | ||||
| -rw-r--r-- | chrome/test/tab_switching/tab_switching_test.scons | 25 | ||||
| -rw-r--r-- | chrome/test/ui/ui_tests.scons | 35 | ||||
| -rw-r--r-- | chrome/test/unit/unit_tests.scons | 46 |
17 files changed, 403 insertions, 15 deletions
diff --git a/chrome/test/activex_test_control/activex_test_control.scons b/chrome/test/activex_test_control/activex_test_control.scons index a971b48..bfbbbcf 100644 --- a/chrome/test/activex_test_control/activex_test_control.scons +++ b/chrome/test/activex_test_control/activex_test_control.scons @@ -36,7 +36,9 @@ if env.Bit('windows'): ], ) -env.TypeLibrary('activex_test_control.idl') +# TODO(port): +if env.Bit('windows'): + env.TypeLibrary('activex_test_control.idl') input_files = [ 'activex_test_control.cc', @@ -44,4 +46,10 @@ input_files = [ 'chrome_test_control.cc', ] -env.ChromeSharedLibrary('activex_test_control', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeSharedLibrary('activex_test_control', input_files) + +env.ChromeMSVSProject(('$CHROME_DIR/test/activex_test_control/' + + 'activex_test_control.vcproj'), + guid='{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}') diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.scons b/chrome/test/automated_ui_tests/automated_ui_tests.scons index a483ab9..269d02a 100644 --- a/chrome/test/automated_ui_tests/automated_ui_tests.scons +++ b/chrome/test/automated_ui_tests/automated_ui_tests.scons @@ -72,4 +72,28 @@ input_files = [ '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', ] -env.ChromeTestProgram('automated_ui_tests', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('automated_ui_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/automated_ui_tests/automated_ui_tests.vcproj', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$LIBXML_DIR/build/libxml_config.vcproj', + '$NET_DIR/build/net.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$SKIA_DIR/skia.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$LIBXML_DIR/build/libxml.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{D2250C20-3A94-4FB9-AF73-11BC5B73884B}') diff --git a/chrome/test/automation/automation.scons b/chrome/test/automation/automation.scons index c1ef519..f894f72 100644 --- a/chrome/test/automation/automation.scons +++ b/chrome/test/automation/automation.scons @@ -27,4 +27,9 @@ input_files = [ 'window_proxy.cc', ] -env.ChromeStaticLibrary('automation', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeStaticLibrary('automation', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/automation/automation.vcproj', + guid='{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}') diff --git a/chrome/test/chrome_plugin/test_chrome_plugin.scons b/chrome/test/chrome_plugin/test_chrome_plugin.scons index e7d3661..ca6ad83 100644 --- a/chrome/test/chrome_plugin/test_chrome_plugin.scons +++ b/chrome/test/chrome_plugin/test_chrome_plugin.scons @@ -51,3 +51,12 @@ if env.Bit('windows'): ]) env.ChromeSharedLibrary('test_chrome_plugin', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/chrome_plugin/test_chrome_plugin.vcproj', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$ICU38_DIR/build/icudt.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + ], + guid='{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}') diff --git a/chrome/test/interactive_ui/interactive_ui_tests.scons b/chrome/test/interactive_ui/interactive_ui_tests.scons index fe92cf0..769405d 100644 --- a/chrome/test/interactive_ui/interactive_ui_tests.scons +++ b/chrome/test/interactive_ui/interactive_ui_tests.scons @@ -104,4 +104,55 @@ input_files = [ 'view_event_test_base.cc', ] -env.ChromeTestProgram('interactive_ui_tests', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('interactive_ui_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/interactive_ui/interactive_ui.vcproj', + name='interactive_ui_tests', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', + '$CHROME_DIR/plugin/plugin.vcproj', + '$LIBJPEG_DIR/libjpeg.vcproj', + '$BZIP2_DIR/bzip2.vcproj', + '$NET_DIR/build/net.vcproj', + ('$WEBKIT_DIR/build/JavaScriptCore/' + + 'JavaScriptCore_pcre.vcproj'), + '$WEBKIT_DIR/build/port/port.vcproj', + '$CHROME_DIR/browser/debugger/debugger.vcproj', + '$WEBKIT_DIR/default_plugin/default_plugin.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', + '$SQLITE_DIR/sqlite.vcproj', + '$CHROME_DIR/views/views.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + ('$CHROME_DIR/test/chrome_plugin/' + + 'test_chrome_plugin.vcproj'), + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$CHROME_DIR/renderer/renderer.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', + ('$CHROME_DIR/browser/resources/' + + 'browser_resources.vcproj'), + '$RLZ_DIR/rlz.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$WEBKIT_DIR/build/glue/glue.vcproj', + '$CHROME_DIR/app/locales/en-US.vcproj', + '$SKIA_DIR/skia.vcproj', + '$CHROME_DIR/third_party/hunspell/hunspell.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/installer/util/util.vcproj', + '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', + '$SDCH_DIR/sdch.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + '$LIBXSLT_DIR/build/libxslt.vcproj', + '$CHROME_DIR/app/theme/theme_dll.vcproj', + ], + guid='{018D4F38-6272-448F-A864-976DA09F05D0}') diff --git a/chrome/test/memory_test/memory_test.scons b/chrome/test/memory_test/memory_test.scons index 84871c9..a7b094c 100644 --- a/chrome/test/memory_test/memory_test.scons +++ b/chrome/test/memory_test/memory_test.scons @@ -62,4 +62,24 @@ input_files = [ 'memory_test.cc', ] -env.ChromeTestProgram('memory_test', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('memory_test', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/memory_test/memory_test.vcproj', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$NET_DIR/build/net.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$SKIA_DIR/skia.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}') diff --git a/chrome/test/mini_installer_test/mini_installer_test.scons b/chrome/test/mini_installer_test/mini_installer_test.scons index 7014079..c54cbdd 100644 --- a/chrome/test/mini_installer_test/mini_installer_test.scons +++ b/chrome/test/mini_installer_test/mini_installer_test.scons @@ -65,4 +65,15 @@ input_files = [ 'test.cc', ] -env.ChromeTestProgram('mini_installer_test', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('mini_installer_test', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/mini_installer_test/mini_installer_test.vcproj', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$CHROME_DIR/installer/util/util.vcproj', + ], + guid='{4B6E199A-034A-49BD-AB93-458DD37E45B1}') diff --git a/chrome/test/page_cycler/page_cycler_tests.scons b/chrome/test/page_cycler/page_cycler_tests.scons index 46e35fc..f04bba7 100644 --- a/chrome/test/page_cycler/page_cycler_tests.scons +++ b/chrome/test/page_cycler/page_cycler_tests.scons @@ -68,4 +68,26 @@ input_files = [ 'page_cycler_test.cc', ] -env.ChromeTestProgram('page_cycler_tests', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('page_cycler_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/page_cycler/page_cycler_tests.vcproj', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$NET_DIR/build/net.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$SKIA_DIR/skia.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}') diff --git a/chrome/test/perf/perftests.scons b/chrome/test/perf/perftests.scons index 97e57d3..2767199 100644 --- a/chrome/test/perf/perftests.scons +++ b/chrome/test/perf/perftests.scons @@ -76,3 +76,42 @@ if env.Bit('mac'): if not env.Bit('mac'): env.ChromeTestProgram('perf_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/perf/perftests.vcproj', + name='perf_tests', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', + '$CHROME_DIR/plugin/plugin.vcproj', + '$LIBJPEG_DIR/libjpeg.vcproj', + '$BZIP2_DIR/bzip2.vcproj', + '$NET_DIR/build/net.vcproj', + '$WEBKIT_DIR/build/JavaScriptCore/JavaScriptCore_pcre.vcproj', + '$WEBKIT_DIR/build/port/port.vcproj', + '$CHROME_DIR/browser/debugger/debugger.vcproj', + '$WEBKIT_DIR/default_plugin/default_plugin.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', + '$SQLITE_DIR/sqlite.vcproj', + '$CHROME_DIR/views/views.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$CHROME_DIR/renderer/renderer.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$WEBKIT_DIR/build/glue/glue.vcproj', + '$SKIA_DIR/skia.vcproj', + '$CHROME_DIR/third_party/hunspell/hunspell.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/installer/util/util.vcproj', + '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', + '$SDCH_DIR/sdch.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + '$LIBXSLT_DIR/build/libxslt.vcproj', + ], + guid='{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}') diff --git a/chrome/test/plugin/plugin_tests.scons b/chrome/test/plugin/plugin_tests.scons index fb0508b..d748a64 100644 --- a/chrome/test/plugin/plugin_tests.scons +++ b/chrome/test/plugin/plugin_tests.scons @@ -71,4 +71,30 @@ input_files = [ ] -env.ChromeTestProgram('plugin_tests', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('plugin_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/plugin/plugin_tests.vcproj', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$NET_DIR/build/net.vcproj', + ('$CHROME_DIR/test/activex_test_control/' + + 'activex_test_control.vcproj'), + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$SKIA_DIR/skia.vcproj', + ('$CHROME_DIR/test/security_tests/' + + 'security_tests.vcproj'), + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}') diff --git a/chrome/test/reliability/reliability_tests.scons b/chrome/test/reliability/reliability_tests.scons index 8f6ad5f..1c65f04 100644 --- a/chrome/test/reliability/reliability_tests.scons +++ b/chrome/test/reliability/reliability_tests.scons @@ -70,4 +70,26 @@ input_files = [ 'run_all_unittests.cc', ] -env.ChromeTestProgram('reliability_tests', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('reliability_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/reliability/reliability_tests.vcproj', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$NET_DIR/build/net.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$SKIA_DIR/skia.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{8A3E1774-1DE9-445C-982D-3EE37C8A752A}') diff --git a/chrome/test/security_tests/security_tests.scons b/chrome/test/security_tests/security_tests.scons index 2fdf83f..1797f07 100644 --- a/chrome/test/security_tests/security_tests.scons +++ b/chrome/test/security_tests/security_tests.scons @@ -41,4 +41,9 @@ input_files = [ '$SANDBOX_DIR/tests/validation_tests/commands${OBJSUFFIX}', ] -env.ChromeSharedLibrary('security_tests', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeSharedLibrary('security_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/security_tests/security_tests.vcproj', + guid='{E750512D-FC7C-4C98-BF04-0A0DAF882055}') diff --git a/chrome/test/selenium/selenium_tests.scons b/chrome/test/selenium/selenium_tests.scons index 8d98dd1..7e29c94 100644 --- a/chrome/test/selenium/selenium_tests.scons +++ b/chrome/test/selenium/selenium_tests.scons @@ -72,4 +72,26 @@ input_files = [ 'selenium_test.cc', ] -env.ChromeTestProgram('selenium_tests', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('selenium_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/selenium/selenium_tests.vcproj', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$NET_DIR/build/net.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$SKIA_DIR/skia.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{E3749617-BA3D-4230-B54C-B758E56D9FA5}') diff --git a/chrome/test/startup/startup_tests.scons b/chrome/test/startup/startup_tests.scons index 5ff685e..8f1faa0 100644 --- a/chrome/test/startup/startup_tests.scons +++ b/chrome/test/startup/startup_tests.scons @@ -67,4 +67,26 @@ input_files = [ 'startup_test.cc', ] -env.ChromeTestProgram('startup_tests', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('startup_tests', input_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/startup/startup_tests.vcproj', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$NET_DIR/build/net.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$SKIA_DIR/skia.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}') diff --git a/chrome/test/tab_switching/tab_switching_test.scons b/chrome/test/tab_switching/tab_switching_test.scons index f4e63e9..da0b296 100644 --- a/chrome/test/tab_switching/tab_switching_test.scons +++ b/chrome/test/tab_switching/tab_switching_test.scons @@ -69,5 +69,28 @@ input_files = [ #"..\..\Debug\obj\tab_switching_test\precompiled_wtl.obj" -env.ChromeTestProgram('tab_switching_test', input_files) +# TODO(port): +if env.Bit('windows'): + env.ChromeTestProgram('tab_switching_test', input_files) +env.ChromeMSVSProject('$CHROME_DIR/test/tab_switching/tab_switching.vcproj', + name='tab_switching_test', + dependencies = [ + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$NET_DIR/build/net.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/test/ui/ui_tests.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$SKIA_DIR/skia.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{A34770EA-A574-43E8-9327-F79C04770E98}') diff --git a/chrome/test/ui/ui_tests.scons b/chrome/test/ui/ui_tests.scons index 53113482..0654579 100644 --- a/chrome/test/ui/ui_tests.scons +++ b/chrome/test/ui/ui_tests.scons @@ -129,4 +129,37 @@ if env.Bit('windows'): '$CHROME_DIR/browser/views/find_bar_win_uitest.cc', ]) -env.ChromeTestProgram('ui_tests', ui_test_files) + env.ChromeTestProgram('ui_tests', ui_test_files) + +env.ChromeMSVSProject('$CHROME_DIR/test/ui/ui_tests.vcproj', + dependencies = [ + ('$WEBKIT_DIR/glue/plugins/test/' + + 'npapi_test_plugin.vcproj'), + '$CHROME_DIR/test/automation/automation.vcproj', + '$BASE_DIR/build/base.vcproj', + '$BZIP2_DIR/bzip2.vcproj', + '$NET_DIR/build/net.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/app/chrome_exe.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$CHROME_DIR/app/locales/he.vcproj', + '$CHROME_DIR/app/locales/da.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + ('$WEBKIT_DIR/tools/npapi_layout_test_plugin/' + + 'npapi_layout_test_plugin.vcproj'), + '$TESTING_DIR/gtest.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$CHROME_DIR/app/locales/en-US.vcproj', + '$SKIA_DIR/skia.vcproj', + ('$CHROME_DIR/test/security_tests/' + + 'security_tests.vcproj'), + '$CHROME_DIR/app/locales/zh-TW.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$SDCH_DIR/sdch.vcproj', + '$LIBXML_DIR/build/libxml.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + ], + guid='{76235B67-1C27-4627-8A33-4B2E1EF93EDE}') diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons index 3c25fb7..f198e5c 100644 --- a/chrome/test/unit/unit_tests.scons +++ b/chrome/test/unit/unit_tests.scons @@ -251,3 +251,49 @@ if not env.Bit('mac'): i = env.Install('$TARGET_ROOT', unit_tests) Alias('chrome', i) + +env.ChromeMSVSProject('$CHROME_DIR/test/unit/unittests.vcproj', + name='unit_tests', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', + '$CHROME_DIR/plugin/plugin.vcproj', + '$LIBJPEG_DIR/libjpeg.vcproj', + '$BZIP2_DIR/bzip2.vcproj', + '$NET_DIR/build/net.vcproj', + ('$WEBKIT_DIR/build/JavaScriptCore/' + + 'JavaScriptCore_pcre.vcproj'), + '$WEBKIT_DIR/build/port/port.vcproj', + '$CHROME_DIR/browser/debugger/debugger.vcproj', + '$WEBKIT_DIR/default_plugin/default_plugin.vcproj', + '$CHROME_DIR/browser/browser.vcproj', + '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', + '$SQLITE_DIR/sqlite.vcproj', + '$CHROME_DIR/views/views.vcproj', + '$MODP_B64_DIR/modp_b64.vcproj', + '$CHROME_DIR/test/chrome_plugin/test_chrome_plugin.vcproj', + '$ZLIB_DIR/zlib.vcproj', + '$CHROME_DIR/common/common.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$CHROME_DIR/renderer/renderer.vcproj', + '$BASE_DIR/build/base_gfx.vcproj', + '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', + '$CHROME_DIR/browser/resources/browser_resources.vcproj', + '$RLZ_DIR/rlz.vcproj', + '$TESTING_DIR/gtest.vcproj', + '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj', + '$LIBPNG_DIR/libpng.vcproj', + '$WEBKIT_DIR/build/glue/glue.vcproj', + '$CHROME_DIR/app/locales/en-US.vcproj', + '$SKIA_DIR/skia.vcproj', + '$CHROME_DIR/third_party/hunspell/hunspell.vcproj', + '$CHROME_DIR/app/generated_resources.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + '$CHROME_DIR/installer/util/util.vcproj', + '$WEBKIT_DIR/activex_shim/activex_shim.vcproj', + '$SDCH_DIR/sdch.vcproj', + '$CHROME_DIR/browser/views/browser_views.vcproj', + '$LIBXSLT_DIR/build/libxslt.vcproj', + '$CHROME_DIR/app/theme/theme_dll.vcproj', + ], + guid='{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}') |