Unreviewed build fix after r105256.
authorloislo@chromium.org <loislo@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Jan 2012 13:00:45 +0000 (13:00 +0000)
committerloislo@chromium.org <loislo@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Jan 2012 13:00:45 +0000 (13:00 +0000)
There was a cyclic dependency between self._port and self._host assigments.

* Scripts/webkitpy/performance_tests/perftestsrunner.py:
(PerfTestsRunner.__init__):

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

Tools/ChangeLog
Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py

index c93a5cc1842f0f5446bded2d16c394d53eddf24f..baddf0a461491bf3a17ee8b0a032caa78f62efb0 100644 (file)
@@ -1,3 +1,12 @@
+2012-01-18  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Unreviewed build fix after r105256.
+
+        There was a cyclic dependency between self._port and self._host assigments.
+
+        * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+        (PerfTestsRunner.__init__):
+
 2012-01-18  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 
         Add new watchlist rule for the Qt build system
index 21bdab931c3bdc45d3ca519f9f01b3bb4895063b..8c42558c3148007da33476808b6892b2e3a56414 100644 (file)
@@ -51,8 +51,12 @@ class PerfTestsRunner(object):
     def __init__(self, regular_output=sys.stderr, buildbot_output=sys.stdout, args=None, port=None):
         self._buildbot_output = buildbot_output
         self._options, self._args = PerfTestsRunner._parse_args(args)
-        self._port = port or self._host.port_factory.get(self._options.platform, self._options)
-        self._host = self._port.host
+        if port:
+            self._port = port
+            self._host = self._port.host
+        else:
+            self._host = Host()
+            self._port = self._host.port_factory.get(self._options.platform, self._options)
         self._host._initialize_scm()
         self._printer = printing.Printer(self._port, self._options, regular_output, buildbot_output, configure_logging=False)
         self._webkit_base_dir_len = len(self._port.webkit_base())