Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (179121 => 179122)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-01-26 18:03:57 UTC (rev 179121)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-01-26 18:18:07 UTC (rev 179122)
@@ -906,11 +906,16 @@
class BuildAndNonLayoutTestFactory(BuildAndTestFactory):
LayoutTestClass = None
-class TestLeaksFactory(TestFactory):
- LayoutTestClass = RunWebKitLeakTests
- ExtractTestResultsClass = ExtractTestResultsAndLeaks
+class TestLeaksFactory(Factory):
+ def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror)
+ self.addStep(DownloadBuiltProduct())
+ self.addStep(ExtractBuiltProduct())
+ self.addStep(RunWebKitLeakTests(buildJSCTool=(platform != 'win'))) # FIXME: Why is buildJSCTool needed?
+ self.addStep(ArchiveTestResults())
+ self.addStep(UploadTestResults())
+ self.addStep(ExtractTestResultsAndLeaks())
-
class TestWebKit2Factory(TestFactory):
LayoutTestClass = RunWebKit2Tests
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (179121 => 179122)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2015-01-26 18:03:57 UTC (rev 179121)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2015-01-26 18:18:07 UTC (rev 179122)
@@ -51,12 +51,12 @@
def test_nrwt_leaks_parsing(self):
run_webkit_tests = RunWebKitTests() # pylint is confused by the way we import the module ... pylint: disable-msg=E0602
log_text = """
-12:44:24.295 77706 13981 total leaks found for a total of 197,936 bytes!
-12:44:24.295 77706 1 unique leaks found!
+12:44:24.295 77706 13981 total leaks found for a total of 197,936 bytes.
+12:44:24.295 77706 1 unique leaks found.
"""
expected_incorrect_lines = [
- '13981 total leaks found for a total of 197,936 bytes!',
- '1 unique leaks found!',
+ '13981 total leaks found for a total of 197,936 bytes.',
+ '1 unique leaks found.',
]
run_webkit_tests._parseRunWebKitTestsOutput(log_text)
self.assertEqual(run_webkit_tests.incorrectLayoutLines, expected_incorrect_lines)
Modified: trunk/Tools/ChangeLog (179121 => 179122)
--- trunk/Tools/ChangeLog 2015-01-26 18:03:57 UTC (rev 179121)
+++ trunk/Tools/ChangeLog 2015-01-26 18:18:07 UTC (rev 179122)
@@ -1,3 +1,22 @@
+2015-01-26 Alexey Proskuryakov <[email protected]>
+
+ Leaks bot shouldn't run JSC tests
+ https://bugs.webkit.org/show_bug.cgi?id=140877
+
+ Reviewed by Darin Adler.
+
+ Shaves off 48 minutes of time.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (TestLeaksFactory): Slim down the leaks queue.
+
+ * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+ * Scripts/webkitpy/port/ios.py:
+ (IOSSimulatorPort.print_leaks_summary):
+ * Scripts/webkitpy/port/mac.py:
+ (MacPort.print_leaks_summary):
+ Don't yell when leaks are detected.
+
2015-01-26 Csaba Osztrogonác <[email protected]>
Refactor run-_javascript_core-tests
Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (179121 => 179122)
--- trunk/Tools/Scripts/webkitpy/port/ios.py 2015-01-26 18:03:57 UTC (rev 179121)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2015-01-26 18:18:07 UTC (rev 179122)
@@ -230,8 +230,8 @@
return
total_bytes_string, unique_leaks = self._leak_detector.count_total_bytes_and_unique_leaks(leaks_files)
total_leaks = self._leak_detector.count_total_leaks(leaks_files)
- _log.info("%s total leaks found for a total of %s!" % (total_leaks, total_bytes_string))
- _log.info("%s unique leaks found!" % unique_leaks)
+ _log.info("%s total leaks found for a total of %s." % (total_leaks, total_bytes_string))
+ _log.info("%s unique leaks found." % unique_leaks)
def _path_to_webcore_library(self):
return self._build_path('WebCore.framework/Versions/A/WebCore')
Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (179121 => 179122)
--- trunk/Tools/Scripts/webkitpy/port/mac.py 2015-01-26 18:03:57 UTC (rev 179121)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py 2015-01-26 18:18:07 UTC (rev 179122)
@@ -172,8 +172,8 @@
return
total_bytes_string, unique_leaks = self._leak_detector.count_total_bytes_and_unique_leaks(leaks_files)
total_leaks = self._leak_detector.count_total_leaks(leaks_files)
- _log.info("%s total leaks found for a total of %s!" % (total_leaks, total_bytes_string))
- _log.info("%s unique leaks found!" % unique_leaks)
+ _log.info("%s total leaks found for a total of %s." % (total_leaks, total_bytes_string))
+ _log.info("%s unique leaks found." % unique_leaks)
def _check_port_build(self):
return self.get_option('nojava') or self._build_java_test_support()
