Title: [90108] trunk/Tools
Revision
90108
Author
[email protected]
Date
2011-06-30 05:55:39 -0700 (Thu, 30 Jun 2011)

Log Message

2011-06-30  Dmitry Lomov  <[email protected]>

        Reviewed by Adam Roben.

        https://bugs.webkit.org/show_bug.cgi?id=63660
        This enables unit-tests step on Windows and MacOS SnowLeopard.

        * BuildSlaveSupport/build.webkit.org-config/master.cfg:

Modified Paths

Diff

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


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg	2011-06-30 12:10:13 UTC (rev 90107)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg	2011-06-30 12:55:39 UTC (rev 90108)
@@ -522,6 +522,10 @@
             self.addStep(UploadBuiltProduct)
             self.addStep(trigger.Trigger, schedulerNames=triggers)
 
+def unitTestsSupported(configuration, platform):
+    # FIXME: Only running in debug mode due to https://bugs.webkit.org/show_bug.cgi?id=61812
+    return configuration == 'debug' and (platform == 'win' or (platform.startswith('mac') and platform != 'mac-leopard'))
+
 class TestFactory(Factory):
     TestClass = RunWebKitTests
     ExtractTestResultsClass = ExtractTestResults
@@ -536,6 +540,8 @@
         self.addStep(RunJavaScriptCoreTests, buildJSCTool=False)
         self.addStep(self.TestClass, buildJSCTool=(platform != 'win'))
 
+        if unitTestsSupported(configuration, platform): 
+            self.addStep(RunUnitTests)
         self.addStep(RunPythonTests)
         self.addStep(RunPerlTests)
         self.addStep(RunBindingsTests)
@@ -556,8 +562,7 @@
         if platform.startswith("chromium"):
             self.addStep(RunChromiumWebKitUnitTests)
         self.addStep(self.TestClass)
-        # FIXME: Only running in debug mode due to https://bugs.webkit.org/show_bug.cgi?id=61812
-        if configuration == "debug" and (platform == 'mac' or platform == 'win'):
+        if unitTestsSupported(configuration, platform): 
             self.addStep(RunUnitTests)
         self.addStep(RunPythonTests)
         # Chromium Win runs in non-Cygwin environment, which is not yet fit

Modified: trunk/Tools/ChangeLog (90107 => 90108)


--- trunk/Tools/ChangeLog	2011-06-30 12:10:13 UTC (rev 90107)
+++ trunk/Tools/ChangeLog	2011-06-30 12:55:39 UTC (rev 90108)
@@ -1,3 +1,12 @@
+2011-06-30  Dmitry Lomov  <[email protected]>
+
+        Reviewed by Adam Roben.
+
+        https://bugs.webkit.org/show_bug.cgi?id=63660
+        This enables unit-tests step on Windows and MacOS SnowLeopard.
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+
 2011-06-30  Balazs Kelemen  <[email protected]>
 
         Reviewed by Kenneth Rohde Christiansen.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to