2006-10-04 Mark Rowe <bdash@webkit.org>
authorbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Oct 2006 00:21:48 +0000 (00:21 +0000)
committerbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Oct 2006 00:21:48 +0000 (00:21 +0000)
        Reviewed by Stephanie.

        Switch the Qt buildbot to the standard set of build steps.
        Have JavaScriptCoreTest check the output of run-javascriptcore-tests to
        see if any regressions were spotted, and fail the test if so.

        * BuildSlaveSupport/build.webkit.org-config/webkit/builders.py:
        * BuildSlaveSupport/build.webkit.org-config/webkit/factories.py:
        * BuildSlaveSupport/build.webkit.org-config/webkit/steps.py:

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

WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/builders.py
WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/factories.py
WebKitTools/BuildSlaveSupport/build.webkit.org-config/webkit/steps.py
WebKitTools/ChangeLog

index b85b8bfe6d001e7da79cb4f27cd1203e342f38b6..70eb20e02f1b681464bf722d0f67e09b8580e341 100644 (file)
@@ -6,7 +6,7 @@ _builders = [('post-commit-powerpc-mac-os-x', StandardBuildFactory, ['apple-slav
              ('post-commit-pixel-powerpc-mac-os-x', PixelTestBuildFactory, ['apple-slave-3', 'apple-slave-4']),
              ('post-commit-win32', Win32BuildFactory, ['apple-slave-2']),
              ('periodic-powerpc-mac-os-x-no-svg', NoSVGBuildFactory, ['apple-slave-4', 'apple-slave-3']),
-             ('post-commit-linux-qt', QTBuildFactory, ['wildfox-slave-1']),
+             ('post-commit-linux-qt', QtBuildFactory, ['wildfox-slave-1']),
              ]
 
 def getBuilders():
index c4779f01098787eb3c8a622aee54e84f2b0e2343..8a6d4f27eaa69773f4ff685db8f24817413f73f5 100644 (file)
@@ -59,7 +59,9 @@ class Win32BuildFactory(BuildFactory):
         self.steps.append(s(JavaScriptCoreTest))
         self.steps.append(s(LayoutTest))
 
-class QTBuildFactory(BuildFactory):
+class QtBuildFactory(BuildFactory):
     def __init__(self):
         BuildFactory.__init__(self)
-        self.steps.append(s(CompileWebKitCMake))
+        self.steps.append(s(SetConfiguration, configuration="release"))
+        self.steps.append(s(CompileWebKit, configuration="release"))
+        self.steps.append(s(JavaScriptCoreTest))
index 462d7a35ce6b4afec83b51bd4eea33f0b7e30333..6e58817b0d77ee4b3d76b67168b44656e89a5305 100644 (file)
@@ -51,6 +51,33 @@ class JavaScriptCoreTest(Test):
     descriptionDone = ["jscore-tests"]
     command = ["./WebKitTools/Scripts/run-javascriptcore-tests"]
 
+    def commandComplete(self, cmd):
+        Test.commandComplete(self, cmd)
+
+        logText = cmd.logs['stdio'].getText()
+        statusLines = [line for line in logText.splitlines() if line.find('regressions found.') >= 0]
+        if statusLines and statusLines[0].split()[0] != '0':
+            self.regressionLine = statusLines[0]
+        else:
+            self.regressionLine = None
+
+    def evaluateCommand(self, cmd):
+        if cmd.rc != 0:
+            return FAILURE
+
+        if self.regressionLine:
+            return FAILURE
+
+        return SUCCESS
+
+    def getText(self, cmd, results):
+        return self.getText2(cmd, results)
+
+    def getText2(self, cmd, results):
+        if results != SUCCESS and self.regressionLine:
+            return [self.name, self.regressionLine]
+
+        return [self.name]
 
 class PixelLayoutTest(LayoutTest):
     name = "pixel-layout-test"
@@ -118,13 +145,9 @@ class UploadLayoutResults(UploadCommand, ShellCommand):
 
         ShellCommand.__init__(self, *args, **kwargs)
 
-class CompileWebKitCMake(Compile):
-    command = "mkdir -p WebKitBuild && cd WebKitBuild && cmake -DWEBKIT_DO_NOT_USE_COLORFUL_OUTPUT=ON .. && make"
-    description = ["compiling"]
-    descriptionDone = ["compiled"]
 
 class CompileWebKit(Compile):
-    command = ["./WebKitTools/Scripts/build-webkit"]
+    command = ["./WebKitTools/Scripts/build-webkit", "--no-color"]
     def __init__(self, *args, **kwargs):
         configuration = kwargs.pop('configuration')
         
@@ -136,7 +159,7 @@ class CompileWebKit(Compile):
 
 
 class CompileWebKitNoSVG(CompileWebKit):
-    command = 'rm -rf WebKitBuild && ./WebKitTools/Scripts/build-webkit --no-svg'
+    command = 'rm -rf WebKitBuild && ./WebKitTools/Scripts/build-webkit --no-svg --no-color'
 
 class InstallWin32Dependencies(ShellCommand):
     description = ["installing Windows dependencies"]
index 0ac842227ee06b48a10f4fbe5bf6b4138b999dbe..fa08bc9d7f3ac9c13221633367137b7315c12021 100644 (file)
@@ -1,3 +1,15 @@
+2006-10-04  Mark Rowe  <bdash@webkit.org>
+
+        Reviewed by Stephanie.
+
+        Switch the Qt buildbot to the standard set of build steps.
+        Have JavaScriptCoreTest check the output of run-javascriptcore-tests to
+        see if any regressions were spotted, and fail the test if so.
+
+        * BuildSlaveSupport/build.webkit.org-config/webkit/builders.py: 
+        * BuildSlaveSupport/build.webkit.org-config/webkit/factories.py:
+        * BuildSlaveSupport/build.webkit.org-config/webkit/steps.py:
+
 2006-10-04  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Mitz Pettel!