Title: [125956] trunk/Tools
- Revision
- 125956
- Author
- rn...@webkit.org
- Date
- 2012-08-17 17:36:06 -0700 (Fri, 17 Aug 2012)
Log Message
Perfalizer should differentiate results with and without the patch
https://bugs.webkit.org/show_bug.cgi?id=94399
Reviewed by Dirk Pranke.
Add "with 12345" and "without 12345" descriptions in results JSON so that graphs in
the results page are labled accordingly.
Also use _build_without_patch when building without a patch so that we get the right error message.
* Scripts/webkitpy/tool/commands/perfalizer.py:
(PerfalizerTask.run):
(PerfalizerTask._run_perf_test):
* Scripts/webkitpy/tool/commands/perfalizer_unittest.py:
(PerfalizerTaskTest._create_and_run_perfalizer.run_perf_test):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (125955 => 125956)
--- trunk/Tools/ChangeLog 2012-08-18 00:31:00 UTC (rev 125955)
+++ trunk/Tools/ChangeLog 2012-08-18 00:36:06 UTC (rev 125956)
@@ -1,3 +1,21 @@
+2012-08-17 Ryosuke Niwa <rn...@webkit.org>
+
+ Perfalizer should differentiate results with and without the patch
+ https://bugs.webkit.org/show_bug.cgi?id=94399
+
+ Reviewed by Dirk Pranke.
+
+ Add "with 12345" and "without 12345" descriptions in results JSON so that graphs in
+ the results page are labled accordingly.
+
+ Also use _build_without_patch when building without a patch so that we get the right error message.
+
+ * Scripts/webkitpy/tool/commands/perfalizer.py:
+ (PerfalizerTask.run):
+ (PerfalizerTask._run_perf_test):
+ * Scripts/webkitpy/tool/commands/perfalizer_unittest.py:
+ (PerfalizerTaskTest._create_and_run_perfalizer.run_perf_test):
+
2012-08-17 Dirk Pranke <dpra...@chromium.org>
nrwt: don't fail tests if ImageDiff fails on the wk2 ports
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/perfalizer.py (125955 => 125956)
--- trunk/Tools/Scripts/webkitpy/tool/commands/perfalizer.py 2012-08-18 00:31:00 UTC (rev 125955)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/perfalizer.py 2012-08-18 00:36:06 UTC (rev 125956)
@@ -72,7 +72,7 @@
head_revision = self._tool.scm().head_svn_revision()
self._logger('Building WebKit at r%s without the patch' % head_revision)
- if not self._build():
+ if not self._build_without_patch():
return False
if not self._port.check_build(needs_http=False):
@@ -96,11 +96,11 @@
filesystem.remove(self._json_path())
self._logger("Running performance tests...")
- if self._run_perf_test(self._build_directory_without_patch) < 0:
+ if self._run_perf_test(self._build_directory_without_patch, 'without %d' % self._patch.id()) < 0:
self._logger('Failed to run performance tests without the patch.')
return False
- if self._run_perf_test(self._build_directory) < 0:
+ if self._run_perf_test(self._build_directory, 'with %d' % self._patch.id()) < 0:
self._logger('Failed to run performance tests with the patch.')
return False
@@ -129,11 +129,11 @@
def _results_page_path(self):
return self._tool.filesystem.join(self._build_directory, 'PerformanceTestResults.html')
- def _run_perf_test(self, build_path):
+ def _run_perf_test(self, build_path, description):
filesystem = self._tool.filesystem
script_path = filesystem.join(filesystem.dirname(self._tool.path()), 'run-perf-tests')
perf_test_runner_args = [script_path, '--no-build', '--no-show-results', '--build-directory', build_path,
- '--output-json-path', self._json_path()]
+ '--output-json-path', self._json_path(), '--description', description]
return self._tool.executive.run_and_throw_if_fail(perf_test_runner_args, cwd=self._tool.scm().checkout_root)
def run_command(self, command):
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/perfalizer_unittest.py (125955 => 125956)
--- trunk/Tools/Scripts/webkitpy/tool/commands/perfalizer_unittest.py 2012-08-18 00:31:00 UTC (rev 125955)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/perfalizer_unittest.py 2012-08-18 00:36:06 UTC (rev 125956)
@@ -50,7 +50,8 @@
if args[0] in commands_to_fail:
raise ScriptError
- def run_perf_test(build_path):
+ def run_perf_test(build_path, description):
+ self.assertTrue(description == 'without 10000' or description == 'with 10000')
if 'run-perf-tests' in commands_to_fail:
return -1
if 'results-page' not in commands_to_fail:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
