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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/tools/test_shell/SConscript

Issue 2983: gtk test shell (Closed)
Patch Set: rebase Created 12 years, 2 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/test_navigation_controller.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 93fb7620ea3aee9a4894cb18763690d5f3840c3e..7c7dc6cf6b4f8e8eb440fe4749296c5e4f1221a5 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -7,16 +7,17 @@ Import('env', 'env_res')
env = env.Clone()
env_res = env_res.Clone()
-env_res.Append(
- CPPPATH = [
- '.',
- '#/..',
- '$NET_DIR',
- ],
- RCFLAGS = [
- ['/l', '0x409'],
- ],
-)
+if env['PLATFORM'] == 'win32':
+ env_res.Append(
+ CPPPATH = [
+ '.',
+ '#/..',
+ '$NET_DIR',
+ ],
+ RCFLAGS = [
+ ['/l', '0x409'],
+ ],
+ )
env.Append(
CPPPATH = [
@@ -28,8 +29,6 @@ env.Append(
'test_shell',
'base',
'base_gfx',
- 'breakpad_handler',
- 'breakpad_sender',
'googleurl',
'net',
'sdch',
@@ -46,126 +45,148 @@ env.Append(
'v8',
'JavaScriptCore_pcre',
'port',
- 'activex_shim',
'WTF',
'V8Bindings',
- 'WebCore',
'default_plugin',
'glue',
],
)
-env.Append(
- 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(
+ LIBS = [
+ 'activex_shim',
+ 'breakpad_handler',
+ 'breakpad_sender',
+ 'WebCore',
+ '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':
+ # TODO(port): move more files to shared list.
+ input_files.append([
+ 'drag_delegate.cc',
+ 'drop_delegate.cc',
+ 'event_sending_controller.cc',
+ 'layout_test_controller.cc',
+ 'simple_resource_loader_bridge.cc',
+ 'test_shell.cc',
+ 'test_shell_request_context.cc',
+ 'test_webview_delegate.cc',
+ 'text_input_controller.cc',
+ 'webview_host.cc',
+ 'webwidget_host.cc',
+ ])
+elif env['PLATFORM'] == 'posix':
+ input_files.append([
+ 'test_shell_gtk.cc',
+ 'webwidget_host_gtk.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',
-]
+# TODO(port): figure out what we're doing with resources.
+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 = [
- 'test_shell_main.cc',
- '$V8_DIR/snapshot-empty$OBJSUFFIX'
-]
+ exe_input_files = [
+ 'test_shell_main.cc',
+ '$V8_DIR/snapshot-empty$OBJSUFFIX'
+ ]
+elif env['PLATFORM'] == 'posix':
+ exe_input_files = [
+ 'test_shell_main_gtk.cc',
+ ]
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')
-
-
-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',
-]
-
-test_shell_tests = env.ChromeTestProgram('test_shell_tests',
- resources + test_files)
-i = env.Install('$TARGET_ROOT', test_shell_tests)
-env.Alias('webkit', i)
+if env['PLATFORM'] == 'win32':
+ env.Depends(test_shell, '$V8_DIR/vc80.pdb')
+
+
+if env['PLATFORM'] == 'win32':
+ # TODO(port): move files to a shared list.
+ 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',
+ ]
+
+ test_shell_tests = env.ChromeTestProgram('test_shell_tests',
+ resources + test_files)
+ i = env.Install('$TARGET_ROOT', test_shell_tests)
+ env.Alias('webkit', i)
« no previous file with comments | « webkit/SConscript ('k') | webkit/tools/test_shell/test_navigation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698