Port a few test_shell_tests. Now it runs 45 of them.

I removed some files from test_files because scons complains (warns)
when a file is both in test_files and input_files. So the files removed from
test_files also exist in input_files and at some pointed will be ported anyway.

I also made some linking stubs.

BUG=3674

Review URL: http://codereview.chromium.org/7974
Patch from Paweł Hajdan jr <phajdan.jr@gmail.com>.


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4031 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 13 deletions

diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index 105da41..23ba6020 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -93,7 +93,9 @@ elif env['PLATFORM'] in ('posix', 'darwin'):
   )
 
 input_files = [
+    'simple_resource_loader_bridge.cc',
     'test_navigation_controller.cc',
+    'test_shell_request_context.cc',
     'test_shell_switches.cc',
 ]
 if env['PLATFORM'] == 'win32':
@@ -103,9 +105,7 @@ if env['PLATFORM'] == 'win32':
       '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',
@@ -150,13 +150,21 @@ if env['PLATFORM'] == 'win32':
   env.Depends(test_shell, '$V8_DIR/vc80.pdb')
 
 test_files = [
-   'run_all_tests.cc',
+    'image_decoder_unittest.cc',
+    'run_all_tests.cc',
+    '$WEBKIT_DIR/glue/autocomplete_input_listener_unittest.cc',
+    '$WEBKIT_DIR/glue/cpp_variant_unittest.cc',
+    '$WEBKIT_DIR/glue/glue_serialize_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/port/platform/GKURL_unittest.cpp',
+    '$V8_DIR/snapshot-empty$OBJSUFFIX',
 ]
 
 if env['PLATFORM'] == 'win32':
   # TODO(port): put portable files in above test_files declaration.
   test_files.extend([
-      'image_decoder_unittest.cc',
       'keyboard_unittest.cc',
       'layout_test_controller_unittest.cc',
       'node_leak_test.cc',
@@ -164,30 +172,21 @@ if env['PLATFORM'] == 'win32':
       'run_all_tests.cc',
       'test_shell_test.cc',
       'text_input_controller_unittest.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',