Modified: trunk/Tools/BuildSlaveSupport/test-result-archive (231335 => 231336)
--- trunk/Tools/BuildSlaveSupport/test-result-archive 2018-05-03 23:51:10 UTC (rev 231335)
+++ trunk/Tools/BuildSlaveSupport/test-result-archive 2018-05-03 23:54:00 UTC (rev 231336)
@@ -23,7 +23,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import gzip, optparse, os, shutil, subprocess, sys
+import gzip, optparse, os, shutil, subprocess, sys, zipfile
sourceRootDirectory = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ".."))
archiveFile = os.path.join(sourceRootDirectory, "layout-test-results.zip")
@@ -80,9 +80,15 @@
compress_spindumps(layoutTestResultsDir)
if subprocess.call(["ditto", "-c", "-k", "--sequesterRsrc", "--zlibCompressionLevel", "2", layoutTestResultsDir, archiveFile]):
return 1
- elif platform in ('win', 'gtk', 'wincairo', 'wpe'):
+ elif platform in ('win', 'gtk', 'wpe'):
if subprocess.call(["zip", "-r", "-2", archiveFile, "."], cwd=layoutTestResultsDir):
return 1
+ elif platform == 'wincairo':
+ with zipfile.ZipFile(archiveFile, 'w', zipfile.ZIP_DEFLATED) as archiveZip:
+ for path, dirNames, fileNames in os.walk(layoutTestResultsDir):
+ relativePath = os.path.relpath(path, layoutTestResultsDir)
+ for fileName in fileNames:
+ archiveZip.write(os.path.join(path, fileName), os.path.join(relativePath, fileName))
try:
shutil.rmtree(layoutTestResultsDir)
Modified: trunk/Tools/ChangeLog (231335 => 231336)
--- trunk/Tools/ChangeLog 2018-05-03 23:51:10 UTC (rev 231335)
+++ trunk/Tools/ChangeLog 2018-05-03 23:54:00 UTC (rev 231336)
@@ -1,3 +1,14 @@
+2018-05-03 Ross Kirsling <ross.kirsl...@sony.com>
+
+ [WinCairo] Test archive must use Python zipfile, just like build product.
+ https://bugs.webkit.org/show_bug.cgi?id=185265
+
+ Reviewed by Per Arne Vollan.
+
+ * BuildSlaveSupport/test-result-archive:
+ (archive_test_results):
+ Copy over Win32-oriented archiving logic from built-product-archive.
+
2018-05-03 Leo Balter <leonardo.bal...@gmail.com>
cleanup modules usage for the Test262-Runner
