Changeset 105915 in webkit


Ignore:
Timestamp:
Jan 25, 2012 12:29:17 PM (12 years ago)
Author:
rniwa@webkit.org
Message:

run-perf-tests should timeout sooner
https://bugs.webkit.org/show_bug.cgi?id=77026

Reviewed by Adam Barth.

Bump off the timeout from 10 minutes to 4 minutes.

Also use float instead of str in test result values to compress the size of json files bots upload.

  • Scripts/webkitpy/performance_tests/perftestsrunner.py:

(PerfTestsRunner._parse_args):
(PerfTestsRunner._process_chromium_style_test_result):
(PerfTestsRunner._process_parser_test_result):

  • Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:

(test_run_test_set_for_parser_tests):
(test_run_test_set_with_json_output):
(test_run_test_set_with_json_source):

Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r105908 r105915  
     12012-01-25  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        run-perf-tests should timeout sooner
     4        https://bugs.webkit.org/show_bug.cgi?id=77026
     5
     6        Reviewed by Adam Barth.
     7
     8        Bump off the timeout from 10 minutes to 4 minutes.
     9
     10        Also use float instead of str in test result values to compress the size of json files bots upload.
     11
     12        * Scripts/webkitpy/performance_tests/perftestsrunner.py:
     13        (PerfTestsRunner._parse_args):
     14        (PerfTestsRunner._process_chromium_style_test_result):
     15        (PerfTestsRunner._process_parser_test_result):
     16        * Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
     17        (test_run_test_set_for_parser_tests):
     18        (test_run_test_set_with_json_output):
     19        (test_run_test_set_with_json_source):
     20
    1212012-01-25  Enrica Casucci  <enrica@apple.com>
    222
  • trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py

    r105650 r105915  
    8989            optparse.make_option("--build-directory",
    9090                help="Path to the directory under which build files are kept (should not include configuration)"),
    91             optparse.make_option("--time-out-ms", default=600 * 1000,
     91            optparse.make_option("--time-out-ms", default=240 * 1000,
    9292                help="Set the timeout for each test"),
    9393            optparse.make_option("--output-json-path",
     
    239239            resultLine = self._inspector_result_regex.match(line)
    240240            if resultLine:
    241                 self._results[resultLine.group('name').replace(' ', '')] = int(resultLine.group('value'))
     241                self._results[resultLine.group('name').replace(' ', '')] = float(resultLine.group('value'))
    242242                self._buildbot_output.write("%s\n" % line)
    243243                got_a_result = True
     
    273273            score = score_regex.match(line)
    274274            if score:
    275                 results[score.group(1)] = score.group(2)
     275                results[score.group(1)] = float(score.group(2))
    276276                continue
    277277
  • trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py

    r105650 r105915  
    172172        self.assertEqual(unexpected_result_count, 0)
    173173        self.assertEqual(buildbot_output.get()[0], 'RESULT Bindings: event-target-wrapper= 1489.05 ms\n')
    174         self.assertEqual(buildbot_output.get()[1], 'median= 1487 ms, stdev= 14.46 ms, min= 1471 ms, max= 1510 ms\n')
    175         self.assertEqual(buildbot_output.get()[2], 'RESULT Parser: some-parser= 1100 ms\n')
    176         self.assertEqual(buildbot_output.get()[3], 'median= 1101 ms, stdev= 11 ms, min= 1080 ms, max= 1120 ms\n')
     174        self.assertEqual(buildbot_output.get()[1], 'median= 1487.0 ms, stdev= 14.46 ms, min= 1471.0 ms, max= 1510.0 ms\n')
     175        self.assertEqual(buildbot_output.get()[2], 'RESULT Parser: some-parser= 1100.0 ms\n')
     176        self.assertEqual(buildbot_output.get()[3], 'median= 1101.0 ms, stdev= 11.0 ms, min= 1080.0 ms, max= 1120.0 ms\n')
    177177
    178178    def test_run_test_set_with_json_output(self):
     
    185185        self.assertEqual(len(buildbot_output.get()), 3)
    186186        self.assertEqual(buildbot_output.get()[0], 'RESULT Bindings: event-target-wrapper= 1489.05 ms\n')
    187         self.assertEqual(buildbot_output.get()[1], 'median= 1487 ms, stdev= 14.46 ms, min= 1471 ms, max= 1510 ms\n')
     187        self.assertEqual(buildbot_output.get()[1], 'median= 1487.0 ms, stdev= 14.46 ms, min= 1471.0 ms, max= 1510.0 ms\n')
    188188        self.assertEqual(buildbot_output.get()[2], 'RESULT group_name: test_name= 42 ms\n')
    189189
    190190        self.assertEqual(json.loads(runner._host.filesystem.files['/mock-checkout/output.json']), {
    191191            "timestamp": 123456789, "results":
    192             {"event-target-wrapper": {"max": "1510", "avg": "1489.05", "median": "1487", "min": "1471", "stdev": "14.46"},
     192            {"event-target-wrapper": {"max": 1510, "avg": 1489.05, "median": 1487, "min": 1471, "stdev": 14.46},
    193193            "group_name:test_name": 42},
    194194            "revision": 1234})
     
    205205        self.assertEqual(len(buildbot_output.get()), 3)
    206206        self.assertEqual(buildbot_output.get()[0], 'RESULT Bindings: event-target-wrapper= 1489.05 ms\n')
    207         self.assertEqual(buildbot_output.get()[1], 'median= 1487 ms, stdev= 14.46 ms, min= 1471 ms, max= 1510 ms\n')
     207        self.assertEqual(buildbot_output.get()[1], 'median= 1487.0 ms, stdev= 14.46 ms, min= 1471.0 ms, max= 1510.0 ms\n')
    208208        self.assertEqual(buildbot_output.get()[2], 'RESULT group_name: test_name= 42 ms\n')
    209209
    210210        self.assertEqual(json.loads(runner._host.filesystem.files['/mock-checkout/output.json']), {
    211211            "timestamp": 123456789, "results":
    212             {"event-target-wrapper": {"max": "1510", "avg": "1489.05", "median": "1487", "min": "1471", "stdev": "14.46"},
     212            {"event-target-wrapper": {"max": 1510, "avg": 1489.05, "median": 1487, "min": 1471, "stdev": 14.46},
    213213            "group_name:test_name": 42},
    214214            "revision": 1234,
Note: See TracChangeset for help on using the changeset viewer.