215111 2020-08-03 16:39:54 -0700 [ews] Apple Silicon builder should skip non-relevant patches 2020-08-04 10:42:34 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=214874 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap jbedard ryanhaddad webkit-bug-importer oldest_to_newest 1677491 0 aakash_jain 2020-08-03 16:39:54 -0700 Big Sur builder queue should skip non-relevant patches. This would make the queue more efficient and help the bot(s) on this queue to keep up with incoming patches. To start with, we can consider any patch which change Source directory to be relevant. 1677494 1 405885 aakash_jain 2020-08-03 16:44:54 -0700 Created attachment 405885 Patch 1677496 2 405885 ap 2020-08-03 16:47:43 -0700 Comment on attachment 405885 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405885&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:300 > + 'Source/', Don't we need to include Tools? There is both code that's built, and scripts used for building. 1677510 3 405889 aakash_jain 2020-08-03 17:10:26 -0700 Created attachment 405889 Patch 1677644 4 ews-feeder 2020-08-04 09:44:35 -0700 Committed r265246: <https://trac.webkit.org/changeset/265246> All reviewed patches have been landed. Closing bug and clearing flags on attachment 405889. 1677645 5 webkit-bug-importer 2020-08-04 09:45:24 -0700 <rdar://problem/66527451> 1677668 6 aakash_jain 2020-08-04 10:42:34 -0700 Restarted buildbot to pick up this change. 405885 2020-08-03 16:44:54 -0700 2020-08-03 17:10:23 -0700 Patch bug-215111-20200803194453.patch text/plain 7464 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTIyOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIzIEBACisyMDIwLTA4LTAzICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBBcHBsZSBTaWxpY29uIGJ1aWxkZXIgc2hvdWxkIHNraXAgbm9u LXJlbGV2YW50IHBhdGNoZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxNTExMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weToKKyAg ICAgICAgKEJ1aWxkRmFjdG9yeS5fX2luaXRfXyk6IEFkZGVkIHRoZSBjaGVja1JlbGV2YW5jZSBw YXJhbWV0ZXIuCisgICAgICAgIChtYWNPU0J1aWxkT25seUZhY3RvcnkuX19pbml0X18pOgorICAg ICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXNfdW5pdHRlc3QucHk6 CisgICAgICAgIChUZXN0QnVpbGRGYWN0b3J5LnRlc3RfbWFjb3NfYnVpbGRfb25seV9mYWN0b3J5 KTogVXBkYXRlZCB1bml0LXRlc3QuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1 aWxkL3N0ZXBzLnB5OgorICAgICAgICAoQ2hlY2tQYXRjaFJlbGV2YW5jZSk6IEFkZGVkIHBhdGNo IHJlbGV2YW5jZSBpbmZvIGZvciBCaWcgU3VyLgorICAgICAgICAoQ2hlY2tQYXRjaFJlbGV2YW5j ZS5fcGF0Y2hfaXNfcmVsZXZhbnQpOgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1i dWlsZC9zdGVwc191bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RDaGVja1BhdGNoUmVsZXZhbmNl LnRlc3RfcmVsZXZhbnRfYmlnc3VyX2J1aWxkZXJfcGF0Y2gpOiBEcml2ZS1ieSBmaXggdG8gbWFr ZSB0aGUgY29tcGFyaXNpb24gbW9yZSByb2J1c3QuCisgICAgICAgIChUZXN0Q2hlY2tQYXRjaFJl bGV2YW5jZS50ZXN0X25vbl9yZWxldmFudF9wYXRjaF9vbl92YXJpb3VzX3F1ZXVlcyk6IE1hZGUg dGhlIHVuaXQtdGVzdCBnZW5lcmljIHRvIGNvdmVyIG11bHRpcGxlIHF1ZXVlcy4KKyAgICAgICAg KFRlc3RDaGVja1BhdGNoUmVsZXZhbmNlLnRlc3Rfbm9uX3JlbGV2YW50X3BhdGNoKTogRGVsZXRl ZC4KKwogMjAyMC0wOC0wMyAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4K IAogICAgICAgICBPY2Nhc2lvbmFsIGNyYXNoZXMgd2hlbiBydW5uaW5nIG5lc3RlZCBydW5sb29w cyB3aGlsZSB1c2luZyBVSVdlYlZpZXcKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3 cy1idWlsZC9mYWN0b3JpZXMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weQkocmV2aXNpb24gMjY1MjI5KQorKysgVG9vbHMvQnVp bGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weQkod29ya2luZyBjb3B5KQpAQCAt OTcsOCArOTcsOCBAQCBjbGFzcyBXZWJLaXRQeUZhY3RvcnkoRmFjdG9yeSk6CiBjbGFzcyBCdWls ZEZhY3RvcnkoRmFjdG9yeSk6CiAgICAgc2tpcFVwbG9hZCA9IEZhbHNlCiAKLSAgICBkZWYgX19p bml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249Tm9uZSwgYXJjaGl0ZWN0dXJlcz1O b25lLCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsICoqa3dhcmdzKToK LSAgICAgICAgRmFjdG9yeS5fX2luaXRfXyhzZWxmLCBwbGF0Zm9ybT1wbGF0Zm9ybSwgY29uZmln dXJhdGlvbj1jb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzPWFyY2hpdGVjdHVyZXMsIGJ1aWxk T25seT1GYWxzZSwgdHJpZ2dlcnM9dHJpZ2dlcnMsIGFkZGl0aW9uYWxBcmd1bWVudHM9YWRkaXRp b25hbEFyZ3VtZW50cykKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3Vy YXRpb249Tm9uZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFs QXJndW1lbnRzPU5vbmUsIGNoZWNrUmVsZXZhbmNlPUZhbHNlLCAqKmt3YXJncyk6CisgICAgICAg IEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm09cGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249 Y29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcz1hcmNoaXRlY3R1cmVzLCBidWlsZE9ubHk9RmFs c2UsIHRyaWdnZXJzPXRyaWdnZXJzLCBhZGRpdGlvbmFsQXJndW1lbnRzPWFkZGl0aW9uYWxBcmd1 bWVudHMsIGNoZWNrUmVsZXZhbmNlPWNoZWNrUmVsZXZhbmNlKQogICAgICAgICBzZWxmLmFkZFN0 ZXAoS2lsbE9sZFByb2Nlc3NlcygpKQogICAgICAgICBpZiBwbGF0Zm9ybSA9PSAnZ3RrJzoKICAg ICAgICAgICAgIHNlbGYuYWRkU3RlcChJbnN0YWxsR3RrRGVwZW5kZW5jaWVzKCkpCkBAIC0xNzIs NiArMTcyLDkgQEAgY2xhc3MgbWFjT1NCdWlsZEZhY3RvcnkoQnVpbGRGYWN0b3J5KToKIGNsYXNz IG1hY09TQnVpbGRPbmx5RmFjdG9yeShCdWlsZEZhY3RvcnkpOgogICAgIHNraXBVcGxvYWQgPSBU cnVlCiAKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249Tm9u ZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRz PU5vbmUsIGNoZWNrUmVsZXZhbmNlPVRydWUsICoqa3dhcmdzKToKKyAgICAgICAgc3VwZXIobWFj T1NCdWlsZE9ubHlGYWN0b3J5LCBzZWxmKS5fX2luaXRfXyhwbGF0Zm9ybT1wbGF0Zm9ybSwgY29u ZmlndXJhdGlvbj1jb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzPWFyY2hpdGVjdHVyZXMsIHRy aWdnZXJzPXRyaWdnZXJzLCBhZGRpdGlvbmFsQXJndW1lbnRzPWFkZGl0aW9uYWxBcmd1bWVudHMs IGNoZWNrUmVsZXZhbmNlPWNoZWNrUmVsZXZhbmNlLCAqKmt3YXJncykKKwogCiBjbGFzcyB3YXRj aE9TQnVpbGRGYWN0b3J5KEJ1aWxkRmFjdG9yeSk6CiAgICAgc2tpcFVwbG9hZCA9IFRydWUKSW5k ZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXNfdW5pdHRlc3Qu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rv cmllc191bml0dGVzdC5weQkocmV2aXNpb24gMjY1MjI5KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAt MTg3LDYgKzE4Nyw3IEBAIGNsYXNzIFRlc3RCdWlsZEZhY3RvcnkoVGVzdENhc2UpOgogICAgICAg ICBmYWN0b3J5ID0gZmFjdG9yaWVzLm1hY09TQnVpbGRPbmx5RmFjdG9yeShwbGF0Zm9ybT0nbWFj LWJpZ3N1cicsIGNvbmZpZ3VyYXRpb249J3JlbGVhc2UnLCBhcmNoaXRlY3R1cmVzPVsiYXJtNjQi XSkKICAgICAgICAgc2VsZi5hc3NlcnRCdWlsZFN0ZXBzKGZhY3Rvcnkuc3RlcHMsIFsKICAgICAg ICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLkNvbmZpZ3VyZUJ1aWxkLCBwbGF0Zm9ybT0n bWFjLWJpZ3N1cicsIGNvbmZpZ3VyYXRpb249J3JlbGVhc2UnLCBhcmNoaXRlY3R1cmVzPVsiYXJt NjQiXSwgYnVpbGRPbmx5PUZhbHNlLCB0cmlnZ2Vycz1Ob25lLCByZW1vdGVzPU5vbmUsIGFkZGl0 aW9uYWxBcmd1bWVudHM9Tm9uZSksCisgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVw cy5DaGVja1BhdGNoUmVsZXZhbmNlKSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0 ZXBzLlZhbGlkYXRlUGF0Y2gpLAogICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMu UHJpbnRDb25maWd1cmF0aW9uKSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBz LkNoZWNrT3V0U291cmNlKSwKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWls ZC9zdGVwcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVp bGQvc3RlcHMucHkJKHJldmlzaW9uIDI2NTIyOSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1idWlsZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtMjk2LDYgKzI5Niw5IEBAIGNs YXNzIENoZWNrUGF0Y2hSZWxldmFuY2UoYnVpbGRzdGVwLkJ1aWwKICAgICAgICAgJ1Rvb2xzJywK ICAgICBdCiAKKyAgICBiaWdfc3VyX2J1aWxkZXJfcGF0aHMgPSBbCisgICAgICAgICdTb3VyY2Uv JywKKyAgICBdCiAgICAgd2Via2l0cHlfcGF0aHMgPSBbCiAgICAgICAgICdUb29scy9TY3JpcHRz L3dlYmtpdHB5JywKICAgICAgICAgJ1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzJywKQEAgLTMwMyw2 ICszMDYsNyBAQCBjbGFzcyBDaGVja1BhdGNoUmVsZXZhbmNlKGJ1aWxkc3RlcC5CdWlsCiAKICAg ICBncm91cF90b19wYXRoc19tYXBwaW5nID0gewogICAgICAgICAnYmluZGluZ3MnOiBiaW5kaW5n c19wYXRocywKKyAgICAgICAgJ2JpZ3N1ci1yZWxlYXNlLWJ1aWxkJzogYmlnX3N1cl9idWlsZGVy X3BhdGhzLAogICAgICAgICAnc2VydmljZXMtZXdzJzogc2VydmljZXNfcGF0aHMsCiAgICAgICAg ICdqc2MnOiBqc2NfcGF0aHMsCiAgICAgICAgICd3ZWJraXRweSc6IHdlYmtpdHB5X3BhdGhzLApA QCAtMzExLDcgKzMxNSw3IEBAIGNsYXNzIENoZWNrUGF0Y2hSZWxldmFuY2UoYnVpbGRzdGVwLkJ1 aWwKICAgICB9CiAKICAgICBkZWYgX3BhdGNoX2lzX3JlbGV2YW50KHNlbGYsIHBhdGNoLCBidWls ZGVyTmFtZSk6Ci0gICAgICAgIGdyb3VwID0gW2dyb3VwIGZvciBncm91cCBpbiBzZWxmLmdyb3Vw X3RvX3BhdGhzX21hcHBpbmcua2V5cygpIGlmIGdyb3VwIGluIGJ1aWxkZXJOYW1lLmxvd2VyKCld CisgICAgICAgIGdyb3VwID0gW2dyb3VwIGZvciBncm91cCBpbiBzZWxmLmdyb3VwX3RvX3BhdGhz X21hcHBpbmcua2V5cygpIGlmIGdyb3VwLmxvd2VyKCkgaW4gYnVpbGRlck5hbWUubG93ZXIoKV0K ICAgICAgICAgaWYgbm90IGdyb3VwOgogICAgICAgICAgICAgIyBUaGlzIGJ1aWxkZXIgZG9lc24n dCBoYXZlIHBhdGhzIGRlZmluZWQsIGFsbCBwYXRjaGVzIGFyZSByZWxldmFudC4KICAgICAgICAg ICAgIHJldHVybiBUcnVlCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQv c3RlcHNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv ZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNjUyMjkpCisrKyBUb29scy9C dWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29w eSkKQEAgLTIyOTcsNiArMjI5NywxMyBAQCBjbGFzcyBUZXN0Q2hlY2tQYXRjaFJlbGV2YW5jZShC dWlsZFN0ZXBNCiAgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9U1VDQ0VTUywgc3Rh dGVfc3RyaW5nPSdQYXRjaCBjb250YWlucyByZWxldmFudCBjaGFuZ2VzJykKICAgICAgICAgcmV0 dXJuIHNlbGYucnVuU3RlcCgpCiAKKyAgICBkZWYgdGVzdF9yZWxldmFudF9iaWdzdXJfYnVpbGRl cl9wYXRjaChzZWxmKToKKyAgICAgICAgQ2hlY2tQYXRjaFJlbGV2YW5jZS5fZ2V0X3BhdGNoID0g bGFtYmRhIHg6ICdTYW1wbGUgcGF0Y2g7IGZpbGU6IFNvdXJjZS94eXonCisgICAgICAgIHNlbGYu c2V0dXBTdGVwKENoZWNrUGF0Y2hSZWxldmFuY2UoKSkKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0 eSgnYnVpbGRlcm5hbWUnLCAnbWFjT1MtQmlnU3VyLVJlbGVhc2UtQnVpbGQtRVdTJykKKyAgICAg ICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1TVUNDRVNTLCBzdGF0ZV9zdHJpbmc9J1BhdGNo IGNvbnRhaW5zIHJlbGV2YW50IGNoYW5nZXMnKQorICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVw KCkKKwogICAgIGRlZiB0ZXN0X3JlbGV2YW50X3dpbmRvd3Nfd2sxX3BhdGNoKHNlbGYpOgogICAg ICAgICBDaGVja1BhdGNoUmVsZXZhbmNlLl9nZXRfcGF0Y2ggPSBsYW1iZGEgeDogJ1NhbXBsZSBw YXRjaDsgZmlsZTogU291cmNlL1dlYktpdExlZ2FjeScKICAgICAgICAgc2VsZi5zZXR1cFN0ZXAo Q2hlY2tQYXRjaFJlbGV2YW5jZSgpKQpAQCAtMjMzMSwxMyArMjMzOCwxNiBAQCBjbGFzcyBUZXN0 Q2hlY2tQYXRjaFJlbGV2YW5jZShCdWlsZFN0ZXBNCiAgICAgICAgICAgICByYyA9IHNlbGYucnVu U3RlcCgpCiAgICAgICAgIHJldHVybiByYwogCi0gICAgZGVmIHRlc3Rfbm9uX3JlbGV2YW50X3Bh dGNoKHNlbGYpOgorICAgIGRlZiB0ZXN0X25vbl9yZWxldmFudF9wYXRjaF9vbl92YXJpb3VzX3F1 ZXVlcyhzZWxmKToKICAgICAgICAgQ2hlY2tQYXRjaFJlbGV2YW5jZS5fZ2V0X3BhdGNoID0gbGFt YmRhIHg6ICdTYW1wbGUgcGF0Y2gnCi0gICAgICAgIHNlbGYuc2V0dXBTdGVwKENoZWNrUGF0Y2hS ZWxldmFuY2UoKSkKLSAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnYnVpbGRlcm5hbWUnLCAnSlND LVRlc3RzLUVXUycpCi0gICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3BhdGNoX2lkJywgJzEyMzQn KQotICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PUZBSUxVUkUsIHN0YXRlX3N0cmlu Zz0nUGF0Y2ggZG9lc25cJ3QgaGF2ZSByZWxldmFudCBjaGFuZ2VzJykKLSAgICAgICAgcmV0dXJu IHNlbGYucnVuU3RlcCgpCisgICAgICAgIHF1ZXVlcyA9IFsnQmluZGluZ3MtVGVzdHMtRVdTJywg J0pTQy1UZXN0cy1FV1MnLCAnbWFjT1MtQmlnU3VyLVJlbGVhc2UtQnVpbGQtRVdTJywKKyAgICAg ICAgICAgICAgICAgICdtYWNPUy1Nb2phdmUtRGVidWctV0sxLVRlc3RzLUVXUycsICdTZXJ2aWNl cy1FV1MnLCAnV2ViS2l0UHktVGVzdHMtRVdTJ10KKyAgICAgICAgZm9yIHF1ZXVlIGluIHF1ZXVl czoKKyAgICAgICAgICAgIHNlbGYuc2V0dXBTdGVwKENoZWNrUGF0Y2hSZWxldmFuY2UoKSkKKyAg ICAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2J1aWxkZXJuYW1lJywgcXVldWUpCisgICAgICAg ICAgICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PUZBSUxVUkUsIHN0YXRlX3N0cmluZz0nUGF0 Y2ggZG9lc25cJ3QgaGF2ZSByZWxldmFudCBjaGFuZ2VzJykKKyAgICAgICAgICAgIHJjID0gc2Vs Zi5ydW5TdGVwKCkKKyAgICAgICAgcmV0dXJuIHJjCiAKIAogY2xhc3MgVGVzdEFyY2hpdmVCdWls dFByb2R1Y3QoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToK 405889 2020-08-03 17:10:26 -0700 2020-08-04 09:44:36 -0700 Patch bug-215111-20200803201025.patch text/plain 7484 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTIyOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIzIEBACisyMDIwLTA4LTAzICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBBcHBsZSBTaWxpY29uIGJ1aWxkZXIgc2hvdWxkIHNraXAgbm9u LXJlbGV2YW50IHBhdGNoZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxNTExMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weToKKyAg ICAgICAgKEJ1aWxkRmFjdG9yeS5fX2luaXRfXyk6IEFkZGVkIHRoZSBjaGVja1JlbGV2YW5jZSBw YXJhbWV0ZXIuCisgICAgICAgIChtYWNPU0J1aWxkT25seUZhY3RvcnkuX19pbml0X18pOgorICAg ICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXNfdW5pdHRlc3QucHk6 CisgICAgICAgIChUZXN0QnVpbGRGYWN0b3J5LnRlc3RfbWFjb3NfYnVpbGRfb25seV9mYWN0b3J5 KTogVXBkYXRlZCB1bml0LXRlc3QuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1 aWxkL3N0ZXBzLnB5OgorICAgICAgICAoQ2hlY2tQYXRjaFJlbGV2YW5jZSk6IEFkZGVkIHBhdGNo IHJlbGV2YW5jZSBpbmZvIGZvciBCaWcgU3VyLgorICAgICAgICAoQ2hlY2tQYXRjaFJlbGV2YW5j ZS5fcGF0Y2hfaXNfcmVsZXZhbnQpOgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1i dWlsZC9zdGVwc191bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RDaGVja1BhdGNoUmVsZXZhbmNl LnRlc3RfcmVsZXZhbnRfYmlnc3VyX2J1aWxkZXJfcGF0Y2gpOiBEcml2ZS1ieSBmaXggdG8gbWFr ZSB0aGUgY29tcGFyaXNpb24gbW9yZSByb2J1c3QuCisgICAgICAgIChUZXN0Q2hlY2tQYXRjaFJl bGV2YW5jZS50ZXN0X25vbl9yZWxldmFudF9wYXRjaF9vbl92YXJpb3VzX3F1ZXVlcyk6IE1hZGUg dGhlIHVuaXQtdGVzdCBnZW5lcmljIHRvIGNvdmVyIG11bHRpcGxlIHF1ZXVlcy4KKyAgICAgICAg KFRlc3RDaGVja1BhdGNoUmVsZXZhbmNlLnRlc3Rfbm9uX3JlbGV2YW50X3BhdGNoKTogRGVsZXRl ZC4KKwogMjAyMC0wOC0wMyAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4K IAogICAgICAgICBPY2Nhc2lvbmFsIGNyYXNoZXMgd2hlbiBydW5uaW5nIG5lc3RlZCBydW5sb29w cyB3aGlsZSB1c2luZyBVSVdlYlZpZXcKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3 cy1idWlsZC9mYWN0b3JpZXMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weQkocmV2aXNpb24gMjY1MjI5KQorKysgVG9vbHMvQnVp bGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weQkod29ya2luZyBjb3B5KQpAQCAt OTcsOCArOTcsOCBAQCBjbGFzcyBXZWJLaXRQeUZhY3RvcnkoRmFjdG9yeSk6CiBjbGFzcyBCdWls ZEZhY3RvcnkoRmFjdG9yeSk6CiAgICAgc2tpcFVwbG9hZCA9IEZhbHNlCiAKLSAgICBkZWYgX19p bml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249Tm9uZSwgYXJjaGl0ZWN0dXJlcz1O b25lLCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsICoqa3dhcmdzKToK LSAgICAgICAgRmFjdG9yeS5fX2luaXRfXyhzZWxmLCBwbGF0Zm9ybT1wbGF0Zm9ybSwgY29uZmln dXJhdGlvbj1jb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzPWFyY2hpdGVjdHVyZXMsIGJ1aWxk T25seT1GYWxzZSwgdHJpZ2dlcnM9dHJpZ2dlcnMsIGFkZGl0aW9uYWxBcmd1bWVudHM9YWRkaXRp b25hbEFyZ3VtZW50cykKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3Vy YXRpb249Tm9uZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFs QXJndW1lbnRzPU5vbmUsIGNoZWNrUmVsZXZhbmNlPUZhbHNlLCAqKmt3YXJncyk6CisgICAgICAg IEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm09cGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249 Y29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcz1hcmNoaXRlY3R1cmVzLCBidWlsZE9ubHk9RmFs c2UsIHRyaWdnZXJzPXRyaWdnZXJzLCBhZGRpdGlvbmFsQXJndW1lbnRzPWFkZGl0aW9uYWxBcmd1 bWVudHMsIGNoZWNrUmVsZXZhbmNlPWNoZWNrUmVsZXZhbmNlKQogICAgICAgICBzZWxmLmFkZFN0 ZXAoS2lsbE9sZFByb2Nlc3NlcygpKQogICAgICAgICBpZiBwbGF0Zm9ybSA9PSAnZ3RrJzoKICAg ICAgICAgICAgIHNlbGYuYWRkU3RlcChJbnN0YWxsR3RrRGVwZW5kZW5jaWVzKCkpCkBAIC0xNzIs NiArMTcyLDkgQEAgY2xhc3MgbWFjT1NCdWlsZEZhY3RvcnkoQnVpbGRGYWN0b3J5KToKIGNsYXNz IG1hY09TQnVpbGRPbmx5RmFjdG9yeShCdWlsZEZhY3RvcnkpOgogICAgIHNraXBVcGxvYWQgPSBU cnVlCiAKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249Tm9u ZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRz PU5vbmUsIGNoZWNrUmVsZXZhbmNlPVRydWUsICoqa3dhcmdzKToKKyAgICAgICAgc3VwZXIobWFj T1NCdWlsZE9ubHlGYWN0b3J5LCBzZWxmKS5fX2luaXRfXyhwbGF0Zm9ybT1wbGF0Zm9ybSwgY29u ZmlndXJhdGlvbj1jb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzPWFyY2hpdGVjdHVyZXMsIHRy aWdnZXJzPXRyaWdnZXJzLCBhZGRpdGlvbmFsQXJndW1lbnRzPWFkZGl0aW9uYWxBcmd1bWVudHMs IGNoZWNrUmVsZXZhbmNlPWNoZWNrUmVsZXZhbmNlLCAqKmt3YXJncykKKwogCiBjbGFzcyB3YXRj aE9TQnVpbGRGYWN0b3J5KEJ1aWxkRmFjdG9yeSk6CiAgICAgc2tpcFVwbG9hZCA9IFRydWUKSW5k ZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXNfdW5pdHRlc3Qu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rv cmllc191bml0dGVzdC5weQkocmV2aXNpb24gMjY1MjI5KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAt MTg3LDYgKzE4Nyw3IEBAIGNsYXNzIFRlc3RCdWlsZEZhY3RvcnkoVGVzdENhc2UpOgogICAgICAg ICBmYWN0b3J5ID0gZmFjdG9yaWVzLm1hY09TQnVpbGRPbmx5RmFjdG9yeShwbGF0Zm9ybT0nbWFj LWJpZ3N1cicsIGNvbmZpZ3VyYXRpb249J3JlbGVhc2UnLCBhcmNoaXRlY3R1cmVzPVsiYXJtNjQi XSkKICAgICAgICAgc2VsZi5hc3NlcnRCdWlsZFN0ZXBzKGZhY3Rvcnkuc3RlcHMsIFsKICAgICAg ICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLkNvbmZpZ3VyZUJ1aWxkLCBwbGF0Zm9ybT0n bWFjLWJpZ3N1cicsIGNvbmZpZ3VyYXRpb249J3JlbGVhc2UnLCBhcmNoaXRlY3R1cmVzPVsiYXJt NjQiXSwgYnVpbGRPbmx5PUZhbHNlLCB0cmlnZ2Vycz1Ob25lLCByZW1vdGVzPU5vbmUsIGFkZGl0 aW9uYWxBcmd1bWVudHM9Tm9uZSksCisgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVw cy5DaGVja1BhdGNoUmVsZXZhbmNlKSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0 ZXBzLlZhbGlkYXRlUGF0Y2gpLAogICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMu UHJpbnRDb25maWd1cmF0aW9uKSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBz LkNoZWNrT3V0U291cmNlKSwKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWls ZC9zdGVwcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVp bGQvc3RlcHMucHkJKHJldmlzaW9uIDI2NTIyOSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1idWlsZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtMjk2LDYgKzI5NiwxMCBAQCBj bGFzcyBDaGVja1BhdGNoUmVsZXZhbmNlKGJ1aWxkc3RlcC5CdWlsCiAgICAgICAgICdUb29scycs CiAgICAgXQogCisgICAgYmlnX3N1cl9idWlsZGVyX3BhdGhzID0gWworICAgICAgICAnU291cmNl LycsCisgICAgICAgICdUb29scy8nLAorICAgIF0KICAgICB3ZWJraXRweV9wYXRocyA9IFsKICAg ICAgICAgJ1Rvb2xzL1NjcmlwdHMvd2Via2l0cHknLAogICAgICAgICAnVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMnLApAQCAtMzAzLDYgKzMwNyw3IEBAIGNsYXNzIENoZWNrUGF0Y2hSZWxldmFuY2Uo YnVpbGRzdGVwLkJ1aWwKIAogICAgIGdyb3VwX3RvX3BhdGhzX21hcHBpbmcgPSB7CiAgICAgICAg ICdiaW5kaW5ncyc6IGJpbmRpbmdzX3BhdGhzLAorICAgICAgICAnYmlnc3VyLXJlbGVhc2UtYnVp bGQnOiBiaWdfc3VyX2J1aWxkZXJfcGF0aHMsCiAgICAgICAgICdzZXJ2aWNlcy1ld3MnOiBzZXJ2 aWNlc19wYXRocywKICAgICAgICAgJ2pzYyc6IGpzY19wYXRocywKICAgICAgICAgJ3dlYmtpdHB5 Jzogd2Via2l0cHlfcGF0aHMsCkBAIC0zMTEsNyArMzE2LDcgQEAgY2xhc3MgQ2hlY2tQYXRjaFJl bGV2YW5jZShidWlsZHN0ZXAuQnVpbAogICAgIH0KIAogICAgIGRlZiBfcGF0Y2hfaXNfcmVsZXZh bnQoc2VsZiwgcGF0Y2gsIGJ1aWxkZXJOYW1lKToKLSAgICAgICAgZ3JvdXAgPSBbZ3JvdXAgZm9y IGdyb3VwIGluIHNlbGYuZ3JvdXBfdG9fcGF0aHNfbWFwcGluZy5rZXlzKCkgaWYgZ3JvdXAgaW4g YnVpbGRlck5hbWUubG93ZXIoKV0KKyAgICAgICAgZ3JvdXAgPSBbZ3JvdXAgZm9yIGdyb3VwIGlu IHNlbGYuZ3JvdXBfdG9fcGF0aHNfbWFwcGluZy5rZXlzKCkgaWYgZ3JvdXAubG93ZXIoKSBpbiBi dWlsZGVyTmFtZS5sb3dlcigpXQogICAgICAgICBpZiBub3QgZ3JvdXA6CiAgICAgICAgICAgICAj IFRoaXMgYnVpbGRlciBkb2Vzbid0IGhhdmUgcGF0aHMgZGVmaW5lZCwgYWxsIHBhdGNoZXMgYXJl IHJlbGV2YW50LgogICAgICAgICAgICAgcmV0dXJuIFRydWUKSW5kZXg6IFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkJKHJldmlzaW9u IDI2NTIyOSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0 dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMjI5Nyw2ICsyMjk3LDEzIEBAIGNsYXNzIFRlc3RD aGVja1BhdGNoUmVsZXZhbmNlKEJ1aWxkU3RlcE0KICAgICAgICAgc2VsZi5leHBlY3RPdXRjb21l KHJlc3VsdD1TVUNDRVNTLCBzdGF0ZV9zdHJpbmc9J1BhdGNoIGNvbnRhaW5zIHJlbGV2YW50IGNo YW5nZXMnKQogICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKIAorICAgIGRlZiB0ZXN0X3Jl bGV2YW50X2JpZ3N1cl9idWlsZGVyX3BhdGNoKHNlbGYpOgorICAgICAgICBDaGVja1BhdGNoUmVs ZXZhbmNlLl9nZXRfcGF0Y2ggPSBsYW1iZGEgeDogJ1NhbXBsZSBwYXRjaDsgZmlsZTogU291cmNl L3h5eicKKyAgICAgICAgc2VsZi5zZXR1cFN0ZXAoQ2hlY2tQYXRjaFJlbGV2YW5jZSgpKQorICAg ICAgICBzZWxmLnNldFByb3BlcnR5KCdidWlsZGVybmFtZScsICdtYWNPUy1CaWdTdXItUmVsZWFz ZS1CdWlsZC1FV1MnKQorICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PVNVQ0NFU1Ms IHN0YXRlX3N0cmluZz0nUGF0Y2ggY29udGFpbnMgcmVsZXZhbnQgY2hhbmdlcycpCisgICAgICAg IHJldHVybiBzZWxmLnJ1blN0ZXAoKQorCiAgICAgZGVmIHRlc3RfcmVsZXZhbnRfd2luZG93c193 azFfcGF0Y2goc2VsZik6CiAgICAgICAgIENoZWNrUGF0Y2hSZWxldmFuY2UuX2dldF9wYXRjaCA9 IGxhbWJkYSB4OiAnU2FtcGxlIHBhdGNoOyBmaWxlOiBTb3VyY2UvV2ViS2l0TGVnYWN5JwogICAg ICAgICBzZWxmLnNldHVwU3RlcChDaGVja1BhdGNoUmVsZXZhbmNlKCkpCkBAIC0yMzMxLDEzICsy MzM4LDE2IEBAIGNsYXNzIFRlc3RDaGVja1BhdGNoUmVsZXZhbmNlKEJ1aWxkU3RlcE0KICAgICAg ICAgICAgIHJjID0gc2VsZi5ydW5TdGVwKCkKICAgICAgICAgcmV0dXJuIHJjCiAKLSAgICBkZWYg dGVzdF9ub25fcmVsZXZhbnRfcGF0Y2goc2VsZik6CisgICAgZGVmIHRlc3Rfbm9uX3JlbGV2YW50 X3BhdGNoX29uX3ZhcmlvdXNfcXVldWVzKHNlbGYpOgogICAgICAgICBDaGVja1BhdGNoUmVsZXZh bmNlLl9nZXRfcGF0Y2ggPSBsYW1iZGEgeDogJ1NhbXBsZSBwYXRjaCcKLSAgICAgICAgc2VsZi5z ZXR1cFN0ZXAoQ2hlY2tQYXRjaFJlbGV2YW5jZSgpKQotICAgICAgICBzZWxmLnNldFByb3BlcnR5 KCdidWlsZGVybmFtZScsICdKU0MtVGVzdHMtRVdTJykKLSAgICAgICAgc2VsZi5zZXRQcm9wZXJ0 eSgncGF0Y2hfaWQnLCAnMTIzNCcpCi0gICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9 RkFJTFVSRSwgc3RhdGVfc3RyaW5nPSdQYXRjaCBkb2VzblwndCBoYXZlIHJlbGV2YW50IGNoYW5n ZXMnKQotICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKKyAgICAgICAgcXVldWVzID0gWydC aW5kaW5ncy1UZXN0cy1FV1MnLCAnSlNDLVRlc3RzLUVXUycsICdtYWNPUy1CaWdTdXItUmVsZWFz ZS1CdWlsZC1FV1MnLAorICAgICAgICAgICAgICAgICAgJ21hY09TLU1vamF2ZS1EZWJ1Zy1XSzEt VGVzdHMtRVdTJywgJ1NlcnZpY2VzLUVXUycsICdXZWJLaXRQeS1UZXN0cy1FV1MnXQorICAgICAg ICBmb3IgcXVldWUgaW4gcXVldWVzOgorICAgICAgICAgICAgc2VsZi5zZXR1cFN0ZXAoQ2hlY2tQ YXRjaFJlbGV2YW5jZSgpKQorICAgICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnYnVpbGRlcm5h bWUnLCBxdWV1ZSkKKyAgICAgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9RkFJTFVS RSwgc3RhdGVfc3RyaW5nPSdQYXRjaCBkb2VzblwndCBoYXZlIHJlbGV2YW50IGNoYW5nZXMnKQor ICAgICAgICAgICAgcmMgPSBzZWxmLnJ1blN0ZXAoKQorICAgICAgICByZXR1cm4gcmMKIAogCiBj bGFzcyBUZXN0QXJjaGl2ZUJ1aWx0UHJvZHVjdChCdWlsZFN0ZXBNaXhpbkFkZGl0aW9ucywgdW5p dHRlc3QuVGVzdENhc2UpOgo=