Changeset 55741 in webkit

Timestamp:

Mar 9, 2010 1:23:10 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

2010-03-09 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Nate Chapin.

Fix --clobber-old-results in new-run-webkit-tests.

​https://bugs.webkit.org/show_bug.cgi?id=35778

• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-09  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Nate Chapin.
+
+        Fix --clobber-old-results in new-run-webkit-tests.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35778
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2010-03-09  Andy Estes  <aestes@apple.com>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -1410 +1410 @@
         # files in the results directory are explicitly used for cross-run
         # tracking.
-        path = os.path.join(options.results_directory, 'LayoutTests')
-        if os.path.exists(path):
-            shutil.rmtree(path)
+        meter.update("Clobbering old results in %s" %
+                     options.results_directory)
+        layout_tests_dir = port_obj.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)
 
     if not options.num_test_shells: