ChangeLog

2012-02-03  Ryosuke Niwa  <rniwa@webkit.org>

        perf-o-matic should store chromium svn revision

        https://bugs.webkit.org/show_bug.cgi?id=77725

        Reviewed by NOBODY (OOPS!).

        Store both WebKit and Chromium revisions when both are reported.

        * Websites/webkit-perf.appspot.com/models.py:

        (Build):

        * Websites/webkit-perf.appspot.com/report_handler.py:

        (ReportHandler.post):

        (ReportHandler._create_build_if_possible):

        (ReportHandler._create_build_if_possible.execute):

        * Websites/webkit-perf.appspot.com/static/manual-submit.html:

2012-02-03  Shinya Kawanaka  <shinyak@google.com>

        Stop calling Element::ensureShadowRoot in Internals.

106639

Tools/ChangeLog

2012-02-03  Ryosuke Niwa  <rniwa@webkit.org>

        perf-o-matic should store chromium svn revision

        https://bugs.webkit.org/show_bug.cgi?id=77725

        Reviewed by NOBODY (OOPS!).

        Report both WebKit and Chromium revisions to the graph server. Renamed test_repository_paths to

        repository_paths since it's nothing to do with tests. Also refactored scm so that head_svn_revision

        is implemented in terms of newly added svn_revision.

        * Scripts/webkitpy/common/checkout/scm/git.py:

        (Git.svn_revision):

        * Scripts/webkitpy/common/checkout/scm/scm.py:

        (SCM.head_svn_revision):

        (SCM):

        (SCM.svn_revision):

        * Scripts/webkitpy/common/checkout/scm/scm_mock.py:

        (MockSCM.svn_revision):

        * Scripts/webkitpy/common/checkout/scm/svn.py:

        (SVN.svn_revision):

        * Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py:

        (JSONLayoutResultsGenerator.__init__):

        * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:

        (JSONResultsGeneratorBase._insert_generic_metadata):

        * Scripts/webkitpy/layout_tests/port/base.py:

        (Port.repository_paths):

        * Scripts/webkitpy/layout_tests/port/chromium.py:

        (ChromiumPort.repository_paths):

        * Scripts/webkitpy/performance_tests/perftestsrunner.py:

        (PerfTestsRunner._generate_json):

        * Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:

        (test_run_test_set_with_json_output):

        (test_run_test_set_with_json_source):

        (test_run_test_set_with_multiple_repositories):

2012-02-02  Jochen Eisinger  <jochen@chromium.org>

        [chromium] add support for --makeargs to the ninja-based build

106639

Tools/Scripts/webkitpy/common/checkout/scm/git.py

@@class Git(SCM, SVNRepository):

    def display_name(self):

        return "git"

232 def ~~head_~~svn_revision(self):

232 def svn_revision(self, path):

233233 _log.debug('Running git.head_svn_revision... (Temporary logging message)')

234 git_log = self.run(['git', 'log', '-25'])

234 git_log = self.run(['git', 'log', '-25', path])

        match = re.search("^\s*git-svn-id:.*@(?P<svn_revision>\d+)\ ", git_log, re.MULTILINE)

        if not match:

            return ""

106624

Tools/Scripts/webkitpy/common/checkout/scm/scm.py

@@class SCM:

        self._subclass_must_implement()

    def head_svn_revision(self):

        return self.svn_revision(self.checkout_root)

    def svn_revision(self, path):

        self._subclass_must_implement()

    def create_patch(self, git_commit=None, changed_files=None):

106624

Tools/Scripts/webkitpy/common/checkout/scm/scm_mock.py

@@class MockSCM(object):

    def head_svn_revision(self):

        return 1234

    def svn_revision(self, path):

        return 5678

    def create_patch(self, git_commit, changed_files=None):

        return "Patch1"

106624

Tools/Scripts/webkitpy/common/checkout/scm/svn.py

@@class SVN(SCM, SVNRepository):

    def display_name(self):

        return "svn"

240 def ~~head_~~svn_revision(self):

241 return self.value_from_svn_info(~~self.checkout_root~~, 'Revision')

240 def svn_revision(self, path):

241 return self.value_from_svn_info(path, 'Revision')

    # FIXME: This method should be on Checkout.

    def create_patch(self, git_commit=None, changed_files=None):

106624

Tools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py

@@class JSONLayoutResultsGenerator(json_re

        """

        super(JSONLayoutResultsGenerator, self).__init__(

            port, builder_name, build_name, build_number, results_file_base_path,

67 builder_base_url, {}, port.~~test_~~repository_paths(),

67 builder_base_url, {}, port.repository_paths(),

            test_results_server, test_type, master_name)

        self._expectations = expectations

106624

Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py

@@class JSONResultsGeneratorBase(object):

        # Include SVN revisions for the given repositories.

        for (name, path) in self._svn_repositories:

            # Note: for JSON file's backward-compatibility we use 'chrome' rather

            # than 'chromium' here.

            if name == 'chromium':

                name = 'chrome'

            self._insert_item_into_raw_list(results_for_builder,

                self._get_svn_revision(path),

                name + 'Revision')

106624

Tools/Scripts/webkitpy/layout_tests/port/base.py

@@class Port(object):

        sync up the two repos."""

        return None

    def test_repository_paths(self):

        """Returns a list of (repository_name, repository_path) tuples

        of its depending code base.  By default it returns a list that only

        contains a ('webkit', <webkitRepossitoryPath>) tuple.

        """

        return [('webkit', self.layout_tests_dir())]

    def repository_paths(self):

        """Returns a list of (repository_name, repository_path) tuples of its depending code base.

        By default it returns a list that only contains a ('webkit', <webkitRepossitoryPath>) tuple."""

        return [('webkit', self.webkit_base())]

    _WDIFF_DEL = '##WDIFF_DEL##'

106624

Tools/Scripts/webkitpy/layout_tests/port/chromium.py

@@class ChromiumPort(Port):

            is_lint_mode=False, overrides=overrides_str)

        return expectations.get_tests_with_result_type(test_expectations.SKIP)

    def test_repository_paths(self):

        # Note: for JSON file's backward-compatibility we use 'chrome' rather

        # than 'chromium' here.

        repos = super(ChromiumPort, self).test_repository_paths()

        repos.append(('chrome', self.path_from_chromium_base()))

    def repository_paths(self):

        repos = super(ChromiumPort, self).repository_paths()

        repos.append(('chromium', self.path_from_chromium_base()))

        return repos

    #

106624

Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py

@@class PerfTestsRunner(object):

        return unexpected

    def _generate_json(self, timestamp, output_json_path, source_json_path, branch, platform, builder_name, build_number):

148 revision = self._host.scm().head_svn_revision()

149 contents = {'timestamp': int(timestamp), 'revision': revision, 'results': self._results}

        contents = {'timestamp': int(timestamp), 'results': self._results}

        for (name, path) in self._port.repository_paths():

            contents[name + '-revision'] = self._host.scm().svn_revision(path)

        for key, value in {'branch': branch, 'platform': platform, 'builder-name': builder_name, 'build-number': build_number}.items():

            if value:

106624

Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py

@@max 1120

            "timestamp": 123456789, "results":

            {"Bindings/event-target-wrapper": {"max": 1510, "avg": 1489.05, "median": 1487, "min": 1471, "stdev": 14.46},

            "group_name:test_name": 42},

203 "revision": ~~1234~~})

203 "webkit-revision": 5678})

    def test_run_test_set_with_json_source(self):

        buildbot_output = array_stream.ArrayStream()

@@max 1120

            "timestamp": 123456789, "results":

            {"Bindings/event-target-wrapper": {"max": 1510, "avg": 1489.05, "median": 1487, "min": 1471, "stdev": 14.46},

            "group_name:test_name": 42},

223 "revision": ~~1234~~,

223 "webkit-revision": 5678,

224224 "key": "value"})

225225

    def test_run_test_set_with_multiple_repositories(self):

        buildbot_output = array_stream.ArrayStream()

        runner = self.create_runner(buildbot_output, args=['--output-json-path=/mock-checkout/output.json'])

        runner._host.filesystem.files[runner._base_path + '/inspector/pass.html'] = True

        runner._timestamp = 123456789

        runner._port.repository_paths = lambda: [('webkit', '/mock-checkout'), ('some', '/mock-checkout/some')]

        self.assertEqual(runner.run(), 0)

        self.assertEqual(json.loads(runner._host.filesystem.files['/mock-checkout/output.json']), {

            "timestamp": 123456789, "results": {"group_name:test_name": 42.0}, "webkit-revision": 5678, "some-revision": 5678})

    def test_run_with_upload_json(self):

        runner = self.create_runner(args=['--output-json-path=/mock-checkout/output.json',

            '--test-results-server', 'some.host', '--platform', 'platform1', '--builder-name', 'builder1', '--build-number', '123'])

106624

Websites/webkit-perf.appspot.com/models.py

@@class Build(db.Model):

    builder = db.ReferenceProperty(Builder, required=True, collection_name='builder_key')

    buildNumber = db.IntegerProperty(required=True)

    revision = db.IntegerProperty(required=True)

93 chromiumRevision = db.IntegerProperty()

    timestamp = db.DateTimeProperty(required=True)

106624

Websites/webkit-perf.appspot.com/report_handler.py

@@class ReportHandler(webapp2.RequestHandl

        branch = self._model_by_key_name_in_body_or_error(Branch, 'branch')

        platform = self._model_by_key_name_in_body_or_error(Platform, 'platform')

        build_number = self._integer_in_body('build-number')

70 revision = self._integer_in_body('revision')

7170 timestamp = self._timestamp_in_body()

71 revision = self._integer_in_body('webkit-revision')

72 chromium_revision = self._integer_in_body('webkit-revision') if 'chromium-revision' in self._body else None

        failed = False

        if builder and not (self.bypass_authentication() or builder.authenticate(self._body.get('password', ''))):

@@class ReportHandler(webapp2.RequestHandl

        if not (builder and branch and platform and build_number and revision and timestamp) or failed:

            return

85 build = self._create_build_if_possible(builder, build_number, branch, platform, revision, time~~stamp~~)

86 build = self._create_build_if_possible(builder, build_number, branch, platform, timestamp, revision, chromium_revision)

        if not build:

            return

@@class ReportHandler(webapp2.RequestHandl

        return True

165 def _create_build_if_possible(self, builder, build_number, branch, platform, revision, time~~stamp~~):

166 def _create_build_if_possible(self, builder, build_number, branch, platform, timestamp, revision, chromium_revision):

        key_name = builder.name + ':' + str(int(time.mktime(timestamp.timetuple())))

        def execute():

@@class ReportHandler(webapp2.RequestHandl

                return self._output('The build at %s already exists for %s' % (str(timestamp), builder.name))

            return Build(branch=branch, platform=platform, builder=builder, buildNumber=build_number,

174 timestamp=timestamp, revision=revision, key_name=key_name).put()

175 timestamp=timestamp, revision=revision, chromiumRevision=chromium_revision, key_name=key_name).put()

        return db.run_in_transaction(execute)

    def _add_test_if_needed(self, test_name, branch, platform):

106624

Websites/webkit-perf.appspot.com/static/manual-submit.html

@@$('data').value = JSON.stringify({

    'builder-name': 'Chromium Mac Release (Perf)',

    'build-number': '123',

    'timestamp': parseInt(Date.now() / 1000),

58 'revision': 104856,

58 'webkit-revision': 104856,

    'results':

        {

            'webkit_style_test': {'avg': 100, 'median': 102, 'stdev': 5, 'min': 90, 'max': 110},

106624