Changeset 177535 in webkit

Timestamp:

Dec 18, 2014 3:22:44 PM (9 years ago)

Author:

ap@apple.com

Message:

Perf tests frequently fail saying "build not up to date"
​https://bugs.webkit.org/show_bug.cgi?id=139786

Illegitimately yet authoritatively reviewed by Lucas Forschler.

Undo the rest of the first fix, and implement the behavior differently.

is_clean isn't automatically forwarded from config.json to properties.

• BuildSlaveSupport/build.webkit.org-config/config.json:
• BuildSlaveSupport/build.webkit.org-config/master.cfg:

(CleanBuildUnconditionally):
(CleanBuildUnconditionally.start):
(DownloadAndPerfTestFactory.init):
(DownloadAndPerfTestWebKit2Factory.init):

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/config.json (modified) (4 diffs)
• BuildSlaveSupport/build.webkit.org-config/master.cfg (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json

@@ -108 +108 @@
                     {
                       "name": "Apple MountainLion Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "mountainlion-release-perf-tests",
-                      "is_clean": true,
                       "platform": "mac-mountainlion", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["bot141"]
@@ -149 +148 @@
                     {
                       "name": "Apple Mavericks Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "mavericks-release-perf-tests",
-                      "is_clean": true,
                       "platform": "mac-mavericks", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["bot135"]
@@ -190 +188 @@
                     {
                       "name": "Apple Yosemite Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "yosemite-release-perf-tests",
-                      "is_clean": true,
                       "platform": "mac-yosemite", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["bot194"]
@@ -250 +247 @@
                     {
                       "name": "GTK Linux 64-bit Release (Perf)", "type": "DownloadAndPerfTestWebKit2", "builddir": "gtk-linux-64-release-perf-tests",
-                      "is_clean": true,
                       "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["gtk-linux-slave-8"]

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg

@@ -160 +160 @@
             self.hideStepIf = True
             return SKIPPED
+        return shell.Compile.start(self)
+
+class CleanBuildUnconditionally(shell.Compile):
+    name = "delete WebKitBuild directory"
+    description = ["deleting WebKitBuild directory"]
+    descriptionDone = ["deleted WebKitBuild directory"]
+    command = ["python", "./Tools/BuildSlaveSupport/clean-build", WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
+
+    def start(self):
         return shell.Compile.start(self)
 
@@ -923 +932 @@
     def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
         Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
+        self.addStep(CleanBuildUnconditionally())
         self.addStep(DownloadBuiltProduct())
         self.addStep(ExtractBuiltProduct())
@@ -930 +940 @@
     def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
         Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
+        self.addStep(CleanBuildUnconditionally())
         self.addStep(DownloadBuiltProduct())
         self.addStep(ExtractBuiltProduct())

trunk/Tools/ChangeLog

@@ +1 @@
+2014-12-18  Alexey Proskuryakov  <ap@apple.com>
+
+        Perf tests frequently fail saying "build not up to date"
+        https://bugs.webkit.org/show_bug.cgi?id=139786
+
+        Illegitimately yet authoritatively reviewed by Lucas Forschler.
+
+        Undo the rest of the first fix, and implement the behavior differently.
+
+        is_clean isn't automatically forwarded from config.json to properties.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json:
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (CleanBuildUnconditionally):
+        (CleanBuildUnconditionally.start):
+        (DownloadAndPerfTestFactory.__init__):
+        (DownloadAndPerfTestWebKit2Factory.__init__):
+
 2014-12-18  Alexey Proskuryakov  <ap@apple.com>