Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (268688 => 268689)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-10-19 21:14:04 UTC (rev 268688)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-10-19 21:35:42 UTC (rev 268689)
@@ -2736,7 +2736,7 @@
self.zipFile = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:patch_id)s-%(prop:buildnumber)s{}.zip'.format(identifier))
self.resultDirectory = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:patch_id)s-%(prop:buildnumber)s{}'.format(identifier))
- self.command = ['unzip', '-q', self.zipFile, '-d', self.resultDirectory]
+ self.command = ['unzip', '-q', '-o', self.zipFile, '-d', self.resultDirectory]
master.MasterShellCommand.__init__(self, command=self.command, logEnviron=False)
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (268688 => 268689)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-10-19 21:14:04 UTC (rev 268688)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-10-19 21:35:42 UTC (rev 268689)
@@ -3198,6 +3198,7 @@
self.expectLocalCommands(
ExpectMasterShellCommand(command=['unzip',
'-q',
+ '-o',
'public_html/results/macOS-Sierra-Release-WK2-Tests-EWS/r1234-12.zip',
'-d',
'public_html/results/macOS-Sierra-Release-WK2-Tests-EWS/r1234-12',
@@ -3217,6 +3218,7 @@
self.expectLocalCommands(
ExpectMasterShellCommand(command=['unzip',
'-q',
+ '-o',
'public_html/results/iOS-12-Simulator-WK2-Tests-EWS/r1234-12-rerun.zip',
'-d',
'public_html/results/iOS-12-Simulator-WK2-Tests-EWS/r1234-12-rerun',
@@ -3236,6 +3238,7 @@
self.expectLocalCommands(
ExpectMasterShellCommand(command=['unzip',
'-q',
+ '-o',
'public_html/results/macOS-Sierra-Release-WK2-Tests-EWS/r1234-12.zip',
'-d',
'public_html/results/macOS-Sierra-Release-WK2-Tests-EWS/r1234-12',
Modified: trunk/Tools/ChangeLog (268688 => 268689)
--- trunk/Tools/ChangeLog 2020-10-19 21:14:04 UTC (rev 268688)
+++ trunk/Tools/ChangeLog 2020-10-19 21:35:42 UTC (rev 268689)
@@ -1,3 +1,14 @@
+2020-10-19 Aakash Jain <[email protected]>
+
+ [ews] use -o while unzipping layout-test-results.zip
+ https://bugs.webkit.org/show_bug.cgi?id=217914
+
+ Reviewed by Jonathan Bedard.
+
+ * BuildSlaveSupport/ews-build/steps.py:
+ (ExtractTestResults.__init__):
+ * BuildSlaveSupport/ews-build/steps_unittest.py:
+
2020-10-19 Sam Weinig <[email protected]>
Switch to a static pattern for DumpRenderTree preferences generation to avoid ambiguous rules