3 files changed, 17 insertions, 10 deletions
diff --git a/webkit/tools/layout_tests/layout_package/http_server.py b/webkit/tools/layout_tests/layout_package/http_server.py
index fc7f72c..1f55b3f 100644
--- a/webkit/tools/layout_tests/layout_package/http_server.py
+++ b/webkit/tools/layout_tests/layout_package/http_server.py
@@ -38,13 +38,13 @@ class HttpdNotStarted(Exception):
 class Lighttpd:
   # Webkit tests
   try:
-    _webkit_tests = PathFromBase('webkit', 'data', 'layout_tests',
+    _webkit_tests = PathFromBase('third_party', 'WebKit',
                                  'LayoutTests', 'http', 'tests')
   except google.path_utils.PathNotFound:
-    # If webkit/data/layout_tests/LayoutTests/http/tests does not exist, assume
-    # wekit tests are located in third_party/WebKit/LayoutTests/http/tests.
+    # If third_party/WebKit/LayoutTests/http/tests does not exist, assume wekit
+    # tests are located in webkit/data/layout_tests/LayoutTests/http/tests.
     try:
-      _webkit_tests = PathFromBase('third_party', 'WebKit',
+      _webkit_tests = PathFromBase('webkit', 'data', 'layout_tests',
                                    'LayoutTests', 'http', 'tests')
     except google.path_utils.PathNotFound:
       _webkit_tests = None
diff --git a/webkit/tools/layout_tests/layout_package/path_utils.py b/webkit/tools/layout_tests/layout_package/path_utils.py
index dcff738..a15048c 100644
--- a/webkit/tools/layout_tests/layout_package/path_utils.py
+++ b/webkit/tools/layout_tests/layout_package/path_utils.py
@@ -65,11 +65,13 @@ def LayoutTestsDir(path = None):
   if _layout_tests_dir:
     return _layout_tests_dir
 
-  if os.path.exists(os.path.join(LayoutDataDir(), 'LayoutTests')):
-    _layout_tests_dir = LayoutDataDir()
+  webkit_dir = google.path_utils.FindUpward(
+      google.path_utils.ScriptDir(), 'third_party', 'WebKit')
+
+  if os.path.exists(os.path.join(webkit_dir, 'LayoutTests')):
+    _layout_tests_dir = webkit_dir
   else:
-    _layout_tests_dir = google.path_utils.FindUpward(
-        google.path_utils.ScriptDir(), 'third_party', 'WebKit')
+    _layout_tests_dir = LayoutDataDir()
 
   return _layout_tests_dir
 
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index 03ae887..566c105 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -83,7 +83,7 @@ class TestRunner:
   _skipped_directories = set(['.svn', '_svn', 'resources'])
 
   # Top-level directories to shard when running tests.
-  _shardable_directories = set(['chrome', 'LayoutTests'])
+  _shardable_directories = set(['chrome', 'LayoutTests', 'pending'])
 
   HTTP_SUBDIR = os.sep.join(['', 'http', ''])
 
@@ -1000,7 +1000,12 @@ def main(options, args):
       options.time_out_ms = str(TestRunner.DEFAULT_TEST_TIMEOUT_MS)
 
   # Include all tests if none are specified.
-  paths = args
+  new_args = []
+  for arg in args:
+    if arg and arg != '':
+      new_args.append(arg)
+
+  paths = new_args
   if not paths:
     paths = []
   if options.test_list: