From 2a1bda2e104ce875d307038336304c6f1f8a404a Mon Sep 17 00:00:00 2001 From: "rniwa@webkit.org" Date: Thu, 9 Aug 2012 20:01:04 +0000 Subject: [PATCH] PerformanceTests: Another build fix after r125178. * resources/runner.js: LayoutTests: Fix a test after r125178. * fast/harness/perftests/runs-per-second-log-expected.txt: * fast/harness/perftests/runs-per-second-log.html: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125194 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 7 +++++++ .../fast/harness/perftests/runs-per-second-log-expected.txt | 2 +- LayoutTests/fast/harness/perftests/runs-per-second-log.html | 4 +++- PerformanceTests/ChangeLog | 6 ++++++ PerformanceTests/resources/runner.js | 2 +- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index c4cd44a..67193cb 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,10 @@ +2012-08-09 Ryosuke Niwa + + Fix a test after r125178. + + * fast/harness/perftests/runs-per-second-log-expected.txt: + * fast/harness/perftests/runs-per-second-log.html: + 2012-08-09 Shawn Singh [chromium] Pass mask scale and offset to shaders for correct masking diff --git a/LayoutTests/fast/harness/perftests/runs-per-second-log-expected.txt b/LayoutTests/fast/harness/perftests/runs-per-second-log-expected.txt index 97e791e..813e0be 100644 --- a/LayoutTests/fast/harness/perftests/runs-per-second-log-expected.txt +++ b/LayoutTests/fast/harness/perftests/runs-per-second-log-expected.txt @@ -8,7 +8,7 @@ Ignoring warm-up run (0 runs/s) 4 runs/s 5 runs/s - +Time: avg 3 runs/s median 3 runs/s stdev 1.41 runs/s diff --git a/LayoutTests/fast/harness/perftests/runs-per-second-log.html b/LayoutTests/fast/harness/perftests/runs-per-second-log.html index 58f355c..65ed77a 100644 --- a/LayoutTests/fast/harness/perftests/runs-per-second-log.html +++ b/LayoutTests/fast/harness/perftests/runs-per-second-log.html @@ -14,10 +14,12 @@ PerfTestRunner._perSecondRunnerIterator = function (callsPerIteration) { return 1000 / runs; } +PerfTestRunner.storeHeapResults = function () { } + var printStatistics = PerfTestRunner.printStatistics; PerfTestRunner.printStatistics = function (statistics) { statistics.stdev = statistics.stdev.toPrecision(3); - return printStatistics.call(PerfTestRunner, statistics); + return printStatistics.call(PerfTestRunner, statistics, 'Time:'); } PerfTestRunner.runPerSecond({ diff --git a/PerformanceTests/ChangeLog b/PerformanceTests/ChangeLog index 6144cb2..32c855f 100644 --- a/PerformanceTests/ChangeLog +++ b/PerformanceTests/ChangeLog @@ -1,3 +1,9 @@ +2012-08-09 Ryosuke Niwa + + Another build fix after r125178. + + * resources/runner.js: + 2012-08-09 Zoltan Horvath Add memory measurement to balls.html and dromaeorunner.js diff --git a/PerformanceTests/resources/runner.js b/PerformanceTests/resources/runner.js index 94242e8..62ba715 100755 --- a/PerformanceTests/resources/runner.js +++ b/PerformanceTests/resources/runner.js @@ -128,7 +128,7 @@ PerfTestRunner._runLoop = function () { if (this._description) this.log("Description: " + this._description); this.logStatistics(this._results, this.unit, "Time:"); - if (window.internals) { + if (this._jsHeapResults.length) { this.logStatistics(this._jsHeapResults, "bytes", "JS Heap:"); this.logStatistics(this._fastMallocHeapResults, "bytes", "FastMalloc:"); } -- 1.8.3.1