summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-06 17:51:20 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-06 17:51:20 +0000
commita48146712aa765290165d2425d02518f14e22cf4 (patch)
tree0e1946292faea4359a9ec20f93f879d32a2ba78b /webkit/tools/test_shell
parenta8f643b401ec655adbe20d98dc862f168b25b17a (diff)
downloadchromium_src-a48146712aa765290165d2425d02518f14e22cf4.zip
chromium_src-a48146712aa765290165d2425d02518f14e22cf4.tar.gz
chromium_src-a48146712aa765290165d2425d02518f14e22cf4.tar.bz2
Port some test_shell_tests, and platform cleanup for more of them.
Many of these files that I don't added to the build would even compile and link, but don't yet pass with current test_shell on Linux. They just hang. Patch from Paweł Hajdan jr <phajdan.jr@gmail.com> on http://codereview.chromium.org/9417 Review URL: http://codereview.chromium.org/9641 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4892 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
-rw-r--r--webkit/tools/test_shell/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index b591b8a..02b4cb5 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -156,9 +156,11 @@ test_files = [
'image_decoder_unittest.cc',
'keyboard_unittest.cc',
'layout_test_controller_unittest.cc',
+ 'node_leak_test.cc',
'run_all_tests.cc',
'test_shell_test.cc',
'$WEBKIT_DIR/glue/autocomplete_input_listener_unittest.cc',
+ '$WEBKIT_DIR/glue/bookmarklet_unittest.cc',
'$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc',
'$WEBKIT_DIR/glue/cpp_variant_unittest.cc',
'$WEBKIT_DIR/glue/glue_serialize_unittest.cc',
@@ -172,10 +174,8 @@ test_files = [
if env['PLATFORM'] == 'win32':
# TODO(port): put portable files in above test_files declaration.
test_files.extend([
- 'node_leak_test.cc',
'plugin_tests.cc',
'text_input_controller_unittest.cc',
- '$WEBKIT_DIR/glue/bookmarklet_unittest.cc',
'$WEBKIT_DIR/glue/context_menu_unittest.cc',
'$WEBKIT_DIR/glue/dom_operations_unittest.cc',
'$WEBKIT_DIR/glue/dom_serializer_unittest.cc',