[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[dumi at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 49460e967b8e82e9a824f20af1c5be23f8befdd0
Author: dumi at chromium.org <dumi at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 9 05:34:31 2010 +0000

    Unreviewed, Chromium build fix.
    
    Reverting r55689.
    
    * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55709 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d928c8b..de583e9 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-08  Dumitru Daniliuc  <dumi at chromium.org>
+
+        Unreviewed, Chromium build fix.
+
+        Reverting r55689.
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2010-03-08  Fumitoshi Ukai  <ukai at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
index 5467a3b..1c139af 100755
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
@@ -1409,14 +1409,9 @@ def main(options, args):
         # Just clobber the actual test results directories since the other
         # files in the results directory are explicitly used for cross-run
         # tracking.
-        meter.update("Clobbering old results in %s" %
-                     options.results_directory)
-        layout_tests_dir = path_utils.layout_tests_dir()
-        possible_dirs = os.listdir(layout_tests_dir)
-        for dirname in possible_dirs:
-            if os.path.isdir(os.path.join(layout_tests_dir, dirname)):
-                shutil.rmtree(os.path.join(options.results_directory, dirname),
-                              ignore_errors=True)
+        path = os.path.join(options.results_directory, 'LayoutTests')
+        if os.path.exists(path):
+            shutil.rmtree(path)
 
     if not options.num_test_shells:
         # TODO(ojan): Investigate perf/flakiness impact of using numcores + 1.

-- 
WebKit Debian packaging