--clobber-old-results was broken since it was looking for

LayoutTests, but we removed that directory.  This was causing
failing results to build up on the buildbots and making the
rebaseline tool not work correctly.

Review URL: http://codereview.chromium.org/651014

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

1 files changed, 9 insertions, 3 deletions

diff --git a/webkit/tools/layout_tests/webkitpy/layout_tests/run_chromium_webkit_tests.py b/webkit/tools/layout_tests/webkitpy/layout_tests/run_chromium_webkit_tests.py
index 8fe7c42..e42bd8e 100755
--- a/webkit/tools/layout_tests/webkitpy/layout_tests/run_chromium_webkit_tests.py
+++ b/webkit/tools/layout_tests/webkitpy/layout_tests/run_chromium_webkit_tests.py
@@ -1436,9 +1436,15 @@ 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.
-        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 = 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)
 
     # Ensure platform is valid and force it to the form 'chromium-<platform>'.
     options.platform = path_utils.platform_name(options.platform)