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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/tools/test_shell/SConscript

Issue 1606: hodgepodge for test_shell.cc (Closed)
Patch Set: update some comments Created 12 years, 3 months 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 | « webkit/SConscript ('k') | webkit/tools/test_shell/run_all_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/SConscript
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index d419a774b41188624ffc1ee59d5537e65a46087d..65cb1a338cd15e67525e023bd983addb89edb739 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -29,7 +29,6 @@ env.Append(
'base',
'base_gfx',
'breakpad_handler',
- 'breakpad_sender',
'googleurl',
'net',
'skia',
@@ -42,71 +41,82 @@ env.Append(
'libxslt',
'modp_b64',
'zlib',
- 'v8',
'JavaScriptCore_pcre',
- 'Port',
- 'activex_shim',
'WTF',
'V8Bindings',
- 'WebCore',
'default_plugin',
- 'Glue',
],
)
-env.Append(
- CCFLAGS = [
- '/TP',
- '/WX',
- '/Wp64',
- ],
-
- LIBS = [
- 'comctl32.lib',
- 'rpcrt4.lib',
- 'shlwapi.lib',
- 'winmm.lib',
- ],
-
- LINKFLAGS = [
- '/DELAYLOAD:"ws2_32.dll"',
- '/DELAYLOAD:"dwmapi.dll"',
- '/DELAYLOAD:"uxtheme.dll"',
- '/FIXED:No',
- '/SUBSYSTEM:CONSOLE',
- '/MACHINE:X86',
- '/safeseh',
- '/dynamicbase',
- '/ignore:4199',
- '/nxcompat',
- ],
-)
+if env['PLATFORM'] == 'win32':
+ env.Append(
+ CCFLAGS = [
+ '/TP',
+ '/WX',
+ '/Wp64',
+ ],
+
+ LIBS = [
+ 'breakpad_sender', # TODO(port): move back to shared library list.
+ 'v8', # TODO(port): move back to shared library list.
+ 'Port', # TODO(port): move back to shared library list.
+ 'activex_shim', # TODO(port): move back to shared library list.
+ 'WebCore', # TODO(port): move back to shared library list.
+ 'Glue', # TODO(port): move back to shared library list.
+ 'comctl32.lib',
+ 'rpcrt4.lib',
+ 'shlwapi.lib',
+ 'winmm.lib',
+ ],
+
+ LINKFLAGS = [
+ '/DELAYLOAD:"ws2_32.dll"',
+ '/DELAYLOAD:"dwmapi.dll"',
+ '/DELAYLOAD:"uxtheme.dll"',
+ '/FIXED:No',
+ '/SUBSYSTEM:CONSOLE',
+ '/MACHINE:X86',
+ '/safeseh',
+ '/dynamicbase',
+ '/ignore:4199',
+ '/nxcompat',
+ ],
+ )
input_files = [
- 'drag_delegate.cc',
- 'drop_delegate.cc',
- 'event_sending_controller.cc',
- 'layout_test_controller.cc',
- 'simple_resource_loader_bridge.cc',
'test_navigation_controller.cc',
- 'test_shell.cc',
- 'test_shell_switches.cc',
- 'test_shell_request_context.cc',
- 'test_webview_delegate.cc',
- 'text_input_controller.cc',
- 'webview_host.cc',
- 'webwidget_host.cc',
]
+if env['PLATFORM'] == 'win32':
+ # Some of these aren't really Windows-specific, they're just here until
+ # we have the port versions working.
+ input_files = [
+ 'drag_delegate.cc',
+ 'drop_delegate.cc',
+ 'event_sending_controller.cc',
+ 'layout_test_controller.cc',
+ 'simple_resource_loader_bridge.cc',
+ 'test_shell.cc',
+ 'test_shell_switches.cc',
+ 'test_shell_request_context.cc',
+ 'test_webview_delegate.cc',
+ 'text_input_controller.cc',
+ 'webview_host.cc',
+ 'webwidget_host.cc',
+ ]
lib = env.ChromeStaticLibrary('test_shell', input_files)
-resources = [
- env_res.RES('resources/test_shell.rc'),
- '$NET_DIR/net_resources.res',
- '$WEBKIT_DIR/build/localized_strings/webkit_strings_en-US.res',
-]
+# Resources are temporarily disabled on non-win32 until we figure out
+# what to do.
+resources = []
+if env['PLATFORM'] == 'win32':
+ resources = [
+ env_res.RES('resources/test_shell.rc'),
+ '$NET_DIR/net_resources.res',
+ '$WEBKIT_DIR/build/localized_strings/webkit_strings_en-US.res',
+ ]
exe_input_files = [
@@ -114,66 +124,72 @@ exe_input_files = [
'$V8_DIR/snapshot-empty$OBJSUFFIX'
]
-test_shell = env.ChromeProgram('test_shell', resources + exe_input_files)
-i = env.Install('$TARGET_ROOT', test_shell)
-env.Alias('webkit', i)
-
-# This call can NOT use $WEBKIT_DIR because we need to copy
-# directly from the source location.
-i = env.Install('$TARGET_ROOT', '#/../webkit/tools/test_shell/resources/fonts')
-env.Alias('webkit', i)
+if env['PLATFORM'] == 'win32':
+ test_shell = env.ChromeProgram('test_shell', resources + exe_input_files)
+ i = env.Install('$TARGET_ROOT', test_shell)
+ env.Alias('webkit', i)
-env.Depends(test_shell, '$V8_DIR/vc80.pdb')
+ # This call can NOT use $WEBKIT_DIR because we need to copy
+ # directly from the source location.
+ i = env.Install('$TARGET_ROOT', '#/../webkit/tools/test_shell/resources/fonts')
+ env.Alias('webkit', i)
+ env.Depends(test_shell, '$V8_DIR/vc80.pdb')
test_files = [
- 'drag_delegate.cc',
- 'drop_delegate.cc',
- 'event_sending_controller.cc',
- 'image_decoder_unittest.cc',
- 'keyboard_unittest.cc',
- 'layout_test_controller.cc',
- 'layout_test_controller_unittest.cc',
- 'node_leak_test.cc',
- 'plugin_tests.cc',
- 'run_all_tests.cc',
- 'simple_resource_loader_bridge.cc',
- 'test_navigation_controller.cc',
'test_shell.cc',
- 'test_shell_request_context.cc',
- 'test_shell_switches.cc',
- 'test_shell_test.cc',
- 'test_webview_delegate.cc',
- 'text_input_controller.cc',
- 'text_input_controller_unittest.cc',
- 'webview_host.cc',
- 'webwidget_host.cc',
- '$WEBKIT_DIR/glue/autocomplete_input_listener_unittest.cc',
- '$WEBKIT_DIR/glue/bookmarklet_unittest.cc',
- '$WEBKIT_DIR/glue/context_menu_unittest.cc',
- '$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc',
- '$WEBKIT_DIR/glue/cpp_variant_unittest.cc',
- '$WEBKIT_DIR/glue/dom_operations_unittest.cc',
- '$WEBKIT_DIR/glue/dom_serializer_unittest.cc',
- '$WEBKIT_DIR/glue/glue_serialize_unittest.cc',
- '$WEBKIT_DIR/glue/iframe_redirect_unittest.cc',
- '$WEBKIT_DIR/glue/mimetype_unittest.cc',
- '$WEBKIT_DIR/glue/multipart_response_delegate_unittest.cc',
- '$WEBKIT_DIR/glue/password_autocomplete_listener_unittest.cc',
- '$WEBKIT_DIR/glue/regular_expression_unittest.cc',
- '$WEBKIT_DIR/glue/resource_fetcher_unittest.cc',
- # Commented out until a regression is fixed and this file is restored.
- #'$WEBKIT_DIR/glue/stringimpl_unittest.cc',
- '$WEBKIT_DIR/glue/webframe_unittest.cc',
- '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc',
- '$WEBKIT_DIR/port/platform/GKURL_unittest.cpp',
- '$WEBKIT_DIR/port/platform/image-decoders/bmp/BMPImageDecoder_unittest.cpp',
- '$WEBKIT_DIR/port/platform/image-decoders/ico/ICOImageDecoder_unittest.cpp',
- '$WEBKIT_DIR/port/platform/image-decoders/xbm/XBMImageDecoder_unittest.cpp',
-
- '$V8_DIR/snapshot-empty$OBJSUFFIX',
+ 'run_all_tests.cc',
]
+if env['PLATFORM'] == 'win32':
+ # Some of these aren't really Windows-specific, they're just here until
+ # we have the port versions working.
+ test_files.append([
+ 'drag_delegate.cc',
+ 'drop_delegate.cc',
+ 'event_sending_controller.cc',
+ 'image_decoder_unittest.cc',
+ 'keyboard_unittest.cc',
+ 'layout_test_controller.cc',
+ 'layout_test_controller_unittest.cc',
+ 'node_leak_test.cc',
+ 'plugin_tests.cc',
+ 'simple_resource_loader_bridge.cc',
+ 'test_navigation_controller.cc',
+ 'test_shell_request_context.cc',
+ 'test_shell_switches.cc',
+ 'test_shell_test.cc',
+ 'test_webview_delegate.cc',
+ 'text_input_controller.cc',
+ 'text_input_controller_unittest.cc',
+ 'webview_host.cc',
+ 'webwidget_host.cc',
+ '$WEBKIT_DIR/glue/autocomplete_input_listener_unittest.cc',
+ '$WEBKIT_DIR/glue/bookmarklet_unittest.cc',
+ '$WEBKIT_DIR/glue/context_menu_unittest.cc',
+ '$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc',
+ '$WEBKIT_DIR/glue/cpp_variant_unittest.cc',
+ '$WEBKIT_DIR/glue/dom_operations_unittest.cc',
+ '$WEBKIT_DIR/glue/dom_serializer_unittest.cc',
+ '$WEBKIT_DIR/glue/glue_serialize_unittest.cc',
+ '$WEBKIT_DIR/glue/iframe_redirect_unittest.cc',
+ '$WEBKIT_DIR/glue/mimetype_unittest.cc',
+ '$WEBKIT_DIR/glue/multipart_response_delegate_unittest.cc',
+ '$WEBKIT_DIR/glue/password_autocomplete_listener_unittest.cc',
+ '$WEBKIT_DIR/glue/regular_expression_unittest.cc',
+ '$WEBKIT_DIR/glue/resource_fetcher_unittest.cc',
+ # Commented out until a regression is fixed and this file is restored.
+ #'$WEBKIT_DIR/glue/stringimpl_unittest.cc',
+ '$WEBKIT_DIR/glue/webframe_unittest.cc',
+ '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc',
+ '$WEBKIT_DIR/port/platform/GKURL_unittest.cpp',
+ '$WEBKIT_DIR/port/platform/image-decoders/bmp/BMPImageDecoder_unittest.cpp',
+ '$WEBKIT_DIR/port/platform/image-decoders/ico/ICOImageDecoder_unittest.cpp',
+ '$WEBKIT_DIR/port/platform/image-decoders/xbm/XBMImageDecoder_unittest.cpp',
+
+ '$V8_DIR/snapshot-empty$OBJSUFFIX',
+ ])
+
test_shell_tests = env.ChromeTestProgram('test_shell_tests',
resources + test_files)
i = env.Install('$TARGET_ROOT', test_shell_tests)
« no previous file with comments | « webkit/SConscript ('k') | webkit/tools/test_shell/run_all_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698