<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>208521</bug_id>
          
          <creation_ts>2020-03-03 10:24:34 -0800</creation_ts>
          <short_desc>commit-queue should update working directory and reapply patch just before commiting</short_desc>
          <delta_ts>2020-03-03 16:13:57 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Tools / Tests</component>
          <version>Other</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Aakash Jain">aakash_jain</reporter>
          <assigned_to name="Aakash Jain">aakash_jain</assigned_to>
          <cc>aakash_jain</cc>
    
    <cc>ap</cc>
    
    <cc>jbedard</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1625118</commentid>
    <comment_count>0</comment_count>
    <who name="Aakash Jain">aakash_jain</who>
    <bug_when>2020-03-03 10:24:34 -0800</bug_when>
    <thetext>After applying the patch, commit-queue does building and testing. Building and testing might take some time. Meanwhile there might be multiple commits to the repository. Therefore after running the tests, and just before committing the patch, commit-queue should update the working directory to ToT and re-apply the patch. This is similar to commit-queue behavior in old EWS.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1625119</commentid>
    <comment_count>1</comment_count>
      <attachid>392293</attachid>
    <who name="Aakash Jain">aakash_jain</who>
    <bug_when>2020-03-03 10:25:46 -0800</bug_when>
    <thetext>Created attachment 392293
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1625141</commentid>
    <comment_count>2</comment_count>
      <attachid>392293</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-03-03 11:08:29 -0800</bug_when>
    <thetext>Comment on attachment 392293
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=392293&amp;action=review

&gt; Tools/BuildSlaveSupport/ews-build/factories.py:222
&gt;          self.addStep(RunWebKit1Tests())

Shouldn&apos;t this be WebKit2 tests?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1625250</commentid>
    <comment_count>3</comment_count>
      <attachid>392293</attachid>
    <who name="Aakash Jain">aakash_jain</who>
    <bug_when>2020-03-03 14:20:33 -0800</bug_when>
    <thetext>Comment on attachment 392293
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=392293&amp;action=review

&gt;&gt; Tools/BuildSlaveSupport/ews-build/factories.py:222
&gt;&gt;          self.addStep(RunWebKit1Tests())
&gt; 
&gt; Shouldn&apos;t this be WebKit2 tests?

commit-queue runs WebKit1 tests. I don&apos;t remember the exact reason for that, probably to have coverage on less commonly tested configuration.
In old ews commit-queue uses mac port which uses --dump-render-tree https://trac.webkit.org/browser/webkit/trunk/Tools/Scripts/webkitpy/common/config/ports.py#L174</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1625251</commentid>
    <comment_count>4</comment_count>
    <who name="Aakash Jain">aakash_jain</who>
    <bug_when>2020-03-03 14:20:55 -0800</bug_when>
    <thetext>Committed r257803: &lt;https://trac.webkit.org/changeset/257803&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1625252</commentid>
    <comment_count>5</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-03-03 14:21:17 -0800</bug_when>
    <thetext>&lt;rdar://problem/60012903&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1625278</commentid>
    <comment_count>6</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-03-03 15:19:44 -0800</bug_when>
    <thetext>(In reply to Aakash Jain from comment #3)
&gt; Comment on attachment 392293 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=392293&amp;action=review
&gt; 
&gt; &gt;&gt; Tools/BuildSlaveSupport/ews-build/factories.py:222
&gt; &gt;&gt;          self.addStep(RunWebKit1Tests())
&gt; &gt; 
&gt; &gt; Shouldn&apos;t this be WebKit2 tests?
&gt; 
&gt; commit-queue runs WebKit1 tests. I don&apos;t remember the exact reason for that,
&gt; probably to have coverage on less commonly tested configuration.
&gt; In old ews commit-queue uses mac port which uses --dump-render-tree
&gt; https://trac.webkit.org/browser/webkit/trunk/Tools/Scripts/webkitpy/common/
&gt; config/ports.py#L174

I think we should revisit the reason.

I suspect (although don&apos;t know for certain) the original reason is that WebKit2 tests were poorly gardened when they were first enabled. That is no longer the case, and in fact, it is likely WebKit1 tests which are more poorly gardened.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1625300</commentid>
    <comment_count>7</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2020-03-03 15:57:45 -0800</bug_when>
    <thetext>IIRC they were gardened equally well, but we knew that WebKit2 ran fewer tests because of unimplemented WebKitTestRunner functionality. 

That&apos;s still true as far as functionality goes, but there are now many WebKit2 only features and more code in WebKit2 itself. So I also think that we should switch CQ to WebKit2.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1625306</commentid>
    <comment_count>8</comment_count>
    <who name="Aakash Jain">aakash_jain</who>
    <bug_when>2020-03-03 16:13:57 -0800</bug_when>
    <thetext>(In reply to Alexey Proskuryakov from comment #7)
&gt; IIRC they were gardened equally well, but we knew that WebKit2 ran fewer
&gt; tests because of unimplemented WebKitTestRunner functionality. 
&gt; 
&gt; That&apos;s still true as far as functionality goes, but there are now many WebKit2 only features and more code in WebKit2 itself. So I also think that we should switch CQ to WebKit2.
Switching it in Bug 208544.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>392293</attachid>
            <date>2020-03-03 10:25:46 -0800</date>
            <delta_ts>2020-03-03 11:08:07 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-208521-20200303132545.patch</filename>
            <type>text/plain</type>
            <size>1236</size>
            <attacher name="Aakash Jain">aakash_jain</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI1Nzc4NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDEyIEBACisyMDIwLTAzLTAzICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv
bT4KKworICAgICAgICBjb21taXQtcXVldWUgc2hvdWxkIHVwZGF0ZSB3b3JraW5nIGRpcmVjdG9y
eSBhbmQgcmVhcHBseSBwYXRjaCBqdXN0IGJlZm9yZSBjb21taXRpbmcKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODUyMQorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdz
LWJ1aWxkL2ZhY3Rvcmllcy5weToKKwogMjAyMC0wMy0wMyAgSml0ZW4gTWVodGEgIDxqbWVodGFA
YXBwbGUuY29tPgogCiAgICAgICAgIEFkb3B0IEhUVFAgQWx0ZXJuYXRpdmUgU2VydmljZXMgU3Rv
cmFnZQpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5w
eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9y
aWVzLnB5CShyZXZpc2lvbiAyNTc3ODUpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3Mt
YnVpbGQvZmFjdG9yaWVzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yMjAsMyArMjIwLDcgQEAgY2xh
c3MgQ29tbWl0UXVldWVGYWN0b3J5KEZhY3RvcnkpOgogICAgICAgICBzZWxmLmFkZFN0ZXAoS2ls
bE9sZFByb2Nlc3NlcygpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoVmFsaWRhdGVQYXRjaChhZGRV
UkxzPUZhbHNlLCB2ZXJpZnljcXBsdXM9VHJ1ZSkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChSdW5X
ZWJLaXQxVGVzdHMoKSkKKyAgICAgICAgc2VsZi5hZGRTdGVwKFZhbGlkYXRlUGF0Y2goYWRkVVJM
cz1GYWxzZSwgdmVyaWZ5Y3FwbHVzPVRydWUpKQorICAgICAgICBzZWxmLmFkZFN0ZXAoQ2hlY2tP
dXRTb3VyY2UoKSkKKyAgICAgICAgc2VsZi5hZGRTdGVwKFVwZGF0ZVdvcmtpbmdEaXJlY3Rvcnko
KSkKKyAgICAgICAgc2VsZi5hZGRTdGVwKEFwcGx5UGF0Y2goKSkK
</data>
<flag name="review"
          id="407748"
          type_id="1"
          status="+"
          setter="jbedard"
    />
          </attachment>
      

    </bug>

</bugzilla>