Modified: trunk/Tools/ChangeLog (144420 => 144421)
--- trunk/Tools/ChangeLog 2013-03-01 06:28:41 UTC (rev 144420)
+++ trunk/Tools/ChangeLog 2013-03-01 06:34:29 UTC (rev 144421)
@@ -1,3 +1,23 @@
+2013-02-28 Ryosuke Niwa <[email protected]>
+
+ Merge PerfTestRunner._run_single_test into PerfTestRunner._run_tests_set
+ https://bugs.webkit.org/show_bug.cgi?id=111142
+
+ Reviewed by Adam Barth.
+
+ Merged _run_single_test into _run_tests_set. The code looks much cleaner now.
+
+ Also removed _print_status since it's never used anywhere.
+
+ * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+ (PerfTestsRunner.run):
+ (PerfTestsRunner._run_tests_set):
+ * Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py:
+ (MainTest.run_test):
+ (MainTest.test_run_test_set):
+ (MainTest.test_run_test_set_kills_drt_per_run):
+ (MainTest.test_run_test_set_for_parser_tests):
+
2013-02-28 Kiran Muppala <[email protected]>
Disable window occlusion detection for WebKitTestRunner Web View on Mac
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py (144420 => 144421)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2013-03-01 06:28:41 UTC (rev 144420)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2013-03-01 06:34:29 UTC (rev 144421)
@@ -186,7 +186,7 @@
try:
if needs_http:
self._start_http_servers()
- unexpected = self._run_tests_set(sorted(list(tests), key=lambda test: test.test_name()), self._port)
+ unexpected = self._run_tests_set(sorted(list(tests), key=lambda test: test.test_name()))
finally:
if needs_http:
@@ -356,40 +356,21 @@
_log.info("JSON file uploaded to %s." % url)
return True
- def _print_status(self, tests, expected, unexpected):
- if len(tests) == expected + unexpected:
- status = "Ran %d tests" % len(tests)
- else:
- status = "Running %d of %d tests" % (expected + unexpected + 1, len(tests))
- if unexpected:
- status += " (%d didn't run)" % unexpected
- _log.info(status)
-
- def _run_tests_set(self, tests, port):
+ def _run_tests_set(self, tests):
result_count = len(tests)
- expected = 0
- unexpected = 0
- driver = None
+ failures = 0
- for test in tests:
- _log.info('Running %s (%d of %d)' % (test.test_name(), expected + unexpected + 1, len(tests)))
- if self._run_single_test(test):
- expected = expected + 1
+ for i, test in enumerate(tests):
+ _log.info('Running %s (%d of %d)' % (test.test_name(), i + 1, len(tests)))
+ start_time = time.time()
+ new_results = test.run(self._options.time_out_ms)
+ if new_results:
+ self._results.update(new_results)
else:
- unexpected = unexpected + 1
+ failures += 1
+ _log.error('FAILED')
+ _log.info('Finished: %f s' % (time.time() - start_time))
_log.info('')
- return unexpected
-
- def _run_single_test(self, test):
- start_time = time.time()
- new_results = test.run(self._options.time_out_ms)
- if new_results:
- self._results.update(new_results)
- else:
- _log.error('FAILED')
-
- _log.info("Finished: %f s" % (time.time() - start_time))
-
- return new_results != None
+ return failures
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py (144420 => 144421)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py 2013-03-01 06:28:41 UTC (rev 144420)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py 2013-03-01 06:34:29 UTC (rev 144421)
@@ -214,7 +214,8 @@
def run_test(self, test_name):
runner, port = self.create_runner()
- return runner._run_single_test(ChromiumStylePerfTest(port, test_name, runner._host.filesystem.join('some-dir', test_name)))
+ tests = [ChromiumStylePerfTest(port, test_name, runner._host.filesystem.join('some-dir', test_name))]
+ return runner._run_tests_set(tests) == 0
def test_run_passing_test(self):
self.assertTrue(self.run_test('pass.html'))
@@ -253,7 +254,7 @@
output = OutputCapture()
output.capture_output()
try:
- unexpected_result_count = runner._run_tests_set(tests, port)
+ unexpected_result_count = runner._run_tests_set(tests)
finally:
stdout, stderr, log = output.restore_output()
self.assertEqual(unexpected_result_count, len(tests) - 1)
@@ -270,7 +271,7 @@
tests = self._tests_for_runner(runner, ['inspector/pass.html', 'inspector/silent.html', 'inspector/failed.html',
'inspector/tonguey.html', 'inspector/timeout.html', 'inspector/crash.html'])
- unexpected_result_count = runner._run_tests_set(tests, port)
+ unexpected_result_count = runner._run_tests_set(tests)
self.assertEqual(TestDriverWithStopCount.stop_count, 6)
@@ -280,7 +281,7 @@
output = OutputCapture()
output.capture_output()
try:
- unexpected_result_count = runner._run_tests_set(tests, port)
+ unexpected_result_count = runner._run_tests_set(tests)
finally:
stdout, stderr, log = output.restore_output()
self.assertEqual(unexpected_result_count, 0)
