Revert r101279, broke the ews and cq bots.

* Scripts/update-webkit:
* Scripts/webkitdirs.pm:
(determineIsChromium):
(buildChromium):
* Scripts/webkitpy/common/config/ports.py:
(WebKitPort.update_webkit_command):
(ChromiumPort.update_webkit_command):
* Scripts/webkitpy/common/config/ports_mock.py:
(MockPort.update_webkit_command):
* Scripts/webkitpy/tool/steps/update.py:
* Scripts/webkitpy/tool/steps/update_unittest.py: Removed.

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 8d1e266..8fc59ed 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,19 @@
+2011-11-28  Tony Chang  <tony@chromium.org>
+
+        Revert r101279, broke the ews and cq bots.
+
+        * Scripts/update-webkit:
+        * Scripts/webkitdirs.pm:
+        (determineIsChromium):
+        (buildChromium):
+        * Scripts/webkitpy/common/config/ports.py:
+        (WebKitPort.update_webkit_command):
+        (ChromiumPort.update_webkit_command):
+        * Scripts/webkitpy/common/config/ports_mock.py:
+        (MockPort.update_webkit_command):
+        * Scripts/webkitpy/tool/steps/update.py:
+        * Scripts/webkitpy/tool/steps/update_unittest.py: Removed.
+
 2011-11-28  Ojan Vafai  <ojan@chromium.org>
 
         testlistjson on the test results server doesn't understand hierarchical results format

diff --git a/Tools/Scripts/update-webkit b/Tools/Scripts/update-webkit
index fb9f798..5c902d7 100755 (executable)
--- a/Tools/Scripts/update-webkit
+++ b/Tools/Scripts/update-webkit
@@ -108,7 +108,6 @@ if (-d "../Internal") {
 
     my @chromiumUpdateArgs = ("perl", "Tools/Scripts/update-webkit-chromium");
     push @chromiumUpdateArgs, "--chromium-android" if isChromiumAndroid();
-    push @chromiumUpdateArgs, "--force" if forceChromiumUpdate();
     system(@chromiumUpdateArgs) == 0 or die $!;
 } elsif (isAppleWinWebKit()) {
     system("perl", "Tools/Scripts/update-webkit-auxiliary-libs") == 0 or die;

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index ea2c6bf..9ba4058 100755 (executable)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -92,7 +92,6 @@ my $isBlackBerry;
 my $isChromium;
 my $isChromiumAndroid;
 my $isChromiumMacMake;
-my $forceChromiumUpdate;
 my $isInspectorFrontend;
 my $isWK2;
 
@@ -965,9 +964,6 @@ sub determineIsChromium()
 {
     return if defined($isChromium);
     $isChromium = checkForArgumentAndRemoveFromARGV("--chromium");
-    if ($isChromium) {
-        $forceChromiumUpdate = checkForArgumentAndRemoveFromARGV("--force-update");
-    }
 }
 
 sub isChromiumAndroid()
@@ -1003,11 +999,6 @@ sub determineIsChromiumMacMake()
     $isChromiumMacMake = isDarwin() && $hasUpToDateMakefile;
 }
 
-sub forceChromiumUpdate()
-{
-    determineIsChromium();
-    return $forceChromiumUpdate;
-}
 
 sub isWinCairo()
 {
@@ -2017,7 +2008,7 @@ sub buildChromium($@)
 
     # We might need to update DEPS or re-run GYP if things have changed.
     if (checkForArgumentAndRemoveFromArrayRef("--update-chromium", \@options)) {
-        system("perl", "Tools/Scripts/update-webkit-chromium", "--force") == 0 or die $!;
+        system("perl", "Tools/Scripts/update-webkit-chromium") == 0 or die $!;
     }
 
     my $result = 1;

diff --git a/Tools/Scripts/webkitpy/common/config/ports.py b/Tools/Scripts/webkitpy/common/config/ports.py
index a8506f3..a16adae 100644 (file)
--- a/Tools/Scripts/webkitpy/common/config/ports.py
+++ b/Tools/Scripts/webkitpy/common/config/ports.py
@@ -80,7 +80,7 @@ class WebKitPort(object):
         raise NotImplementedError("subclasses must implement")
 
     @classmethod
-    def update_webkit_command(cls, non_interactive=False):
+    def update_webkit_command(cls):
         return cls.script_shell_command("update-webkit")
 
     @classmethod
@@ -225,11 +225,9 @@ class ChromiumPort(WebKitPort):
         return "--port=chromium"
 
     @classmethod
-    def update_webkit_command(cls, non_interactive=False):
-        command = WebKitPort.update_webkit_command(non_interactive=non_interactive)
+    def update_webkit_command(cls):
+        command = WebKitPort.update_webkit_command()
         command.append("--chromium")
-        if non_interactive:
-            command.append("--force-update")
         return command
 
     @classmethod

diff --git a/Tools/Scripts/webkitpy/common/config/ports_mock.py b/Tools/Scripts/webkitpy/common/config/ports_mock.py
index 65dd442..c641525 100644 (file)
--- a/Tools/Scripts/webkitpy/common/config/ports_mock.py
+++ b/Tools/Scripts/webkitpy/common/config/ports_mock.py
@@ -37,7 +37,7 @@ class MockPort(object):
     def check_webkit_style_command(self):
         return ["mock-check-webkit-style"]
 
-    def update_webkit_command(self, non_interactive=False):
+    def update_webkit_command(self):
         return ["mock-update-webkit"]
 
     def build_webkit_command(self, build_style=None):

diff --git a/Tools/Scripts/webkitpy/tool/steps/update.py b/Tools/Scripts/webkitpy/tool/steps/update.py
index ddd721b..352e84d 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/steps/update.py
+++ b/Tools/Scripts/webkitpy/tool/steps/update.py
@@ -43,8 +43,4 @@ class Update(AbstractStep):
         if not self._options.update:
             return
         log("Updating working directory")
-        self._tool.executive.run_and_throw_if_fail(self._update_command(), quiet=self._options.quiet, cwd=self._tool.scm().checkout_root)
-
-    def _update_command(self):
-        update_command = self._tool.port().update_webkit_command(self._options.non_interactive)
-        return update_command
+        self._tool.executive.run_and_throw_if_fail(self._tool.port().update_webkit_command(), quiet=self._options.quiet, cwd=self._tool.scm().checkout_root)

diff --git a/Tools/Scripts/webkitpy/tool/steps/update_unittest.py b/Tools/Scripts/webkitpy/tool/steps/update_unittest.py
deleted file mode 100644 (file)
index 19ef949..0000000
--- a/Tools/Scripts/webkitpy/tool/steps/update_unittest.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (C) 2011 Google Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import unittest
-
-from webkitpy.common.config.ports import ChromiumPort, ChromiumXVFBPort
-from webkitpy.tool.mocktool import MockOptions, MockTool
-from webkitpy.tool.steps.update import Update
-
-
-class UpdateTest(unittest.TestCase):
-
-    def test_update_command_non_interactive(self):
-        tool = MockTool()
-        options = MockOptions(non_interactive=True)
-        step = Update(tool, options)
-        self.assertEqual(["mock-update-webkit"], step._update_command())
-
-        tool._deprecated_port = ChromiumPort()
-        self.assertEqual(["Tools/Scripts/update-webkit", "--chromium", "--force-update"], step._update_command())
-
-        tool._deprecated_port = ChromiumXVFBPort()
-        self.assertEqual(["Tools/Scripts/update-webkit", "--chromium", "--force-update"], step._update_command())
-
-    def test_update_command_interactive(self):
-        tool = MockTool()
-        options = MockOptions(non_interactive=False)
-        step = Update(tool, options)
-        self.assertEqual(["mock-update-webkit"], step._update_command())
-
-        tool._deprecated_port = ChromiumPort()
-        self.assertEqual(["Tools/Scripts/update-webkit", "--chromium"], step._update_command())
-
-        tool._deprecated_port = ChromiumXVFBPort()
-        self.assertEqual(["Tools/Scripts/update-webkit", "--chromium"], step._update_command())