Unreviewed, rolling out r101110.

http://trac.webkit.org/changeset/101110
https://bugs.webkit.org/show_bug.cgi?id=73057

The bots have now cycled and this patch is no longer needed.

* Scripts/webkitpy/layout_tests/controllers/manager.py:
(Manager._upload_json_files):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@101112 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 672f36f..e179ac6 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,16 @@
 2011-11-23  Ojan Vafai  <ojan@chromium.org>
 
+        Unreviewed, rolling out r101110.
+        http://trac.webkit.org/changeset/101110
+        https://bugs.webkit.org/show_bug.cgi?id=73057
+
+        The bots have now cycled and this patch is no longer needed.
+
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        (Manager._upload_json_files):
+
+2011-11-23  Ojan Vafai  <ojan@chromium.org>
+
         Temporarily save the incremental results json in order to identify bug
         https://bugs.webkit.org/show_bug.cgi?id=73057
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py b/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
index f0e97e2..ad4be2c 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
+++ b/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
@@ -1104,11 +1104,7 @@ class Manager(object):
         # Remove these files from the results directory so they don't take up too much space on the buildbot.
         # The tools use the version we uploaded to the results server anyway.
         self._fs.remove(times_json_path)
-
-        # FIXME: Uncomment this code after the bots have cycled once.
-        # Ojan wants to save the incremental results once so that he can figure out a bug
-        # in the json merging using the real data.
-        #self._fs.remove(incremental_results_path)
+        self._fs.remove(incremental_results_path)
 
     def print_config(self):
         """Prints the configuration for the test run."""