diff options
| author | Steve Block <steveblock@google.com> | 2011-01-05 12:15:11 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-01-06 14:14:00 +0000 |
| commit | d06194330da2bb8da887d2e1adeacb3a5c1504b2 (patch) | |
| tree | e0af8413af65a8e30630563441af7bdb8478e513 /SunSpider | |
| parent | 419a5cf2f8db6ca014df624865197ffb82caad37 (diff) | |
| download | external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.zip external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.gz external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.bz2 | |
Merge WebKit at r72805: Initial merge by Git
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
Diffstat (limited to 'SunSpider')
| -rw-r--r-- | SunSpider/ChangeLog | 10 | ||||
| -rw-r--r-- | SunSpider/resources/sunspider-standalone-driver.js | 5 |
2 files changed, 3 insertions, 12 deletions
diff --git a/SunSpider/ChangeLog b/SunSpider/ChangeLog index 8241848..279a389 100644 --- a/SunSpider/ChangeLog +++ b/SunSpider/ChangeLog @@ -1,13 +1,3 @@ -2010-11-29 Geoffrey Garen <ggaren@apple.com> - - Reviewed by Gavin Barraclough. - - Improved accuracy of command-line SunSpider. - - * resources/sunspider-standalone-driver.js: Use the returned number of - elapsed milliseconds from "run" and "checkSyntax" instead of measuring - ourselves, for slightly more accurate numbers. - 2010-09-16 Gavin Barraclough <barraclough@apple.com> Reviewed by Mark Rowe. diff --git a/SunSpider/resources/sunspider-standalone-driver.js b/SunSpider/resources/sunspider-standalone-driver.js index 136e6b7..a015822 100644 --- a/SunSpider/resources/sunspider-standalone-driver.js +++ b/SunSpider/resources/sunspider-standalone-driver.js @@ -35,9 +35,10 @@ for (var j = 0; j < tests.length; j++) { var testName = suitePath + "/" + tests[j] + ".js"; var startTime = new Date; if (testName.indexOf('parse-only') >= 0) - times[j] = checkSyntax(testName); + checkSyntax(testName); else - times[j] = run(testName); + load(testName); + times[j] = new Date() - startTime; gc(); } |