Diff
Modified: trunk/Tools/ChangeLog (210462 => 210463)
--- trunk/Tools/ChangeLog 2017-01-07 01:20:17 UTC (rev 210462)
+++ trunk/Tools/ChangeLog 2017-01-07 01:41:21 UTC (rev 210463)
@@ -1,3 +1,13 @@
+2017-01-06 Said Abou-Hallawa <[email protected]>
+
+ Create a plan and a patch files for MotionMark and delete the Animometer's ones
+ https://bugs.webkit.org/show_bug.cgi?id=166785
+
+ Reviewed by Ryosuke Niwa.
+
+ * Scripts/webkitpy/benchmark_runner/data/patches/MotionMark.patch: Renamed from Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch.
+ * Scripts/webkitpy/benchmark_runner/data/plans/motionmark.plan: Renamed from Tools/Scripts/webkitpy/benchmark_runner/data/plans/animometer.plan.
+
2017-01-06 Antoine Quint <[email protected]>
Support webkit-test-runner key-value pairs in http tests
Deleted: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch (210462 => 210463)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch 2017-01-07 01:20:17 UTC (rev 210462)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch 2017-01-07 01:41:21 UTC (rev 210463)
@@ -1,75 +0,0 @@
-diff --git a/resources/runner/animometer.js b/resources/runner/animometer.js
-index b20a1c9..e434e89 100644
---- a/resources/runner/animometer.js
-+++ b/resources/runner/animometer.js
-@@ -320,6 +320,61 @@ window.benchmarkRunnerClient = {
- didFinishLastIteration: function()
- {
- benchmarkController.showResults();
-+ },
-+
-+ _computeTestReport: function(testName, testResults)
-+ {
-+ return [testResults[Strings.json.score]];
-+ },
-+
-+ _computeSuiteReports: function(suiteName, suiteResults)
-+ {
-+ var testsReports = {};
-+ for (var testName in suiteResults) {
-+ var testReports = this._computeTestReport(testName, suiteResults[testName]);
-+ testsReports[testName] = { "metrics": { "Score": { "current": testReports } } };
-+ }
-+ return testsReports;
-+ },
-+
-+ _computeIterationReports: function(iterationResults)
-+ {
-+ var suitesReports = {};
-+ for (var suiteName in iterationResults[Strings.json.results.tests]) {
-+ var testsReports = this._computeSuiteReports(suiteName, iterationResults[Strings.json.results.tests][suiteName]);
-+ suitesReports[suiteName] = { "metrics": { "Score": ["Geometric"] }, "tests": testsReports };
-+ }
-+ return suitesReports;
-+ },
-+
-+ _computeResultsReports: function()
-+ {
-+ var results = this.results.results[0];
-+ var iterationReports = this._computeIterationReports(results);
-+ var debugOutput = {
-+ options: benchmarkRunnerClient.results.options,
-+ data: benchmarkRunnerClient.results.data,
-+ }
-+ return {"Animometer": {"metrics" : {"Score" : ["Geometric"]}, "tests" : iterationReports }, "debugOutput": debugOutput};
-+ },
-+
-+ didFinishLastIteration: function()
-+ {
-+ // submit result to server
-+ var results = JSON.stringify(this._computeResultsReports());
-+ var xhr = new XMLHttpRequest();
-+ xhr.open("POST", "/report");
-+ xhr.setRequestHeader("Content-type", "application/json");
-+ xhr.setRequestHeader("Content-length", results.length);
-+ xhr.setRequestHeader("Connection", "close");
-+ xhr._onreadystatechange_ = function() {
-+ if (xhr.readyState == XMLHttpRequest.DONE && xhr.status == 200) {
-+ closeRequest = new XMLHttpRequest();
-+ closeRequest.open("GET", "/shutdown");
-+ closeRequest.send()
-+ }
-+ }
-+ xhr.send(results);
- }
- };
-
-@@ -357,7 +408,7 @@ window.sectionsManager =
- window.benchmarkController = {
- initialize: function()
- {
-- benchmarkController.addOrientationListenerIfNecessary();
-+ setTimeout(benchmarkController.startBenchmark.bind(benchmarkController), 3000);
- },
-
- addOrientationListenerIfNecessary: function() {
Copied: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/MotionMark.patch (from rev 210461, trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch) (0 => 210463)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/MotionMark.patch (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/MotionMark.patch 2017-01-07 01:41:21 UTC (rev 210463)
@@ -0,0 +1,75 @@
+diff --git a/resources/runner/motionmark.js b/resources/runner/motionmark.js
+index 65e8c54..1643e70 100644
+--- a/resources/runner/motionmark.js
++++ b/resources/runner/motionmark.js
+@@ -393,6 +393,61 @@ window.benchmarkRunnerClient = {
+ didFinishLastIteration: function()
+ {
+ benchmarkController.showResults();
++ },
++
++ _computeTestReport: function(testName, testResults)
++ {
++ return [testResults[Strings.json.score]];
++ },
++
++ _computeSuiteReports: function(suiteName, suiteResults)
++ {
++ var testsReports = {};
++ for (var testName in suiteResults) {
++ var testReports = this._computeTestReport(testName, suiteResults[testName]);
++ testsReports[testName] = { "metrics": { "Score": { "current": testReports } } };
++ }
++ return testsReports;
++ },
++
++ _computeIterationReports: function(iterationResults)
++ {
++ var suitesReports = {};
++ for (var suiteName in iterationResults[Strings.json.results.tests]) {
++ var testsReports = this._computeSuiteReports(suiteName, iterationResults[Strings.json.results.tests][suiteName]);
++ suitesReports[suiteName] = { "metrics": { "Score": ["Geometric"] }, "tests": testsReports };
++ }
++ return suitesReports;
++ },
++
++ _computeResultsReports: function()
++ {
++ var results = this.results.results[0];
++ var iterationReports = this._computeIterationReports(results);
++ var debugOutput = {
++ options: benchmarkRunnerClient.results.options,
++ data: benchmarkRunnerClient.results.data,
++ }
++ return {"MotionMark": {"metrics" : {"Score" : ["Geometric"]}, "tests" : iterationReports }, "debugOutput": debugOutput};
++ },
++
++ didFinishLastIteration: function()
++ {
++ // submit result to server
++ var results = JSON.stringify(this._computeResultsReports());
++ var xhr = new XMLHttpRequest();
++ xhr.open("POST", "/report");
++ xhr.setRequestHeader("Content-type", "application/json");
++ xhr.setRequestHeader("Content-length", results.length);
++ xhr.setRequestHeader("Connection", "close");
++ xhr._onreadystatechange_ = function() {
++ if (xhr.readyState == XMLHttpRequest.DONE && xhr.status == 200) {
++ closeRequest = new XMLHttpRequest();
++ closeRequest.open("GET", "/shutdown");
++ closeRequest.send()
++ }
++ }
++ xhr.send(results);
+ }
+ };
+
+@@ -436,7 +491,7 @@ window.sectionsManager =
+ window.benchmarkController = {
+ initialize: function()
+ {
+- benchmarkController.addOrientationListenerIfNecessary();
++ setTimeout(benchmarkController.startBenchmark.bind(benchmarkController), 3000);
+ },
+
+ determineCanvasSize: function() {
Deleted: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/animometer.plan (210462 => 210463)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/animometer.plan 2017-01-07 01:20:17 UTC (rev 210462)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/animometer.plan 2017-01-07 01:41:21 UTC (rev 210463)
@@ -1,8 +0,0 @@
-{
- "timeout": 1800,
- "count": 1,
- "svn_source": "https://svn.webkit.org/repository/webkit/trunk/PerformanceTests/Animometer/@r202601",
- "benchmark_patch": "data/patches/Animometer.patch",
- "entry_point": "index.html",
- "output_file": "animometer.result"
-}
Copied: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/motionmark.plan (from rev 210461, trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/animometer.plan) (0 => 210463)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/motionmark.plan (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/motionmark.plan 2017-01-07 01:41:21 UTC (rev 210463)
@@ -0,0 +1,8 @@
+{
+ "timeout": 1800,
+ "count": 1,
+ "svn_source": "https://svn.webkit.org/repository/webkit/trunk/PerformanceTests/MotionMark/@r210459",
+ "benchmark_patch": "data/patches/MotionMark.patch",
+ "entry_point": "index.html",
+ "output_file": "motionmark.result"
+}
