182753 2018-02-13 16:32:28 -0800 [Tools] --wincairo should imply --64-bit by default. 2018-02-14 12:32:53 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ross.kirsling ross.kirsling achristensen commit-queue dbates don.olmstead ews-watchlist glenn lforschler pvollan webkit-bug-importer oldest_to_newest 1398847 0 ross.kirsling 2018-02-13 16:32:28 -0800 [Tools] --wincairo should imply --64-bit by default. 1398848 1 333743 ross.kirsling 2018-02-13 16:33:22 -0800 Created attachment 333743 Patch 1398858 2 333749 ross.kirsling 2018-02-13 16:57:37 -0800 Created attachment 333749 Patch 1398952 3 333749 dbates 2018-02-13 21:45:51 -0800 Comment on attachment 333749 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=333749&action=review > Tools/ChangeLog:3 > + [Tools] --wincairo should imply --64-bit by default. Shouldn’t the tools query the architecture by default? I mean, the WinCairo 64 Bit Release builder does not explicitly pass —64-bit (*) to build-webkit and it builds for 64-bit. I take it from the existence of this patch that the default build architecture of the bot was modified by running script webkit-configuration. (*) <https://build.webkit.org/builders/WinCairo%2064-Bit%20Release/builds/10929/steps/compile-webkit/logs/stdio> > Tools/Scripts/webkitdirs.pm:145 > +my $isExplicit32Bit; Maybe a better name for this would be willBuildFor32Bit or willBuildFor32BitArchitecture and similarly rename the functions below. > Tools/Scripts/webkitdirs.pm:1258 > + $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit") || (isWinCairo() && !isExplicit32Bit()); The parentheses are not necessary by operator precedence [1]. [1] <https://perldoc.perl.org/perlop.html#Operator-Precedence-and-Associativity> 1398953 4 dbates 2018-02-13 21:48:45 -0800 (In reply to Daniel Bates from comment #3) > Comment on attachment 333749 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=333749&action=review > > > Tools/ChangeLog:3 > > + [Tools] --wincairo should imply --64-bit by default. > > Shouldn’t the tools query the architecture by default? I mean, the WinCairo > 64 Bit Release builder does not explicitly pass —64-bit (*) to build-webkit > and it builds for 64-bit. I take it from the existence of this patch that > the default build architecture of the bot was modified by running script > webkit-configuration. > *set-webkit-configuration 1399173 5 ross.kirsling 2018-02-14 11:12:44 -0800 (In reply to Daniel Bates from comment #3) > Comment on attachment 333749 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=333749&action=review > > > Tools/ChangeLog:3 > > + [Tools] --wincairo should imply --64-bit by default. > > Shouldn’t the tools query the architecture by default? I mean, the WinCairo > 64 Bit Release builder does not explicitly pass —64-bit (*) to build-webkit > and it builds for 64-bit. I take it from the existence of this patch that > the default build architecture of the bot was modified by running script > webkit-configuration. > > (*) > <https://build.webkit.org/builders/WinCairo%2064-Bit%20Release/builds/10929/ > steps/compile-webkit/logs/stdio> Thanks for pointing this out! Experimenting locally, it seems that it's not about `set-webkit-configuration`, but rather that x64 is correctly identified when compiling with Ninja. It's when `--no-ninja` is specified that the script checks `isWin64()`: https://github.com/WebKit/webkit/blob/master/Tools/Scripts/webkitdirs.pm#L2138-L2148 So fixing the definition of `isWin64()` is still worthwhile, but the reason is slightly more specific than I realized. > > Tools/Scripts/webkitdirs.pm:1258 > > + $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit") || (isWinCairo() && !isExplicit32Bit()); > > The parentheses are not necessary by operator precedence [1]. > > [1] > <https://perldoc.perl.org/perlop.html#Operator-Precedence-and-Associativity> Whoops, thought this was a style guide requirement. 1399198 6 333825 ross.kirsling 2018-02-14 11:43:58 -0800 Created attachment 333825 Patch for landing 1399215 7 commit-queue 2018-02-14 12:31:21 -0800 The commit-queue encountered the following flaky tests while processing attachment 333825: imported/w3c/web-platform-tests/WebCryptoAPI/sign_verify/rsa_pkcs.worker.html bug 182803 (author: jiewen_tan@apple.com) The commit-queue is continuing to process your patch. 1399216 8 333825 commit-queue 2018-02-14 12:31:55 -0800 Comment on attachment 333825 Patch for landing Clearing flags on attachment: 333825 Committed r228480: <https://trac.webkit.org/changeset/228480> 1399217 9 commit-queue 2018-02-14 12:31:57 -0800 All reviewed patches have been landed. Closing bug. 1399218 10 webkit-bug-importer 2018-02-14 12:32:53 -0800 <rdar://problem/37544518> 333743 2018-02-13 16:33:22 -0800 2018-02-13 16:57:35 -0800 Patch bug-182753-20180213163325.patch text/plain 3508 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NDMyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODJkYzRjYjAyZjUzZTUxOTE4ZWVkNjQ2NzEzMTcyMTkx MGFlOWUzNS4uMmM4M2NhZTQyNDgzN2YzYzZmMDU1Y2NlMzk2MDAxZTQ0MzAyZDJmZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE4LTAyLTEzICBSb3NzIEtpcnNsaW5nICA8cm9zcy5raXJzbGluZ0Bzb255LmNvbT4K KworICAgICAgICBbVG9vbHNdIC0td2luY2Fpcm8gc2hvdWxkIGltcGx5IC0tNjQtYml0IGJ5IGRl ZmF1bHQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x ODI3NTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKGRldGVybWluZVBhc3NlZEFyY2hpdGVj dHVyZSk6CisgICAgICAgIChpc0V4cGxpY2l0MzJCaXQpOgorICAgICAgICAoZGV0ZXJtaW5lSXNF eHBsaWNpdDMyQml0KToKKyAgICAgICAgKGRldGVybWluZUlzV2luNjQpOgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weToKKyAgICAgICAgKFdpbkNhaXJv UG9ydC5idWlsZF93ZWJraXRfY29tbWFuZCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9w b3J0L3dpbi5weToKKyAgICAgICAgKFdpbkNhaXJvUG9ydCk6CisKIDIwMTgtMDItMTMgIERvbiBP bG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAogICAgICAgICBbQ01ha2VdIE1ha2Ug V2ViQ29yZSBoZWFkZXJzIGNvcGllcwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRk aXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IDg0MjhkNTRkYWVmMDY0 N2RlYTk3OWFiZDRhM2QxOTM3NGI2MDhiYjcuLjgyZjVjMTY1MjU1YzkxOThjYzkyNWQ2NTM5YzVi YjgxMWQ2NGY4M2YgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTE0Myw2ICsxNDMsNyBAQCBteSAkZ2Vu ZXJhdGVEc3ltOwogbXkgJGlzQ01ha2VCdWlsZDsKIG15ICRpc0dlbmVyYXRlUHJvamVjdE9ubHk7 CiBteSAkaXNXaW42NDsKK215ICRpc0V4cGxpY2l0MzJCaXQ7CiBteSAkaXNJbnNwZWN0b3JGcm9u dGVuZDsKIG15ICRwb3J0TmFtZTsKIG15ICRzaG91bGRVc2VHdWFyZE1hbGxvYzsKQEAgLTkzNSw3 ICs5MzYsNyBAQCBzdWIgZGV0ZXJtaW5lUGFzc2VkQXJjaGl0ZWN0dXJlCiAgICAgJHNlYXJjaGVk Rm9yUGFzc2VkQXJjaGl0ZWN0dXJlID0gMTsKIAogICAgICRwYXNzZWRBcmNoaXRlY3R1cmUgPSB1 bmRlZjsKLSAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLTMyLWJp dCIpKSB7CisgICAgaWYgKGlzRXhwbGljaXQzMkJpdCgpKSB7CiAgICAgICAgIGlmIChpc0FwcGxl Q29jb2FXZWJLaXQoKSkgewogICAgICAgICAgICAgIyBQTEFURk9STV9JT1M6IERvbid0IHJ1biBg YXJjaGAgY29tbWFuZCBpbnNpZGUgU2ltdWxhdG9yIGVudmlyb25tZW50CiAgICAgICAgICAgICBs b2NhbCAlRU5WID0gJUVOVjsKQEAgLTEyMzMsNiArMTIzNCwxOCBAQCBzdWIgaXNXaW5DYWlybygp CiAgICAgcmV0dXJuIHBvcnROYW1lKCkgZXEgV2luQ2Fpcm87CiB9CiAKK3N1YiBpc0V4cGxpY2l0 MzJCaXQoKQoreworICAgIGRldGVybWluZUlzRXhwbGljaXQzMkJpdCgpOworICAgIHJldHVybiAk aXNFeHBsaWNpdDMyQml0OworfQorCitzdWIgZGV0ZXJtaW5lSXNFeHBsaWNpdDMyQml0KCkKK3sK KyAgICByZXR1cm4gaWYgZGVmaW5lZCgkaXNFeHBsaWNpdDMyQml0KTsKKyAgICAkaXNFeHBsaWNp dDMyQml0ID0gY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLTMyLWJpdCIpOwor fQorCiBzdWIgaXNXaW42NCgpCiB7CiAgICAgZGV0ZXJtaW5lSXNXaW42NCgpOwpAQCAtMTI0Miw3 ICsxMjU1LDcgQEAgc3ViIGlzV2luNjQoKQogc3ViIGRldGVybWluZUlzV2luNjQoKQogewogICAg IHJldHVybiBpZiBkZWZpbmVkKCRpc1dpbjY0KTsKLSAgICAkaXNXaW42NCA9IGNoZWNrRm9yQXJn dW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS02NC1iaXQiKTsKKyAgICAkaXNXaW42NCA9IGNoZWNr Rm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS02NC1iaXQiKSB8fCAoaXNXaW5DYWlybygp ICYmICFpc0V4cGxpY2l0MzJCaXQoKSk7CiB9CiAKIHN1YiBkZXRlcm1pbmVJc1dpbjY0RnJvbUFy Y2hpdGVjdHVyZSgkKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y29uZmlnL3BvcnRzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3Bv cnRzLnB5CmluZGV4IDc3OGI4ZjkzMWIyOTNmZDljOTE2MDBhOWE1NGMzZGI5NDAxN2QwNmUuLjk0 ZDcxYmZlMzEwOTliOGEyNDk2Y2QyNjRlZmZkMGY4MWIzM2E2ZmMgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHMucHkKQEAgLTE5Miw3ICsxOTIsNiBAQCBj bGFzcyBXaW5DYWlyb1BvcnQoRGVwcmVjYXRlZFBvcnQpOgogICAgIGRlZiBidWlsZF93ZWJraXRf Y29tbWFuZChzZWxmLCBidWlsZF9zdHlsZT1Ob25lKToKICAgICAgICAgY29tbWFuZCA9IHN1cGVy KFdpbkNhaXJvUG9ydCwgc2VsZikuYnVpbGRfd2Via2l0X2NvbW1hbmQoYnVpbGRfc3R5bGU9YnVp bGRfc3R5bGUpCiAgICAgICAgIGNvbW1hbmQuYXBwZW5kKCctLXdpbmNhaXJvJykKLSAgICAgICAg Y29tbWFuZC5hcHBlbmQoJy0tNjQtYml0JykKICAgICAgICAgcmV0dXJuIGNvbW1hbmQKIAogICAg IGRlZiBydW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoc2VsZiwgYnVpbGRfc3R5bGU9Tm9uZSk6CmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2luLnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQppbmRleCAwNDQxMWFkMDMwNjQyODc1ODI3ZmUyNDJj NjJhZGQzZDk0MjcxZGY0Li45ODE0NjEzNGJjZTRhM2JiZWZhYTA5YjkxYWYwYzA3NzNkMzYwOWI2 IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2luLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93aW4ucHkKQEAgLTQ0OSw2ICs0NDksOCBAQCBjbGFz cyBXaW5Qb3J0KEFwcGxlUG9ydCk6CiBjbGFzcyBXaW5DYWlyb1BvcnQoV2luUG9ydCk6CiAgICAg cG9ydF9uYW1lID0gIndpbmNhaXJvIgogCisgICAgREVGQVVMVF9BUkNISVRFQ1RVUkUgPSAneDg2 XzY0JworCiAgICAgVEVTVF9QQVRIX1NFUEFSQVRPUiA9IG9zLnNlcAogCiAgICAgZGVmIGRlZmF1 bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6Cg== 333749 2018-02-13 16:57:37 -0800 2018-02-14 11:43:56 -0800 Patch bug-182753-20180213165739.patch text/plain 5006 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NDMyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODJkYzRjYjAyZjUzZTUxOTE4ZWVkNjQ2NzEzMTcyMTkx MGFlOWUzNS4uMDIxMDYxYWEyNjhjMTFmZWNiZmI1M2JkM2RlOWM4OGRiZmYxMmI5NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDE4LTAyLTEzICBSb3NzIEtpcnNsaW5nICA8cm9zcy5raXJzbGluZ0Bzb255LmNvbT4K KworICAgICAgICBbVG9vbHNdIC0td2luY2Fpcm8gc2hvdWxkIGltcGx5IC0tNjQtYml0IGJ5IGRl ZmF1bHQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x ODI3NTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX aW5DYWlybyBjdXJyZW50bHkgbGFja3MgYSAzMi1iaXQgYnVpbGQgYW5kIGAtLXdpbmNhaXJvYCBp dHNlbGYgc2hvdWxkIHJlZmVyIHRvIGEgd29ya2luZyBwbGF0Zm9ybS4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKGRldGVybWluZVBhc3NlZEFyY2hpdGVjdHVy ZSk6CisgICAgICAgIChpc0V4cGxpY2l0MzJCaXQpOgorICAgICAgICAoZGV0ZXJtaW5lSXNFeHBs aWNpdDMyQml0KToKKyAgICAgICAgKGRldGVybWluZUlzV2luNjQpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weToKKyAgICAgICAgKFdpbkNhaXJvUG9y dC5idWlsZF93ZWJraXRfY29tbWFuZCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21t b24vY29uZmlnL3BvcnRzX3VuaXR0ZXN0LnB5OgorICAgICAgICAoRGVwcmVjYXRlZFBvcnRUZXN0 LnRlc3Rfd2luY2Fpcm9fcG9ydCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L3dp bi5weToKKyAgICAgICAgKFdpbkNhaXJvUG9ydCk6CisKIDIwMTgtMDItMTMgIERvbiBPbG1zdGVh ZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAogICAgICAgICBbQ01ha2VdIE1ha2UgV2ViQ29y ZSBoZWFkZXJzIGNvcGllcwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IDg0MjhkNTRkYWVmMDY0N2RlYTk3 OWFiZDRhM2QxOTM3NGI2MDhiYjcuLjMwZTYxOWM0YmRmMmNjZDc2ZjJhZDBhYTUzZjNkZjUwNzUx ODg5Y2IgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTE0Miw2ICsxNDIsNyBAQCBteSAkaW9zVmVyc2lv bjsKIG15ICRnZW5lcmF0ZURzeW07CiBteSAkaXNDTWFrZUJ1aWxkOwogbXkgJGlzR2VuZXJhdGVQ cm9qZWN0T25seTsKK215ICRpc0V4cGxpY2l0MzJCaXQ7CiBteSAkaXNXaW42NDsKIG15ICRpc0lu c3BlY3RvckZyb250ZW5kOwogbXkgJHBvcnROYW1lOwpAQCAtOTM1LDcgKzkzNiw3IEBAIHN1YiBk ZXRlcm1pbmVQYXNzZWRBcmNoaXRlY3R1cmUKICAgICAkc2VhcmNoZWRGb3JQYXNzZWRBcmNoaXRl Y3R1cmUgPSAxOwogCiAgICAgJHBhc3NlZEFyY2hpdGVjdHVyZSA9IHVuZGVmOwotICAgIGlmIChj aGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tMzItYml0IikpIHsKKyAgICBpZiAo aXNFeHBsaWNpdDMyQml0KCkpIHsKICAgICAgICAgaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgpKSB7 CiAgICAgICAgICAgICAjIFBMQVRGT1JNX0lPUzogRG9uJ3QgcnVuIGBhcmNoYCBjb21tYW5kIGlu c2lkZSBTaW11bGF0b3IgZW52aXJvbm1lbnQKICAgICAgICAgICAgIGxvY2FsICVFTlYgPSAlRU5W OwpAQCAtMTIzMyw2ICsxMjM0LDE4IEBAIHN1YiBpc1dpbkNhaXJvKCkKICAgICByZXR1cm4gcG9y dE5hbWUoKSBlcSBXaW5DYWlybzsKIH0KIAorc3ViIGlzRXhwbGljaXQzMkJpdCgpCit7CisgICAg ZGV0ZXJtaW5lSXNFeHBsaWNpdDMyQml0KCk7CisgICAgcmV0dXJuICRpc0V4cGxpY2l0MzJCaXQ7 Cit9CisKK3N1YiBkZXRlcm1pbmVJc0V4cGxpY2l0MzJCaXQoKQoreworICAgIHJldHVybiBpZiBk ZWZpbmVkKCRpc0V4cGxpY2l0MzJCaXQpOworICAgICRpc0V4cGxpY2l0MzJCaXQgPSBjaGVja0Zv ckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tMzItYml0Iik7Cit9CisKIHN1YiBpc1dpbjY0 KCkKIHsKICAgICBkZXRlcm1pbmVJc1dpbjY0KCk7CkBAIC0xMjQyLDcgKzEyNTUsNyBAQCBzdWIg aXNXaW42NCgpCiBzdWIgZGV0ZXJtaW5lSXNXaW42NCgpCiB7CiAgICAgcmV0dXJuIGlmIGRlZmlu ZWQoJGlzV2luNjQpOwotICAgICRpc1dpbjY0ID0gY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZy b21BUkdWKCItLTY0LWJpdCIpOworICAgICRpc1dpbjY0ID0gY2hlY2tGb3JBcmd1bWVudEFuZFJl bW92ZUZyb21BUkdWKCItLTY0LWJpdCIpIHx8IChpc1dpbkNhaXJvKCkgJiYgIWlzRXhwbGljaXQz MkJpdCgpKTsKIH0KIAogc3ViIGRldGVybWluZUlzV2luNjRGcm9tQXJjaGl0ZWN0dXJlKCQpCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHMucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHMucHkKaW5kZXggNzc4 YjhmOTMxYjI5M2ZkOWM5MTYwMGE5YTU0YzNkYjk0MDE3ZDA2ZS4uOTRkNzFiZmUzMTA5OWI4YTI0 OTZjZDI2NGVmZmQwZjgxYjMzYTZmYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY29uZmlnL3BvcnRzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NvbmZpZy9wb3J0cy5weQpAQCAtMTkyLDcgKzE5Miw2IEBAIGNsYXNzIFdpbkNhaXJvUG9y dChEZXByZWNhdGVkUG9ydCk6CiAgICAgZGVmIGJ1aWxkX3dlYmtpdF9jb21tYW5kKHNlbGYsIGJ1 aWxkX3N0eWxlPU5vbmUpOgogICAgICAgICBjb21tYW5kID0gc3VwZXIoV2luQ2Fpcm9Qb3J0LCBz ZWxmKS5idWlsZF93ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT1idWlsZF9zdHlsZSkKICAgICAg ICAgY29tbWFuZC5hcHBlbmQoJy0td2luY2Fpcm8nKQotICAgICAgICBjb21tYW5kLmFwcGVuZCgn LS02NC1iaXQnKQogICAgICAgICByZXR1cm4gY29tbWFuZAogCiAgICAgZGVmIHJ1bl93ZWJraXRf dGVzdHNfY29tbWFuZChzZWxmLCBidWlsZF9zdHlsZT1Ob25lKToKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0c191bml0dGVzdC5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0c191bml0dGVzdC5weQppbmRleCA2 YzMyZmQyZWY5MWE5ZTBhMmEzODY1ODM3ZTEwODdhMjAxMGQ2ZTVhLi4yYzUyOGI5NTA5MzVhM2Y3 N2Y5NzdkMjQwZWVmNzA5ZTI1Mjg3YTQwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jb25maWcvcG9ydHNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzX3VuaXR0ZXN0LnB5CkBAIC01OSw1ICs1OSw1IEBA IGNsYXNzIERlcHJlY2F0ZWRQb3J0VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRl c3Rfd2luY2Fpcm9fcG9ydChzZWxmKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChXaW5DYWly b1BvcnQoKS5mbGFnKCksICItLXBvcnQ9d2luY2Fpcm8iKQogICAgICAgICBzZWxmLmFzc2VydEVx dWFsKFdpbkNhaXJvUG9ydCgpLnJ1bl93ZWJraXRfdGVzdHNfY29tbWFuZCgpLCBEZXByZWNhdGVk UG9ydCgpLnNjcmlwdF9zaGVsbF9jb21tYW5kKCJydW4td2Via2l0LXRlc3RzIikgKyBbIi0td2lu Y2Fpcm8iXSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChXaW5DYWlyb1BvcnQoKS5idWlsZF93 ZWJraXRfY29tbWFuZCgpLCBEZXByZWNhdGVkUG9ydCgpLnNjcmlwdF9zaGVsbF9jb21tYW5kKCJi dWlsZC13ZWJraXQiKSArIFsiLS13aW5jYWlybyIsICItLTY0LWJpdCJdKQotICAgICAgICBzZWxm LmFzc2VydEVxdWFsKFdpbkNhaXJvUG9ydCgpLmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0 eWxlPSJkZWJ1ZyIpLCBEZXByZWNhdGVkUG9ydCgpLnNjcmlwdF9zaGVsbF9jb21tYW5kKCJidWls ZC13ZWJraXQiKSArIFsiLS1kZWJ1ZyIsICItLXdpbmNhaXJvIiwgIi0tNjQtYml0Il0pCisgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoV2luQ2Fpcm9Qb3J0KCkuYnVpbGRfd2Via2l0X2NvbW1hbmQo KSwgRGVwcmVjYXRlZFBvcnQoKS5zY3JpcHRfc2hlbGxfY29tbWFuZCgiYnVpbGQtd2Via2l0Iikg KyBbIi0td2luY2Fpcm8iXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChXaW5DYWlyb1BvcnQo KS5idWlsZF93ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT0iZGVidWciKSwgRGVwcmVjYXRlZFBv cnQoKS5zY3JpcHRfc2hlbGxfY29tbWFuZCgiYnVpbGQtd2Via2l0IikgKyBbIi0tZGVidWciLCAi LS13aW5jYWlybyJdKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dp bi5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93aW4ucHkKaW5kZXggMDQ0MTFhZDAz MDY0Mjg3NTgyN2ZlMjQyYzYyYWRkM2Q5NDI3MWRmNC4uOTgxNDYxMzRiY2U0YTNiYmVmYWEwOWI5 MWFmMGMwNzczZDM2MDliNiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0 L3dpbi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2luLnB5CkBAIC00NDks NiArNDQ5LDggQEAgY2xhc3MgV2luUG9ydChBcHBsZVBvcnQpOgogY2xhc3MgV2luQ2Fpcm9Qb3J0 KFdpblBvcnQpOgogICAgIHBvcnRfbmFtZSA9ICJ3aW5jYWlybyIKIAorICAgIERFRkFVTFRfQVJD SElURUNUVVJFID0gJ3g4Nl82NCcKKwogICAgIFRFU1RfUEFUSF9TRVBBUkFUT1IgPSBvcy5zZXAK IAogICAgIGRlZiBkZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgo= 333825 2018-02-14 11:43:58 -0800 2018-02-14 12:31:55 -0800 Patch for landing bug-182753-20180214114400.patch text/plain 5126 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NDMyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODJkYzRjYjAyZjUzZTUxOTE4ZWVkNjQ2NzEzMTcyMTkx MGFlOWUzNS4uMjNkMGYxNDUyM2NjYThmNzYwOTg4OTRhM2QyOGYwYzdmNDI0MTI1NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE4LTAyLTE0ICBSb3NzIEtpcnNsaW5nICA8cm9zcy5raXJzbGluZ0Bzb255LmNvbT4K KworICAgICAgICBbVG9vbHNdIC0td2luY2Fpcm8gc2hvdWxkIGltcGx5IC0tNjQtYml0IGJ5IGRl ZmF1bHQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x ODI3NTMKKworICAgICAgICBSZXZpZXdlZCBieSBEYW5pZWwgQmF0ZXMuCisKKyAgICAgICAgV2lu Q2Fpcm8gZG9lcyBub3QgY3VycmVudGx5IHN1cHBvcnQgMzItYml0IGFuZCBgLS13aW5jYWlyb2Ag aXRzZWxmIHNob3VsZCByZWZlciB0byBhIHdvcmtpbmcgcGxhdGZvcm0uCisgICAgICAgIFRoaXMg cGF0Y2ggZW5zdXJlcyB4NjQgaXMgZGV0ZXJtaW5lZCBjb3JyZWN0bHkgZm9yIGBidWlsZC13ZWJr aXQgLS1uby1uaW5qYWAgYW5kIGBydW4td2Via2l0LXRlc3RzYC4KKworICAgICAgICAqIFNjcmlw dHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKGRldGVybWluZVBhc3NlZEFyY2hpdGVjdHVyZSk6 CisgICAgICAgIChzaG91bGRCdWlsZDMyQml0KToKKyAgICAgICAgKGRldGVybWluZVNob3VsZEJ1 aWxkMzJCaXQpOgorICAgICAgICAoZGV0ZXJtaW5lSXNXaW42NCk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzLnB5OgorICAgICAgICAoV2luQ2Fpcm9Qb3J0 LmJ1aWxkX3dlYmtpdF9jb21tYW5kKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jb25maWcvcG9ydHNfdW5pdHRlc3QucHk6CisgICAgICAgIChEZXByZWNhdGVkUG9ydFRlc3Qu dGVzdF93aW5jYWlyb19wb3J0KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2lu LnB5OgorICAgICAgICAoV2luQ2Fpcm9Qb3J0KToKKwogMjAxOC0wMi0xMyAgRG9uIE9sbXN0ZWFk ICA8ZG9uLm9sbXN0ZWFkQHNvbnkuY29tPgogCiAgICAgICAgIFtDTWFrZV0gTWFrZSBXZWJDb3Jl IGhlYWRlcnMgY29waWVzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0g Yi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggODQyOGQ1NGRhZWYwNjQ3ZGVhOTc5 YWJkNGEzZDE5Mzc0YjYwOGJiNy4uOTY3NzQ4MjMxNTAxYWY5ZTg5NmIxNTY5MDNjNzk1MjI2ZGVj MjFiMiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMTQyLDYgKzE0Miw3IEBAIG15ICRpb3NWZXJzaW9u OwogbXkgJGdlbmVyYXRlRHN5bTsKIG15ICRpc0NNYWtlQnVpbGQ7CiBteSAkaXNHZW5lcmF0ZVBy b2plY3RPbmx5OworbXkgJHNob3VsZEJ1aWxkMzJCaXQ7CiBteSAkaXNXaW42NDsKIG15ICRpc0lu c3BlY3RvckZyb250ZW5kOwogbXkgJHBvcnROYW1lOwpAQCAtOTM1LDcgKzkzNiw3IEBAIHN1YiBk ZXRlcm1pbmVQYXNzZWRBcmNoaXRlY3R1cmUKICAgICAkc2VhcmNoZWRGb3JQYXNzZWRBcmNoaXRl Y3R1cmUgPSAxOwogCiAgICAgJHBhc3NlZEFyY2hpdGVjdHVyZSA9IHVuZGVmOwotICAgIGlmIChj aGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tMzItYml0IikpIHsKKyAgICBpZiAo c2hvdWxkQnVpbGQzMkJpdCgpKSB7CiAgICAgICAgIGlmIChpc0FwcGxlQ29jb2FXZWJLaXQoKSkg ewogICAgICAgICAgICAgIyBQTEFURk9STV9JT1M6IERvbid0IHJ1biBgYXJjaGAgY29tbWFuZCBp bnNpZGUgU2ltdWxhdG9yIGVudmlyb25tZW50CiAgICAgICAgICAgICBsb2NhbCAlRU5WID0gJUVO VjsKQEAgLTEyMzMsNiArMTIzNCwxOCBAQCBzdWIgaXNXaW5DYWlybygpCiAgICAgcmV0dXJuIHBv cnROYW1lKCkgZXEgV2luQ2Fpcm87CiB9CiAKK3N1YiBzaG91bGRCdWlsZDMyQml0KCkKK3sKKyAg ICBkZXRlcm1pbmVTaG91bGRCdWlsZDMyQml0KCk7CisgICAgcmV0dXJuICRzaG91bGRCdWlsZDMy Qml0OworfQorCitzdWIgZGV0ZXJtaW5lU2hvdWxkQnVpbGQzMkJpdCgpCit7CisgICAgcmV0dXJu IGlmIGRlZmluZWQoJHNob3VsZEJ1aWxkMzJCaXQpOworICAgICRzaG91bGRCdWlsZDMyQml0ID0g Y2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLTMyLWJpdCIpOworfQorCiBzdWIg aXNXaW42NCgpCiB7CiAgICAgZGV0ZXJtaW5lSXNXaW42NCgpOwpAQCAtMTI0Miw3ICsxMjU1LDcg QEAgc3ViIGlzV2luNjQoKQogc3ViIGRldGVybWluZUlzV2luNjQoKQogewogICAgIHJldHVybiBp ZiBkZWZpbmVkKCRpc1dpbjY0KTsKLSAgICAkaXNXaW42NCA9IGNoZWNrRm9yQXJndW1lbnRBbmRS ZW1vdmVGcm9tQVJHVigiLS02NC1iaXQiKTsKKyAgICAkaXNXaW42NCA9IGNoZWNrRm9yQXJndW1l bnRBbmRSZW1vdmVGcm9tQVJHVigiLS02NC1iaXQiKSB8fCBpc1dpbkNhaXJvKCkgJiYgIXNob3Vs ZEJ1aWxkMzJCaXQoKTsKIH0KIAogc3ViIGRldGVybWluZUlzV2luNjRGcm9tQXJjaGl0ZWN0dXJl KCQpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9y dHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHMucHkKaW5k ZXggNzc4YjhmOTMxYjI5M2ZkOWM5MTYwMGE5YTU0YzNkYjk0MDE3ZDA2ZS4uOTRkNzFiZmUzMTA5 OWI4YTI0OTZjZDI2NGVmZmQwZjgxYjMzYTZmYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weQpAQCAtMTkyLDcgKzE5Miw2IEBAIGNsYXNzIFdpbkNh aXJvUG9ydChEZXByZWNhdGVkUG9ydCk6CiAgICAgZGVmIGJ1aWxkX3dlYmtpdF9jb21tYW5kKHNl bGYsIGJ1aWxkX3N0eWxlPU5vbmUpOgogICAgICAgICBjb21tYW5kID0gc3VwZXIoV2luQ2Fpcm9Q b3J0LCBzZWxmKS5idWlsZF93ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT1idWlsZF9zdHlsZSkK ICAgICAgICAgY29tbWFuZC5hcHBlbmQoJy0td2luY2Fpcm8nKQotICAgICAgICBjb21tYW5kLmFw cGVuZCgnLS02NC1iaXQnKQogICAgICAgICByZXR1cm4gY29tbWFuZAogCiAgICAgZGVmIHJ1bl93 ZWJraXRfdGVzdHNfY29tbWFuZChzZWxmLCBidWlsZF9zdHlsZT1Ob25lKToKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0c191bml0dGVzdC5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0c191bml0dGVzdC5weQpp bmRleCA2YzMyZmQyZWY5MWE5ZTBhMmEzODY1ODM3ZTEwODdhMjAxMGQ2ZTVhLi4yYzUyOGI5NTA5 MzVhM2Y3N2Y5NzdkMjQwZWVmNzA5ZTI1Mjg3YTQwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzX3VuaXR0ZXN0LnB5CkBAIC01OSw1ICs1 OSw1IEBAIGNsYXNzIERlcHJlY2F0ZWRQb3J0VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAg ZGVmIHRlc3Rfd2luY2Fpcm9fcG9ydChzZWxmKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChX aW5DYWlyb1BvcnQoKS5mbGFnKCksICItLXBvcnQ9d2luY2Fpcm8iKQogICAgICAgICBzZWxmLmFz c2VydEVxdWFsKFdpbkNhaXJvUG9ydCgpLnJ1bl93ZWJraXRfdGVzdHNfY29tbWFuZCgpLCBEZXBy ZWNhdGVkUG9ydCgpLnNjcmlwdF9zaGVsbF9jb21tYW5kKCJydW4td2Via2l0LXRlc3RzIikgKyBb Ii0td2luY2Fpcm8iXSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChXaW5DYWlyb1BvcnQoKS5i dWlsZF93ZWJraXRfY29tbWFuZCgpLCBEZXByZWNhdGVkUG9ydCgpLnNjcmlwdF9zaGVsbF9jb21t YW5kKCJidWlsZC13ZWJraXQiKSArIFsiLS13aW5jYWlybyIsICItLTY0LWJpdCJdKQotICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKFdpbkNhaXJvUG9ydCgpLmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1 aWxkX3N0eWxlPSJkZWJ1ZyIpLCBEZXByZWNhdGVkUG9ydCgpLnNjcmlwdF9zaGVsbF9jb21tYW5k KCJidWlsZC13ZWJraXQiKSArIFsiLS1kZWJ1ZyIsICItLXdpbmNhaXJvIiwgIi0tNjQtYml0Il0p CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoV2luQ2Fpcm9Qb3J0KCkuYnVpbGRfd2Via2l0X2Nv bW1hbmQoKSwgRGVwcmVjYXRlZFBvcnQoKS5zY3JpcHRfc2hlbGxfY29tbWFuZCgiYnVpbGQtd2Vi a2l0IikgKyBbIi0td2luY2Fpcm8iXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChXaW5DYWly b1BvcnQoKS5idWlsZF93ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT0iZGVidWciKSwgRGVwcmVj YXRlZFBvcnQoKS5zY3JpcHRfc2hlbGxfY29tbWFuZCgiYnVpbGQtd2Via2l0IikgKyBbIi0tZGVi dWciLCAiLS13aW5jYWlybyJdKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9w b3J0L3dpbi5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93aW4ucHkKaW5kZXggMDQ0 MTFhZDAzMDY0Mjg3NTgyN2ZlMjQyYzYyYWRkM2Q5NDI3MWRmNC4uOTgxNDYxMzRiY2U0YTNiYmVm YWEwOWI5MWFmMGMwNzczZDM2MDliNiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L3dpbi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2luLnB5CkBA IC00NDksNiArNDQ5LDggQEAgY2xhc3MgV2luUG9ydChBcHBsZVBvcnQpOgogY2xhc3MgV2luQ2Fp cm9Qb3J0KFdpblBvcnQpOgogICAgIHBvcnRfbmFtZSA9ICJ3aW5jYWlybyIKIAorICAgIERFRkFV TFRfQVJDSElURUNUVVJFID0gJ3g4Nl82NCcKKwogICAgIFRFU1RfUEFUSF9TRVBBUkFUT1IgPSBv cy5zZXAKIAogICAgIGRlZiBkZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgo=