WebKit Bugzilla
Attachment 339462 Details for
Bug 185265
: [WinCairo] Test archive must use Python zipfile, just like build product.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-185265-20180503140437.patch (text/plain), 2.50 KB, created by
Ross Kirsling
on 2018-05-03 14:04:37 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Ross Kirsling
Created:
2018-05-03 14:04:37 PDT
Size:
2.50 KB
patch
obsolete
>Subversion Revision: 231271 >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 8960e45747dfc05f0377e5236e142723c56791bc..a7b6fa8882602ea6496d4f20b23e99c6808422bf 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,14 @@ >+2018-05-03 Ross Kirsling <ross.kirsling@sony.com> >+ >+ [WinCairo] Test archive must use Python zipfile, just like build product. >+ https://bugs.webkit.org/show_bug.cgi?id=185265 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * BuildSlaveSupport/test-result-archive: >+ (archive_test_results): >+ Copy over Win32-oriented archiving logic from built-product-archive. >+ > 2018-05-02 Carlos Alberto Lopez Perez <clopez@igalia.com> > > [GTK] Generate a JSC bundle on the 64 and 32 bit release bots and upload it to webkitgtk.org (follow-up fix) >diff --git a/Tools/BuildSlaveSupport/test-result-archive b/Tools/BuildSlaveSupport/test-result-archive >index c1ae70933f406873bc2176e441b507ce95394740..fff076c280fa3eb9d3ed389dd3b098b04e77fd65 100644 >--- a/Tools/BuildSlaveSupport/test-result-archive >+++ b/Tools/BuildSlaveSupport/test-result-archive >@@ -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 @@ def archive_test_results(configuration, platform, layoutTestResultsDir): > 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)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 185265
: 339462