Changeset 105915 in webkit
- Timestamp:
- Jan 25, 2012 12:29:17 PM (12 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r105908 r105915 1 2012-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 1 21 2012-01-25 Enrica Casucci <enrica@apple.com> 2 22 -
trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py
r105650 r105915 89 89 optparse.make_option("--build-directory", 90 90 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, 92 92 help="Set the timeout for each test"), 93 93 optparse.make_option("--output-json-path", … … 239 239 resultLine = self._inspector_result_regex.match(line) 240 240 if resultLine: 241 self._results[resultLine.group('name').replace(' ', '')] = int(resultLine.group('value'))241 self._results[resultLine.group('name').replace(' ', '')] = float(resultLine.group('value')) 242 242 self._buildbot_output.write("%s\n" % line) 243 243 got_a_result = True … … 273 273 score = score_regex.match(line) 274 274 if score: 275 results[score.group(1)] = score.group(2)275 results[score.group(1)] = float(score.group(2)) 276 276 continue 277 277 -
trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py
r105650 r105915 172 172 self.assertEqual(unexpected_result_count, 0) 173 173 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') 177 177 178 178 def test_run_test_set_with_json_output(self): … … 185 185 self.assertEqual(len(buildbot_output.get()), 3) 186 186 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') 188 188 self.assertEqual(buildbot_output.get()[2], 'RESULT group_name: test_name= 42 ms\n') 189 189 190 190 self.assertEqual(json.loads(runner._host.filesystem.files['/mock-checkout/output.json']), { 191 191 "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}, 193 193 "group_name:test_name": 42}, 194 194 "revision": 1234}) … … 205 205 self.assertEqual(len(buildbot_output.get()), 3) 206 206 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') 208 208 self.assertEqual(buildbot_output.get()[2], 'RESULT group_name: test_name= 42 ms\n') 209 209 210 210 self.assertEqual(json.loads(runner._host.filesystem.files['/mock-checkout/output.json']), { 211 211 "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}, 213 213 "group_name:test_name": 42}, 214 214 "revision": 1234,
Note: See TracChangeset
for help on using the changeset viewer.