[chromium] try to unbreak run-chromium-webkit-unit-tests on the mac bots
authorthakis@chromium.org <thakis@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 25 Feb 2013 18:27:33 +0000 (18:27 +0000)
committerthakis@chromium.org <thakis@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 25 Feb 2013 18:27:33 +0000 (18:27 +0000)
https://bugs.webkit.org/show_bug.cgi?id=110767

Reviewed by Eric Seidel.

The tester runs gyp, which generates out/Release/build.ninja. The bot
scripts use existence (and timestamp) of that file to decide if the
current build is supposed to be ninja or xcodebuild. The file exists,
so the snapshot is extracted to out/Release. The snapshot doesn't
contain build.ninja however due to
http://trac.webkit.org/changeset/140375 , so after extracting the
snapshot the scripts think that this is an xcodebuild build. So remove
the part of that revision that removed ninja files from the archive,
and the bots should be happy again.

* BuildSlaveSupport/built-product-archive:
(archiveBuiltProduct):

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

Tools/BuildSlaveSupport/built-product-archive
Tools/ChangeLog

index e5fbf41..ba74fd7 100644 (file)
@@ -166,9 +166,12 @@ def archiveBuiltProduct(configuration, platform, fullPlatform):
         print "Archiving", configurationBuildDirectory
         thinDirectory = os.path.join(configurationBuildDirectory, "thin")
 
+        # The scripts use the existence of out/Release/build.ninja to decide
+        # if this is a ninja build, so don't exclude build.ninja from the
+        # archive.
         ignorePatterns = ['.svn', '*.a', '*.d', '*.dSYM', '*.o', '*.ilk', '*.lib', '*.idb',
                           'BuildLog.htm', '*.obj', '*.pdb', '*.pch', '*.tlog', '*.lastbuildstate',
-                          '*.h', '*.c', '*.cc', '*.cpp', '*.stamp', '*.ninja']
+                          '*.h', '*.c', '*.cc', '*.cpp', '*.stamp']
 
         if fullPlatform and fullPlatform == 'chromium-android':
             ignorePatterns.extend(['*.so', '*-unaligned.apk', '*-unsigned.apk'])
index 7bfa66f..a3a1159 100644 (file)
@@ -1,5 +1,25 @@
 2013-02-25  Nico Weber  <thakis@chromium.org>
 
+        [chromium] try to unbreak run-chromium-webkit-unit-tests on the mac bots
+        https://bugs.webkit.org/show_bug.cgi?id=110767
+
+        Reviewed by Eric Seidel.
+
+        The tester runs gyp, which generates out/Release/build.ninja. The bot
+        scripts use existence (and timestamp) of that file to decide if the
+        current build is supposed to be ninja or xcodebuild. The file exists,
+        so the snapshot is extracted to out/Release. The snapshot doesn't
+        contain build.ninja however due to
+        http://trac.webkit.org/changeset/140375 , so after extracting the
+        snapshot the scripts think that this is an xcodebuild build. So remove
+        the part of that revision that removed ninja files from the archive,
+        and the bots should be happy again.
+
+        * BuildSlaveSupport/built-product-archive:
+        (archiveBuiltProduct):
+
+2013-02-25  Nico Weber  <thakis@chromium.org>
+
         Fix tests after r143910
         https://bugs.webkit.org/show_bug.cgi?id=110757