Imported WebKit commit 26cd9bd8ab0471ffe987c9b60368f63dc0f1f31b (http://svn.webkit.org/repository/webkit/trunk@121325)

New snapshot with more Windows build fixes

15 files changed, 191 insertions, 45 deletions

diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index 8ade40890..44a1bbf0f 100755
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -246,6 +246,9 @@ if (isGtk()) {
     # WebKit2 is only supported in SnowLeopard and later at present.
     push @projects, ("Source/WebKit2", "Tools/MiniBrowser") if osXVersion()->{"minor"} >= 6 and !$noWebKit2;
 
+    # Build Tools needed for Apple ports
+    push @projects, ("Tools/DumpRenderTree", "Tools/WebKitTestRunner", "Source/ThirdParty/gtest", "Tools/TestWebKitAPI");
+    
     # Copy library and header from WebKitLibraries to a findable place in the product directory.
     (system("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory", $productDir) == 0) or die;
 } elsif (isWinCairo()) {
@@ -375,6 +378,7 @@ for my $dir (@projects) {
         push @local_options, XcodeCoverageSupportOptions() if $coverageSupport && $project ne "ANGLE";
         my $useGYPProject = $useGYP && ($project =~ "WebCore|JavaScriptCore");
         my $projectPath = $useGYPProject ? "gyp/$project" : $project;
+        $projectPath = $project =~ /gtest/ ? "xcode/gtest" : $project;
         $result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV);
     } elsif (isAppleWinWebKit()) {
         if ($project eq "WebKit") {
diff --git a/Tools/Scripts/generate-win32-export-forwards b/Tools/Scripts/generate-win32-export-forwards
new file mode 100755
index 000000000..e75b430f4
--- /dev/null
+++ b/Tools/Scripts/generate-win32-export-forwards
@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+
+#Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
+
+#This library is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Library General Public
+#License as published by the Free Software Foundation; either
+#version 2 of the License, or (at your option) any later version.
+
+#This library is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#Library General Public License for more details.
+
+#You should have received a copy of the GNU Library General Public License
+#along with this library; see the file COPYING.LIB.  If not, write to
+#the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#Boston, MA 02110-1301, USA.
+
+# Extract /EXPORT: linker directives from static library and write it into a
+# separate file as linker pragmas.
+# Usage: generate-win32-export-forwards \path\to\static\library.lib outputfile.cpp
+# Then compile outputfile.cpp into the final .dll and link the static library
+# into the dll.
+
+import subprocess
+import sys
+import re
+
+dumpBin = subprocess.Popen("dumpbin /directives " + sys.argv[1], stdout=subprocess.PIPE, universal_newlines=True);
+
+output, errors = dumpBin.communicate();
+
+exportedSymbolRegexp = re.compile("\s*(?P<symbol>/EXPORT:.+)");
+
+symbols = set()
+
+for line in output.splitlines():
+    match = exportedSymbolRegexp.match(line)
+    if match != None:
+        symbols.add(match.group("symbol"))
+
+print "Forwarding %s symbols from static library %s" % (len(symbols), sys.argv[1])
+
+exportFile = open(sys.argv[2], "w")
+for symbol in symbols:
+    exportFile.write("#pragma comment(linker, \"%s\")\n" % symbol);
+exportFile.close()
diff --git a/Tools/Scripts/webkit-tools-completion.sh b/Tools/Scripts/webkit-tools-completion.sh
index 76578e159..d83a5a6ce 100755
--- a/Tools/Scripts/webkit-tools-completion.sh
+++ b/Tools/Scripts/webkit-tools-completion.sh
@@ -39,6 +39,7 @@ __webkit-patch_generate_reply()
 
 __webkit-patch_upload_cc_generate_reply()
 {
+    # Note: This won't work well if hostname completion is enabled, disable it with: shopt -u hostcomplete
     # Completion is done on tokens and our comma-separated list is one single token, so we have to do completion on the whole list each time.
     # Return a \n separated list for each possible bugzilla email completion of the substring following the last comma.
     # Redirect strerr to /dev/null to prevent noise in the shell if this ever breaks somehow.
diff --git a/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py b/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
index b70e5d06f..414cc06df 100644
--- a/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
+++ b/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
@@ -155,7 +155,7 @@ class BaselineOptimizerTest(unittest.TestCase):
             'LayoutTests/platform/chromium-win-xp': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
             'LayoutTests/platform/chromium-mac-leopard': '65e7d42f8b4882b29d46dc77bb879dd41bc074dc',
             'LayoutTests/platform/mac-lion': '7ad045ece7c030e2283c5d21d9587be22bcba56e',
-            'LayoutTests/platform/chromium-win-vista': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd',
+            'LayoutTests/platform/chromium-win': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd',
             'LayoutTests/platform/win-xp': '5b1253ef4d5094530d5f1bc6cdb95c90b446bec7',
             'LayoutTests/platform/chromium-linux': 'f52fcdde9e4be8bd5142171cd859230bd4471036',
         }, {
@@ -164,7 +164,7 @@ class BaselineOptimizerTest(unittest.TestCase):
             'LayoutTests/platform/chromium-win-xp': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
             'LayoutTests/platform/chromium-mac-leopard': '65e7d42f8b4882b29d46dc77bb879dd41bc074dc',
             'LayoutTests/platform/mac-lion': '7ad045ece7c030e2283c5d21d9587be22bcba56e',
-            'LayoutTests/platform/chromium-win-vista': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd',
+            'LayoutTests/platform/chromium-win': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd',
             'LayoutTests/platform/win-xp': '5b1253ef4d5094530d5f1bc6cdb95c90b446bec7',
             'LayoutTests/platform/chromium-linux': 'f52fcdde9e4be8bd5142171cd859230bd4471036'
         })
diff --git a/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py b/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py
index 58d497dc6..e48293b89 100644
--- a/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py
+++ b/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py
@@ -219,6 +219,14 @@ class BugzillaQueries(object):
         return sum([self._fetch_bug(bug_id).reviewed_patches()
             for bug_id in self.fetch_bug_ids_from_pending_commit_list()], [])
 
+    def fetch_bugs_from_review_queue(self, cc_email=None):
+        query = "buglist.cgi?query_format=advanced&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&field0-0-0=flagtypes.name&type0-0-0=equals&value0-0-0=review?"
+
+        if cc_email:
+            query += "&emailcc1=1&emailtype1=substring&email1=%s" % urllib.quote(cc_email)
+
+        return self._fetch_bugs_from_advanced_query(query)
+
     def fetch_bug_ids_from_commit_queue(self):
         commit_queue_url = "buglist.cgi?query_format=advanced&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&field0-0-0=flagtypes.name&type0-0-0=equals&value0-0-0=commit-queue%2B&order=Last+Changed"
         return self._fetch_bug_ids_advanced_query(commit_queue_url)
diff --git a/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py b/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py
index 4e50189a1..cd12c8033 100644
--- a/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py
+++ b/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py
@@ -82,7 +82,9 @@ _patch3 = {
     "is_obsolete": False,
     "is_patch": True,
     "review": "?",
+    "commit-queue": "-",
     "attacher_email": "eric@webkit.org",
+    "attach_date": datetime.datetime.today(),
 }
 
 
@@ -266,6 +268,14 @@ class MockBugzillaQueries(object):
         # will return bugs with patches which have r+, but are also obsolete.
         return bug_ids + [50002]
 
+    def fetch_bugs_from_review_queue(self, cc_email=None):
+        unreviewed_bugs = [bug for bug in self._all_bugs() if bug.unreviewed_patches()]
+
+        if cc_email:
+            return [bug for bug in unreviewed_bugs if cc_email in bug.cc_emails()]
+
+        return unreviewed_bugs
+
     def fetch_patches_from_pending_commit_list(self):
         return sum([bug.reviewed_patches() for bug in self._all_bugs()], [])
 
@@ -302,8 +312,12 @@ class MockBugzilla(object):
         self.queries = MockBugzillaQueries(self)
         # FIXME: This should move onto the Host object, and we should use a MockCommitterList
         self.committers = CommitterList(reviewers=_mock_reviewers)
+        self.username = None
         self._override_patch = None
 
+    def authenticate(self):
+        self.username = "username@webkit.org"
+
     def create_bug(self,
                    bug_title,
                    bug_description,
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/builders.py b/Tools/Scripts/webkitpy/layout_tests/port/builders.py
index cc0fa6932..3ad45be17 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/builders.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/builders.py
@@ -38,7 +38,6 @@ from webkitpy.common.memoized import memoized
 _exact_matches = {
     # These builders are on build.chromium.org.
     "Webkit Win": {"port_name": "chromium-win-xp", "specifiers": set(["xp", "release"])},
-    "Webkit Vista": {"port_name": "chromium-win-vista", "specifiers": set(["vista"])},
     "Webkit Win7": {"port_name": "chromium-win-win7", "specifiers": set(["win7"])},
     "Webkit Win (dbg)(1)": {"port_name": "chromium-win-xp", "specifiers": set(["win", "debug"])},
     "Webkit Win (dbg)(2)": {"port_name": "chromium-win-xp", "specifiers": set(["win", "debug"])},
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
index b510305a3..5aad94c0f 100755
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -56,7 +56,6 @@ class ChromiumPort(Port):
         ('snowleopard', 'x86'),
         ('lion', 'x86'),
         ('xp', 'x86'),
-        ('vista', 'x86'),
         ('win7', 'x86'),
         ('lucid', 'x86'),
         ('lucid', 'x86_64'),
@@ -66,13 +65,13 @@ class ChromiumPort(Port):
 
     ALL_BASELINE_VARIANTS = [
         'chromium-mac-lion', 'chromium-mac-snowleopard', 'chromium-mac-leopard',
-        'chromium-win-win7', 'chromium-win-vista', 'chromium-win-xp',
+        'chromium-win-win7', 'chromium-win-xp',
         'chromium-linux-x86_64', 'chromium-linux-x86',
     ]
 
     CONFIGURATION_SPECIFIER_MACROS = {
         'mac': ['leopard', 'snowleopard', 'lion'],
-        'win': ['xp', 'vista', 'win7'],
+        'win': ['xp', 'win7'],
         'linux': ['lucid'],
         'android': ['icecreamsandwich'],
     }
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py
index 532843a9f..492deedf2 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py
@@ -194,8 +194,6 @@ class ChromiumPortTest(port_testcase.PortTestCase):
             TestConfiguration('lion', 'x86', 'release'),
             TestConfiguration('xp', 'x86', 'debug'),
             TestConfiguration('xp', 'x86', 'release'),
-            TestConfiguration('vista', 'x86', 'debug'),
-            TestConfiguration('vista', 'x86', 'release'),
             TestConfiguration('win7', 'x86', 'debug'),
             TestConfiguration('win7', 'x86', 'release'),
             TestConfiguration('lucid', 'x86', 'debug'),
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py
index b76f7ee68..ff58842b6 100755
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py
@@ -42,19 +42,12 @@ class ChromiumWinPort(chromium.ChromiumPort):
     port_name = 'chromium-win'
 
     # FIXME: Figure out how to unify this with base.TestConfiguration.all_systems()?
-    SUPPORTED_VERSIONS = ('xp', 'vista', 'win7')
+    SUPPORTED_VERSIONS = ('xp', 'win7')
 
     # FIXME: Do we need mac-snowleopard here, like the base win port?
     FALLBACK_PATHS = {
         'xp': [
             'chromium-win-xp',
-            'chromium-win-vista',
-            'chromium-win',
-            'chromium',
-            'mac',
-        ],
-        'vista': [
-            'chromium-win-vista',
             'chromium-win',
             'chromium',
             'mac',
@@ -72,7 +65,8 @@ class ChromiumWinPort(chromium.ChromiumPort):
     def determine_full_port_name(cls, host, options, port_name):
         if port_name.endswith('-win'):
             assert host.platform.is_win()
-            if host.platform.os_version in ('7sp0', '7sp1', 'future'):
+            # We don't maintain separate baselines for vista, so we pretend it is win7.
+            if host.platform.os_version in ('vista', '7sp0', '7sp1', 'future'):
                 version = 'win7'
             else:
                 version = host.platform.os_version
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py
index 759bc7e1d..ac2358194 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py
@@ -74,25 +74,19 @@ class ChromiumWinTest(port_testcase.PortTestCase):
 
     def test_versions(self):
         port = self.make_port()
-        self.assertTrue(port.name() in ('chromium-win-xp', 'chromium-win-vista', 'chromium-win-win7'))
+        self.assertTrue(port.name() in ('chromium-win-xp', 'chromium-win-win7'))
 
         self.assert_name(None, 'xp', 'chromium-win-xp')
         self.assert_name('chromium-win', 'xp', 'chromium-win-xp')
         self.assert_name('chromium-win-xp', 'xp', 'chromium-win-xp')
-        self.assert_name('chromium-win-xp', 'vista', 'chromium-win-xp')
         self.assert_name('chromium-win-xp', '7sp0', 'chromium-win-xp')
 
-        self.assert_name(None, 'vista', 'chromium-win-vista')
-        self.assert_name('chromium-win', 'vista', 'chromium-win-vista')
-        self.assert_name('chromium-win-vista', 'xp', 'chromium-win-vista')
-        self.assert_name('chromium-win-vista', 'vista', 'chromium-win-vista')
-        self.assert_name('chromium-win-vista', '7sp0', 'chromium-win-vista')
-
         self.assert_name(None, '7sp0', 'chromium-win-win7')
+        self.assert_name(None, 'vista', 'chromium-win-win7')
         self.assert_name('chromium-win', '7sp0', 'chromium-win-win7')
         self.assert_name('chromium-win-win7', 'xp', 'chromium-win-win7')
-        self.assert_name('chromium-win-win7', 'vista', 'chromium-win-win7')
         self.assert_name('chromium-win-win7', '7sp0', 'chromium-win-win7')
+        self.assert_name('chromium-win-win7', 'vista', 'chromium-win-win7')
 
         self.assertRaises(AssertionError, self.assert_name, None, 'w2k', 'chromium-win-xp')
 
@@ -100,9 +94,6 @@ class ChromiumWinTest(port_testcase.PortTestCase):
         port = self.make_port(port_name='chromium-win-xp')
         self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-win-xp'))
 
-        port = self.make_port(port_name='chromium-win-vista')
-        self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-win-vista'))
-
         port = self.make_port(port_name='chromium-win-win7')
         self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-win'))
 
diff --git a/Tools/Scripts/webkitpy/tool/commands/queries.py b/Tools/Scripts/webkitpy/tool/commands/queries.py
index a738d3267..731b598a6 100644
--- a/Tools/Scripts/webkitpy/tool/commands/queries.py
+++ b/Tools/Scripts/webkitpy/tool/commands/queries.py
@@ -1,5 +1,6 @@
 # Copyright (c) 2009 Google Inc. All rights reserved.
 # Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2012 Intel Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -30,6 +31,7 @@
 import fnmatch
 import re
 
+from datetime import datetime
 from optparse import make_option
 
 from webkitpy.tool import steps
@@ -121,14 +123,56 @@ class PatchesToCommitQueue(AbstractDeclarativeCommand):
 
 class PatchesToReview(AbstractDeclarativeCommand):
     name = "patches-to-review"
-    help_text = "List patches that are pending review"
+    help_text = "List bugs which have attachments pending review"
+
+    def __init__(self):
+        options = [
+            make_option("--all", action="store_true",
+                        help="Show all bugs regardless of who is on CC (it might take a while)"),
+            make_option("--include-cq-denied", action="store_true",
+                        help="By default, r? patches with cq- are omitted unless this option is set"),
+            make_option("--cc-email",
+                        help="Specifies the email on the CC field (defaults to your bugzilla login email)"),
+        ]
+        AbstractDeclarativeCommand.__init__(self, options=options)
+
+    def _print_report(self, report, cc_email, print_all):
+        if print_all:
+            print "Bugs with attachments pending review:"
+        else:
+            print "Bugs with attachments pending review that has %s in the CC list:" % cc_email
+
+        print "http://webkit.org/b/bugid   Description (age in days)"
+        for row in report:
+            print "%s (%d)" % (row[1], row[0])
+
+        print "Total: %d" % len(report)
+
+    def _generate_report(self, bugs, include_cq_denied):
+        report = []
+
+        for bug in bugs:
+            patch = bug.unreviewed_patches()[-1]
+
+            if not include_cq_denied and patch.commit_queue() == "-":
+                continue
+
+            age_in_days = (datetime.today() - patch.attach_date()).days
+            report.append((age_in_days, "http://webkit.org/b/%-7s %s" % (bug.id(), bug.title())))
+
+        report.sort()
+        return report
 
     def execute(self, options, args, tool):
-        patch_ids = tool.bugs.queries.fetch_attachment_ids_from_review_queue()
-        log("Patches pending review:")
-        for patch_id in patch_ids:
-            print patch_id
+        tool.bugs.authenticate()
+
+        cc_email = options.cc_email
+        if not cc_email and not options.all:
+            cc_email = tool.bugs.username
 
+        bugs = tool.bugs.queries.fetch_bugs_from_review_queue(cc_email=cc_email)
+        report = self._generate_report(bugs, options.include_cq_denied)
+        self._print_report(report, cc_email, options.all)
 
 class WhatBroke(AbstractDeclarativeCommand):
     name = "what-broke"
diff --git a/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py b/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py
index a86154b78..09b45ba55 100644
--- a/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py
@@ -1,4 +1,5 @@
 # Copyright (C) 2009 Google Inc. All rights reserved.
+# Copyright (C) 2012 Intel Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -84,9 +85,59 @@ class QueryCommandsTest(CommandsTest):
         self.assert_execute_outputs(PatchesToCommitQueue(), None, expected_stdout, expected_stderr, options=options)
 
     def test_patches_to_review(self):
-        expected_stdout = "10002\n"
-        expected_stderr = "Patches pending review:\n"
-        self.assert_execute_outputs(PatchesToReview(), None, expected_stdout, expected_stderr)
+        options = Mock()
+
+        # When no cc_email is provided, we use the Bugzilla username by default.
+        # The MockBugzilla will fake the authentication using username@webkit.org
+        # as login and it should match the username at the report header.
+        options.cc_email = None
+        options.include_cq_denied = False
+        options.all = False
+        expected_stdout = \
+            "Bugs with attachments pending review that has username@webkit.org in the CC list:\n" \
+            "http://webkit.org/b/bugid   Description (age in days)\n" \
+            "Total: 0\n"
+        expected_stderr = ""
+        self.assert_execute_outputs(PatchesToReview(), None, expected_stdout, expected_stderr, options=options)
+
+        options.cc_email = "abarth@webkit.org"
+        options.include_cq_denied = True
+        options.all = False
+        expected_stdout = \
+            "Bugs with attachments pending review that has abarth@webkit.org in the CC list:\n" \
+            "http://webkit.org/b/bugid   Description (age in days)\n" \
+            "http://webkit.org/b/50001   Bug with a patch needing review. (0)\n" \
+            "Total: 1\n"
+        expected_stderr = ""
+        self.assert_execute_outputs(PatchesToReview(), None, expected_stdout, expected_stderr, options=options)
+
+        options.cc_email = None
+        options.include_cq_denied = True
+        options.all = True
+        expected_stdout = \
+            "Bugs with attachments pending review:\n" \
+            "http://webkit.org/b/bugid   Description (age in days)\n" \
+            "http://webkit.org/b/50001   Bug with a patch needing review. (0)\n" \
+            "Total: 1\n"
+        self.assert_execute_outputs(PatchesToReview(), None, expected_stdout, expected_stderr, options=options)
+
+        options.cc_email = None
+        options.include_cq_denied = False
+        options.all = True
+        expected_stdout = \
+            "Bugs with attachments pending review:\n" \
+            "http://webkit.org/b/bugid   Description (age in days)\n" \
+            "Total: 0\n"
+        self.assert_execute_outputs(PatchesToReview(), None, expected_stdout, expected_stderr, options=options)
+
+        options.cc_email = "invalid_email@example.com"
+        options.all = False
+        options.include_cq_denied = True
+        expected_stdout = \
+            "Bugs with attachments pending review that has invalid_email@example.com in the CC list:\n" \
+            "http://webkit.org/b/bugid   Description (age in days)\n" \
+            "Total: 0\n"
+        self.assert_execute_outputs(PatchesToReview(), None, expected_stdout, expected_stderr, options=options)
 
     def test_tree_status(self):
         expected_stdout = "ok   : Builder1\nok   : Builder2\n"
diff --git a/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py b/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
index b5a043ff8..84036d46e 100644
--- a/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
@@ -204,9 +204,6 @@ Retrieving results for chromium-mac-lion from Webkit Mac10.7.
 Retrieving results for chromium-mac-snowleopard from Webkit Mac10.6.
     userscripts/another-test.html (txt)
     userscripts/images.svg (png)
-Retrieving results for chromium-win-vista from Webkit Vista.
-    userscripts/another-test.html (txt)
-    userscripts/images.svg (png)
 Retrieving results for chromium-win-win7 from Webkit Win7.
     userscripts/another-test.html (txt)
     userscripts/images.svg (png)
@@ -225,8 +222,6 @@ MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'txt', 'Webkit Mac10
 MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'png', 'Webkit Mac10.7', 'userscripts/images.svg'], cwd=/mock-checkout
 MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'txt', 'Webkit Mac10.6', 'userscripts/another-test.html'], cwd=/mock-checkout
 MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'png', 'Webkit Mac10.6', 'userscripts/images.svg'], cwd=/mock-checkout
-MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'txt', 'Webkit Vista', 'userscripts/another-test.html'], cwd=/mock-checkout
-MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'png', 'Webkit Vista', 'userscripts/images.svg'], cwd=/mock-checkout
 MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'txt', 'Webkit Win7', 'userscripts/another-test.html'], cwd=/mock-checkout
 MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'png', 'Webkit Win7', 'userscripts/images.svg'], cwd=/mock-checkout
 MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'txt', 'Webkit Win', 'userscripts/another-test.html'], cwd=/mock-checkout
diff --git a/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py b/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py
index dcecb500c..4cc772ca2 100644
--- a/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py
@@ -91,9 +91,9 @@ class BuildCoverageExtrapolatorTest(unittest.TestCase):
         converter = TestConfigurationConverter(port.all_test_configurations(), port.configuration_specifier_macros())
         extrapolator = BuildCoverageExtrapolator(converter)
         self.assertEquals(extrapolator.extrapolate_test_configurations("Webkit Win"), set([TestConfiguration(version='xp', architecture='x86', build_type='release')]))
-        self.assertEquals(extrapolator.extrapolate_test_configurations("Webkit Vista"), set([
-            TestConfiguration(version='vista', architecture='x86', build_type='debug'),
-            TestConfiguration(version='vista', architecture='x86', build_type='release')]))
+        self.assertEquals(extrapolator.extrapolate_test_configurations("Webkit Win7"), set([
+            TestConfiguration(version='win7', architecture='x86', build_type='debug'),
+            TestConfiguration(version='win7', architecture='x86', build_type='release')]))
         self.assertRaises(KeyError, extrapolator.extrapolate_test_configurations, "Potato")