diff options
author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-19 00:16:08 +0000 |
---|---|---|
committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-19 00:16:08 +0000 |
commit | 1325bfb2fad2c13cd4d2d08f446d62c53b438b59 (patch) | |
tree | 4c9e62b6ff54e1cfec02b535c397ff94a52142bc /webkit | |
parent | 7cccfc3463da83f55b7cf316e88954c56cec3b16 (diff) | |
download | chromium_src-1325bfb2fad2c13cd4d2d08f446d62c53b438b59.zip chromium_src-1325bfb2fad2c13cd4d2d08f446d62c53b438b59.tar.gz chromium_src-1325bfb2fad2c13cd4d2d08f446d62c53b438b59.tar.bz2 |
Fix whitespace back to before I screwed it up.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2397 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/tools/test_shell/SConscript | 258 |
1 files changed, 129 insertions, 129 deletions
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript index d419a77..301ef58 100644 --- a/webkit/tools/test_shell/SConscript +++ b/webkit/tools/test_shell/SConscript @@ -8,94 +8,94 @@ env = env.Clone() env_res = env_res.Clone() env_res.Append( - CPPPATH = [ - '.', - '#/..', - '$NET_DIR', - ], - RCFLAGS = [ - ['/l', '0x409'], - ], + CPPPATH = [ + '.', + '#/..', + '$NET_DIR', + ], + RCFLAGS = [ + ['/l', '0x409'], + ], ) env.Append( - CPPPATH = [ - '$BREAKPAD_DIR/src', - '$WEBKIT_DIR/glue', - '$GTEST_DIR/include', - ], - LIBS = [ - 'test_shell', - 'base', - 'base_gfx', - 'breakpad_handler', - 'breakpad_sender', - 'googleurl', - 'net', - 'skia', - 'gtest', - 'bzip2', - 'icuuc', - 'libjpeg', - 'libpng', - 'libxml', - 'libxslt', - 'modp_b64', - 'zlib', - 'v8', - 'JavaScriptCore_pcre', - 'Port', - 'activex_shim', - 'WTF', - 'V8Bindings', - 'WebCore', - 'default_plugin', - 'Glue', - ], + CPPPATH = [ + '$BREAKPAD_DIR/src', + '$WEBKIT_DIR/glue', + '$GTEST_DIR/include', + ], + LIBS = [ + 'test_shell', + 'base', + 'base_gfx', + 'breakpad_handler', + 'breakpad_sender', + 'googleurl', + 'net', + 'skia', + 'gtest', + 'bzip2', + 'icuuc', + 'libjpeg', + 'libpng', + 'libxml', + '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', - ], + 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', + ], ) 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', + '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', ] lib = env.ChromeStaticLibrary('test_shell', input_files) @@ -103,15 +103,15 @@ 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', + 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' + 'test_shell_main.cc', + '$V8_DIR/snapshot-empty$OBJSUFFIX' ] test_shell = env.ChromeProgram('test_shell', resources + exe_input_files) @@ -127,51 +127,51 @@ 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', + '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', |