Title: [183390] trunk/Tools
Revision
183390
Author
[email protected]
Date
2015-04-27 03:05:14 -0700 (Mon, 27 Apr 2015)

Log Message

[buildbot] Fix the output of perf-test buildstep on timeout
https://bugs.webkit.org/show_bug.cgi?id=144097

Reviewed by Ryosuke Niwa.

* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunAndUploadPerfTests.getText2):
* BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
(RunAndUploadPerfTestsTest.test_buildbot_timeout):
(RunAndUploadPerfTestsTest.test_build_bad_preparation): Deleted.

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (183389 => 183390)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg	2015-04-27 10:02:36 UTC (rev 183389)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg	2015-04-27 10:05:14 UTC (rev 183390)
@@ -677,6 +677,8 @@
                 return ["upload error"]
             elif cmd.rc == -5 & 0xff:
                 return ["system dependency error"]
+            elif cmd.rc == -1:
+                return ["timeout"]
             else:
                 return ["%d perf tests failed" % cmd.rc]
 

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (183389 => 183390)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py	2015-04-27 10:02:36 UTC (rev 183389)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py	2015-04-27 10:05:14 UTC (rev 183390)
@@ -514,6 +514,10 @@
     def test_build_bad_preparation(self):
         self.assertResults(251, "system dependency error")
 
+    def test_buildbot_timeout(self):
+        self.assertResults(-1, "timeout")
+
+
 # FIXME: We should run this file as part of test-webkitpy.
 # Unfortunately test-webkitpy currently requires that unittests
 # be located in a directory with a valid module name.

Modified: trunk/Tools/ChangeLog (183389 => 183390)


--- trunk/Tools/ChangeLog	2015-04-27 10:02:36 UTC (rev 183389)
+++ trunk/Tools/ChangeLog	2015-04-27 10:05:14 UTC (rev 183390)
@@ -1,5 +1,18 @@
 2015-04-27  Csaba Osztrogonác  <[email protected]>
 
+        [buildbot] Fix the output of perf-test buildstep on timeout
+        https://bugs.webkit.org/show_bug.cgi?id=144097
+
+        Reviewed by Ryosuke Niwa.
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (RunAndUploadPerfTests.getText2):
+        * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+        (RunAndUploadPerfTestsTest.test_buildbot_timeout):
+        (RunAndUploadPerfTestsTest.test_build_bad_preparation): Deleted.
+
+2015-04-27  Csaba Osztrogonác  <[email protected]>
+
         [EFL] TestWebKitAPI's forwarding header generator should depend on WebKit2's generator
         https://bugs.webkit.org/show_bug.cgi?id=143874
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to