webkitpy build fix. Revert the debug change (number of runs was 2 instead of 20),

and also rebaseline the test results since we ignore the first run now.

* Scripts/webkitpy/performance_tests/perftest.py:
(PageLoadingPerfTest.run):
* Scripts/webkitpy/performance_tests/perftest_unittest.py:
(TestPageLoadingPerfTest.test_run):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114158 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index d803327..e40d4fd 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2012-04-13  Ryosuke Niwa  <rniwa@webkit.org>
+
+        webkitpy build fix. Revert the debug change (number of runs was 2 instead of 20),
+        and also rebaseline the test results since we ignore the first run now.
+
+        * Scripts/webkitpy/performance_tests/perftest.py:
+        (PageLoadingPerfTest.run):
+        * Scripts/webkitpy/performance_tests/perftest_unittest.py:
+        (TestPageLoadingPerfTest.test_run):
+
 2012-04-12  Ryosuke Niwa  <rniwa@webkit.org>
 
         Enable SVG page loading performance tests

diff --git a/Tools/Scripts/webkitpy/performance_tests/perftest.py b/Tools/Scripts/webkitpy/performance_tests/perftest.py
index e3f69ac..72ba98e 100644 (file)
--- a/Tools/Scripts/webkitpy/performance_tests/perftest.py
+++ b/Tools/Scripts/webkitpy/performance_tests/perftest.py
@@ -154,7 +154,7 @@ class PageLoadingPerfTest(PerfTest):
     def run(self, driver, timeout_ms, printer, buildbot_output):
         test_times = []
 
-        for i in range(0, 2):
+        for i in range(0, 20):
             output = driver.run_test(DriverInput(self.path_or_url(), timeout_ms, None, False))
             if self.run_failed(output, printer):
                 return None

diff --git a/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py b/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py
index ade7d03..7f86873 100755 (executable)
--- a/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py
+++ b/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py
@@ -105,9 +105,9 @@ class TestPageLoadingPerfTest(unittest.TestCase):
         test = PageLoadingPerfTest('some-test', 'some-dir/some-test', '/path/some-dir/some-test')
         driver = TestPageLoadingPerfTest.MockDriver([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20])
         self.assertEqual(test.run(driver, None, printer, buildbot_output),
-            {'some-test': {'max': 20000, 'avg': 10500.0, 'median': 10500, 'stdev': math.sqrt(665 * 1000 * 1000), 'min': 1000, 'unit': 'ms'}})
+            {'some-test': {'max': 20000, 'avg': 11000.0, 'median': 11000, 'stdev': math.sqrt(570 * 1000 * 1000), 'min': 2000, 'unit': 'ms'}})
         self.assertEqual(printer.written_lines, [])
-        self.assertWritten(buildbot_output, ['RESULT some-test= 10500.0 ms\n', 'median= 10500 ms, stdev= 25787.5939165 ms, min= 1000 ms, max= 20000 ms\n'])
+        self.assertWritten(buildbot_output, ['RESULT some-test= 11000.0 ms\n', 'median= 11000 ms, stdev= 23874.6727726 ms, min= 2000 ms, max= 20000 ms\n'])
 
     def test_run_with_bad_output(self):
         printer = MockPrinter()