207012 2020-01-30 11:53:04 -0800 [build-webkit] Compare with cmakeargs and unhandled to detect configuration change 2020-10-07 13:56:11 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 basuke basuke achristensen basuke clopez darin jbedard stephan.szabo webkit-bug-importer oldest_to_newest 1613075 0 basuke 2020-01-30 11:53:04 -0800 If --cmakeargs are passed, usually that means CMake Cache should be invalidated and do clean build. 1613076 1 basuke 2020-01-30 11:53:57 -0800 Also command line options can change the configuration such as --no-ninja. Add them also. 1613083 2 389275 basuke 2020-01-30 12:26:35 -0800 Created attachment 389275 PATCH 1613141 3 389275 stephan.szabo 2020-01-30 14:23:07 -0800 Comment on attachment 389275 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=389275&action=review > Tools/Scripts/build-webkit:309 > + my @buildArgs = (@featureArgs, @cmakeArgs, @ARGV); This seems like it'd be prone to false positives for removal if I'm reading the code correctly. It seems like the check is order dependent, so specifying the same cmake args in different orders seems like it would result in a positive to remove. And something similar with feature args, where if a feature arg was -DFOO=ON, a run with no cmake args and one with a cmake arg setting -DFOO=ON (i.e. the value it already had) seems like it would result in a positive to remove. 1613145 4 389275 stephan.szabo 2020-01-30 14:32:38 -0800 Comment on attachment 389275 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=389275&action=review >> Tools/Scripts/build-webkit:309 >> + my @buildArgs = (@featureArgs, @cmakeArgs, @ARGV); > > This seems like it'd be prone to false positives for removal if I'm reading the code correctly. > It seems like the check is order dependent, so specifying the same cmake args in different orders seems like it would result in a positive to remove. > And something similar with feature args, where if a feature arg was -DFOO=ON, a run with no cmake args and one with a cmake arg setting -DFOO=ON (i.e. the value it already had) seems like it would result in a positive to remove. I should add that sorting the cmake args (or feature + cmake args) would be insufficient since you could specify -DFOO=ON -DFOO=OFF which is different from "-DFOO=OFF -DFOO=ON" while "-DFOO=ON -DBAR=OFF" seems like it's the same as "-DBAR=OFF -DFOO=ON". Also, thinking about it - mixing ARGV with the cmake/feature args seems like a problem if you can have an item in @ARGV that looked like -DFOO=ON, because you might get false negatives between build-webkit --cmakeargs="-DFOO=ON" and build-webkit -DFOO=ON. 1613163 5 basuke 2020-01-30 15:02:06 -0800 (In reply to Stephan Szabo from comment #4) > Comment on attachment 389275 [details] > PATCH > > View in context: > https://bugs.webkit.org/attachment.cgi?id=389275&action=review > > >> Tools/Scripts/build-webkit:309 > >> + my @buildArgs = (@featureArgs, @cmakeArgs, @ARGV); > > > > This seems like it'd be prone to false positives for removal if I'm reading the code correctly. > > It seems like the check is order dependent, so specifying the same cmake args in different orders seems like it would result in a positive to remove. > > And something similar with feature args, where if a feature arg was -DFOO=ON, a run with no cmake args and one with a cmake arg setting -DFOO=ON (i.e. the value it already had) seems like it would result in a positive to remove. > > I should add that sorting the cmake args (or feature + cmake args) would be insufficient since you could specify > -DFOO=ON -DFOO=OFF which is different from "-DFOO=OFF -DFOO=ON" while "-DFOO=ON -DBAR=OFF" seems like it's the same > as "-DBAR=OFF -DFOO=ON". > Also, thinking about it - mixing ARGV with the cmake/feature args seems like a problem if you can have an item in > @ARGV that looked like -DFOO=ON, because you might get false negatives between build-webkit --cmakeargs="-DFOO=ON" > and build-webkit -DFOO=ON. Yes, this patch is far from ideal, but rebuilding caused by false positive is much better than mis-configured build result, don't you think so? But anyway sorting should be added. 1693643 6 389275 clopez 2020-09-30 20:46:19 -0700 Comment on attachment 389275 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=389275&action=review >>>> Tools/Scripts/build-webkit:309 >>>> + my @buildArgs = (@featureArgs, @cmakeArgs, @ARGV); >>> >>> This seems like it'd be prone to false positives for removal if I'm reading the code correctly. >>> It seems like the check is order dependent, so specifying the same cmake args in different orders seems like it would result in a positive to remove. >>> And something similar with feature args, where if a feature arg was -DFOO=ON, a run with no cmake args and one with a cmake arg setting -DFOO=ON (i.e. the value it already had) seems like it would result in a positive to remove. >> >> I should add that sorting the cmake args (or feature + cmake args) would be insufficient since you could specify -DFOO=ON -DFOO=OFF which is different from "-DFOO=OFF -DFOO=ON" while "-DFOO=ON -DBAR=OFF" seems like it's the same as "-DBAR=OFF -DFOO=ON". >> Also, thinking about it - mixing ARGV with the cmake/feature args seems like a problem if you can have an item in @ARGV that looked like -DFOO=ON, because you might get false negatives between build-webkit --cmakeargs="-DFOO=ON" and build-webkit -DFOO=ON. > > Yes, this patch is far from ideal, but rebuilding caused by false positive is much better than mis-configured build result, don't you think so? > But anyway sorting should be added. I like the idea of the patch, but I'm unsure about adding ARGV. You mention that is for use-cases like "--no-ninja", but that option is removed from ARGV as soon as it checked on the canUseNinja() call above for the case of "if (isCMakeBuild() && !isAnyWindows()) {" I suggest to move the code for cleaning the cmake cache above that check 1693789 7 389275 basuke 2020-10-01 10:33:28 -0700 Comment on attachment 389275 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=389275&action=review >>>>> Tools/Scripts/build-webkit:309 >>>>> + my @buildArgs = (@featureArgs, @cmakeArgs, @ARGV); >>>> >>>> This seems like it'd be prone to false positives for removal if I'm reading the code correctly. >>>> It seems like the check is order dependent, so specifying the same cmake args in different orders seems like it would result in a positive to remove. >>>> And something similar with feature args, where if a feature arg was -DFOO=ON, a run with no cmake args and one with a cmake arg setting -DFOO=ON (i.e. the value it already had) seems like it would result in a positive to remove. >>> >>> I should add that sorting the cmake args (or feature + cmake args) would be insufficient since you could specify -DFOO=ON -DFOO=OFF which is different from "-DFOO=OFF -DFOO=ON" while "-DFOO=ON -DBAR=OFF" seems like it's the same as "-DBAR=OFF -DFOO=ON". >>> Also, thinking about it - mixing ARGV with the cmake/feature args seems like a problem if you can have an item in @ARGV that looked like -DFOO=ON, because you might get false negatives between build-webkit --cmakeargs="-DFOO=ON" and build-webkit -DFOO=ON. >> >> Yes, this patch is far from ideal, but rebuilding caused by false positive is much better than mis-configured build result, don't you think so? >> But anyway sorting should be added. > > I like the idea of the patch, but I'm unsure about adding ARGV. > > You mention that is for use-cases like "--no-ninja", but that option is removed from ARGV as soon as it checked on the canUseNinja() call above for the case of "if (isCMakeBuild() && !isAnyWindows()) {" > > I suggest to move the code for cleaning the cmake cache above that check Thanks for the comment. I'll rework this with latest code this afternoon. 1693889 8 410273 basuke 2020-10-01 14:56:06 -0700 Created attachment 410273 PATCH 1693896 9 410277 basuke 2020-10-01 15:24:10 -0700 Created attachment 410277 PATCH 1693903 10 410278 basuke 2020-10-01 15:30:44 -0700 Created attachment 410278 PATCH 1693904 11 basuke 2020-10-01 15:33:06 -0700 So to collect all possible configuration change, I chose to copy original argv and treat them as the change. `cmakeargs` is also one of them so that there's no need to treat it as special. 1695593 12 410278 clopez 2020-10-07 11:00:21 -0700 Comment on attachment 410278 PATCH LGTM! 1695597 13 ews-feeder 2020-10-07 11:04:51 -0700 Committed r268134: <https://trac.webkit.org/changeset/268134> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410278. 1695600 14 webkit-bug-importer 2020-10-07 11:05:22 -0700 <rdar://problem/70056353> 1695663 15 basuke 2020-10-07 13:56:11 -0700 (In reply to Carlos Alberto Lopez Perez from comment #12) > Comment on attachment 410278 [details] > PATCH > > LGTM! Thanks! 389275 2020-01-30 12:26:35 -0800 2020-10-01 14:56:06 -0700 PATCH bug-207012.diff text/plain 1837 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhM2Fk MzFiNmIyYy4uNTc1Y2ZiNWQ0NjYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMC0wMS0zMCAgQmFzdWtlIFN1enVr aSAgPGJhc3VrZS5zdXp1a2lAc29ueS5jb20+CisKKyAgICAgICAgW2J1aWxkLXdlYmtpdF0gQ29t cGFyZSB3aXRoIGNtYWtlYXJncyBhbmQgdW5oYW5kbGVkIHRvIGRldGVjdCBjb25maWd1cmF0aW9u IGNoYW5nZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjA3MDEyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkZWQgQGNtYWtlQXJncyBhbmQgQEFSR1Ygb24gdG9wIG9mIEBmZWF0dXJlQXJncyBmb3IgY29t cGFyaXNvbiB3aXRoIHByZXZpb3VzIGJ1aWxkCisgICAgICAgIG9wdGlvbnMuCisKKyAgICAgICAg KiBTY3JpcHRzL2J1aWxkLXdlYmtpdDoKKwogMjAyMC0wMS0zMCAgSm9uYXRoYW4gQmVkYXJkICA8 amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgVGVzdFdlYktpdEFQSTogUmUtYmFzZWxpbmUg QWNjZXNzaWJpbGl0eVRlc3RzIGZvciBDYXRhbHlzdApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy9idWlsZC13ZWJraXQgYi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAppbmRleCBmYzA2NjRh NjUwNS4uNjI3OGIwNGYwOTQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0 CisrKyBiL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CkBAIC0zMDYsNyArMzA2LDggQEAgaWYg KGlzQ01ha2VCdWlsZCgpICYmICFpc0FueVdpbmRvd3MoKSkgewogICAgICMgV2UgcmVtb3ZlIENN YWtlQ2FjaGUgdG8gYXZvaWQgdGhlIGJvdHMgcmV1c2luZyBjYWNoZWQgZmxhZ3Mgd2hlbgogICAg ICMgd2UgZW5hYmxlIG5ldyBmZWF0dXJlcy4gVGhpcyBmb3JjZXMgYSByZWNvbmZpZ3VyYXRpb24u CiAgICAgbXkgQGZlYXR1cmVBcmdzID0gY21ha2VBcmdzRnJvbUZlYXR1cmVzKEBmZWF0dXJlcywg ISRub0V4cGVyaW1lbnRhbEZlYXR1cmVzKTsKLSAgICByZW1vdmVDTWFrZUNhY2hlKEBmZWF0dXJl QXJncyk7CisgICAgbXkgQGJ1aWxkQXJncyA9IChAZmVhdHVyZUFyZ3MsIEBjbWFrZUFyZ3MsIEBB UkdWKTsKKyAgICByZW1vdmVDTWFrZUNhY2hlKEBidWlsZEFyZ3MpOwogCiAgICAgYnVpbGRDTWFr ZVByb2plY3RPckV4aXQoJGNsZWFuLCAkcHJlZml4UGF0aCwgJG1ha2VBcmdzLCBAZmVhdHVyZUFy Z3MsIEBjbWFrZUFyZ3MpOwogfQpAQCAtMzE0LDcgKzMxNSw4IEBAIGlmIChpc0NNYWtlQnVpbGQo KSAmJiAhaXNBbnlXaW5kb3dzKCkpIHsKIG15ICRiYXNlUHJvZHVjdERpciA9IGJhc2VQcm9kdWN0 RGlyKCk7CiBpZiAoaXNBcHBsZVdpbldlYktpdCgpIHx8IGlzV2luQ2Fpcm8oKSB8fCBpc1BsYXlT dGF0aW9uKCkgfHwgaXNGVFcoKSkgewogICAgIG15IEBmZWF0dXJlQXJncyA9IGNtYWtlQXJnc0Zy b21GZWF0dXJlcyhAZmVhdHVyZXMsICEkbm9FeHBlcmltZW50YWxGZWF0dXJlcyk7Ci0gICAgcmVt b3ZlQ01ha2VDYWNoZShAZmVhdHVyZUFyZ3MpOworICAgIG15IEBidWlsZEFyZ3MgPSAoQGZlYXR1 cmVBcmdzLCBAY21ha2VBcmdzLCBAQVJHVik7CisgICAgcmVtb3ZlQ01ha2VDYWNoZShAYnVpbGRB cmdzKTsKIAogICAgIGNoZGlyV2ViS2l0KCk7CiAgICAgaWYgKGV4aXRTdGF0dXMoZ2VuZXJhdGVC dWlsZFN5c3RlbUZyb21DTWFrZVByb2plY3QoJHByZWZpeFBhdGgsIEBmZWF0dXJlQXJncywgQGNt YWtlQXJncykpKSB7Cg== 410273 2020-10-01 14:56:06 -0700 2020-10-01 15:24:10 -0700 PATCH bug-207012.diff text/plain 1524 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyYWFi ZjNlMjNiZWEuLmMyZWI2Y2E5Yzk1MiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTEwLTAxICBCYXN1a2UgU3V6 dWtpICA8YmFzdWtlLnN1enVraUBzb255LmNvbT4KKworICAgICAgICBbYnVpbGQtd2Via2l0XSBD b21wYXJlIHdpdGggY21ha2VhcmdzIGFuZCB1bmhhbmRsZWQgdG8gZGV0ZWN0IGNvbmZpZ3VyYXRp b24gY2hhbmdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDcwMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGRlZCBjb21tYW5kIGxpbmUgYXJndW1lbnRzIG9uIHRvcCBvZiBAZmVhdHVyZUFyZ3MgZm9y IGNvbXBhcmlzb24gd2l0aAorICAgICAgICBwcmV2aW91cyBidWlsZCBvcHRpb25zLiBUaGlzIGZv cmNlcyByZWdlbmVyYXRpb24gb2YgQ01ha2VDYWNoZS50eHQgd2hlbgorICAgICAgICBhbnkgY29u ZmlndXJhdGlvbiBpcyBjaGFuZ2VkLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBt OgorICAgICAgICAoc2hvdWxkUmVtb3ZlQ01ha2VDYWNoZSk6CisKIDIwMjAtMDgtMjEgIFdlbnNv biBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXSBVbmFi bGUgdG8gY29weSB0ZXh0IGZyb20gdGhlIGZ1bmN0aW9uIGJyb3dzZXIgcGFuZWwgaW4gTnVtYmVy cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRkaXJzLnBtCmluZGV4IGUxMTE3OGRjMGExNi4uZDFmNjc3ZmE3YWNmIDEwMDc1NQot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRkaXJzLnBtCkBAIC0xNTgsOCArMTU4LDggQEAgbXkgJHBvcnROYW1lOwogbXkgJHNob3VsZFVz ZUd1YXJkTWFsbG9jOwogbXkgJHNob3VsZE5vdFVzZU5pbmphOwogbXkgJHhjb2RlVmVyc2lvbjsK LQogbXkgJHVua25vd25Qb3J0UHJvaGliaXRlZCA9IDA7CitteSBAb3JpZ2luYWxBcmd2ID0gQEFS R1Y7CiAKICMgVmFyaWFibGVzIGZvciBXaW4zMiBzdXBwb3J0CiBteSAkcHJvZ3JhbUZpbGVzUGF0 aDsKQEAgLTIyOTIsNyArMjI5Miw3IEBAIHN1YiBjbWFrZUZpbGVzUGF0aCgpCiAKIHN1YiBzaG91 bGRSZW1vdmVDTWFrZUNhY2hlKEApCiB7Ci0gICAgbXkgKEBidWlsZEFyZ3MpID0gQF87CisgICAg bXkgKEBidWlsZEFyZ3MpID0gc29ydCAoQF8sIEBvcmlnaW5hbEFyZ3YpOwogCiAgICAgIyBXZSBj aGVjayB0aGlzIGZpcnN0LCBiZWNhdXNlIHdlIGFsd2F5cyB3YW50IHRvIGNyZWF0ZSB0aGlzIGZp bGUgZm9yIGEgZnJlc2ggYnVpbGQuCiAgICAgbXkgJHByb2R1Y3REaXIgPSBGaWxlOjpTcGVjLT5j YXRkaXIoYmFzZVByb2R1Y3REaXIoKSwgY29uZmlndXJhdGlvbigpKTsK 410277 2020-10-01 15:24:10 -0700 2020-10-01 15:30:44 -0700 PATCH bug-207012.diff text/plain 1524 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyYWFi ZjNlMjNiZWEuLmMyZWI2Y2E5Yzk1MiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTEwLTAxICBCYXN1a2UgU3V6 dWtpICA8YmFzdWtlLnN1enVraUBzb255LmNvbT4KKworICAgICAgICBbYnVpbGQtd2Via2l0XSBD b21wYXJlIHdpdGggY21ha2VhcmdzIGFuZCB1bmhhbmRsZWQgdG8gZGV0ZWN0IGNvbmZpZ3VyYXRp b24gY2hhbmdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDcwMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGRlZCBjb21tYW5kIGxpbmUgYXJndW1lbnRzIG9uIHRvcCBvZiBAZmVhdHVyZUFyZ3MgZm9y IGNvbXBhcmlzb24gd2l0aAorICAgICAgICBwcmV2aW91cyBidWlsZCBvcHRpb25zLiBUaGlzIGZv cmNlcyByZWdlbmVyYXRpb24gb2YgQ01ha2VDYWNoZS50eHQgd2hlbgorICAgICAgICBhbnkgY29u ZmlndXJhdGlvbiBpcyBjaGFuZ2VkLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBt OgorICAgICAgICAoc2hvdWxkUmVtb3ZlQ01ha2VDYWNoZSk6CisKIDIwMjAtMDgtMjEgIFdlbnNv biBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXSBVbmFi bGUgdG8gY29weSB0ZXh0IGZyb20gdGhlIGZ1bmN0aW9uIGJyb3dzZXIgcGFuZWwgaW4gTnVtYmVy cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRkaXJzLnBtCmluZGV4IGUxMTE3OGRjMGExNi4uZDFmNjc3ZmE3YWNmIDEwMDc1NQot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRkaXJzLnBtCkBAIC0xNTgsOCArMTU4LDggQEAgbXkgJHBvcnROYW1lOwogbXkgJHNob3VsZFVz ZUd1YXJkTWFsbG9jOwogbXkgJHNob3VsZE5vdFVzZU5pbmphOwogbXkgJHhjb2RlVmVyc2lvbjsK LQogbXkgJHVua25vd25Qb3J0UHJvaGliaXRlZCA9IDA7CitteSBAb3JpZ2luYWxBcmd2ID0gQEFS R1Y7CiAKICMgVmFyaWFibGVzIGZvciBXaW4zMiBzdXBwb3J0CiBteSAkcHJvZ3JhbUZpbGVzUGF0 aDsKQEAgLTIyOTIsNyArMjI5Miw3IEBAIHN1YiBjbWFrZUZpbGVzUGF0aCgpCiAKIHN1YiBzaG91 bGRSZW1vdmVDTWFrZUNhY2hlKEApCiB7Ci0gICAgbXkgKEBidWlsZEFyZ3MpID0gQF87CisgICAg bXkgKEBidWlsZEFyZ3MpID0gc29ydCAoQF8sIEBvcmlnaW5hbEFyZ3YpOwogCiAgICAgIyBXZSBj aGVjayB0aGlzIGZpcnN0LCBiZWNhdXNlIHdlIGFsd2F5cyB3YW50IHRvIGNyZWF0ZSB0aGlzIGZp bGUgZm9yIGEgZnJlc2ggYnVpbGQuCiAgICAgbXkgJHByb2R1Y3REaXIgPSBGaWxlOjpTcGVjLT5j YXRkaXIoYmFzZVByb2R1Y3REaXIoKSwgY29uZmlndXJhdGlvbigpKTsK 410278 2020-10-01 15:30:44 -0700 2020-10-07 11:04:51 -0700 PATCH bug-207012.diff text/plain 1418 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzMDg2 MjM2MWFhMjYuLmRhZGVjZTI1NGY3YSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTEwLTAxICBCYXN1a2UgU3V6 dWtpICA8YmFzdWtlLnN1enVraUBzb255LmNvbT4KKworICAgICAgICBbYnVpbGQtd2Via2l0XSBD b21wYXJlIHdpdGggY21ha2VhcmdzIGFuZCB1bmhhbmRsZWQgdG8gZGV0ZWN0IGNvbmZpZ3VyYXRp b24gY2hhbmdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDcwMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGRlZCBjb21tYW5kIGxpbmUgYXJndW1lbnRzIG9uIHRvcCBvZiBAZmVhdHVyZUFyZ3MgZm9y IGNvbXBhcmlzb24gd2l0aCBwcmV2aW91cyBidWlsZAorICAgICAgICBvcHRpb25zLiBUaGlzIGZv cmNlcyByZWdlbmVyYXRpb24gb2YgQ01ha2VDYWNoZS50eHQgd2hlbiBhbnkgY29uZmlndXJhdGlv biBpcyBjaGFuZ2VkLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAg ICAoc2hvdWxkUmVtb3ZlQ01ha2VDYWNoZSk6CisKIDIwMjAtMDktMjMgIE1hdHQgTGV3aXMgIDxq bGV3aXMzQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGNvbmZpZyBmaXguCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtp dGRpcnMucG0KaW5kZXggNGI2ZjYyNTNhMTE5Li45NjUyZjk2MGIxN2EgMTAwNzU1Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMu cG0KQEAgLTE2MSw2ICsxNjEsNyBAQCBteSAkc2hvdWxkTm90VXNlTmluamE7CiBteSAkeGNvZGVW ZXJzaW9uOwogCiBteSAkdW5rbm93blBvcnRQcm9oaWJpdGVkID0gMDsKK215IEBvcmlnaW5hbEFy Z3YgPSBAQVJHVjsKIAogIyBWYXJpYWJsZXMgZm9yIFdpbjMyIHN1cHBvcnQKIG15ICRwcm9ncmFt RmlsZXNQYXRoOwpAQCAtMjMyMyw3ICsyMzI0LDcgQEAgc3ViIGNtYWtlRmlsZXNQYXRoKCkKIAog c3ViIHNob3VsZFJlbW92ZUNNYWtlQ2FjaGUoQCkKIHsKLSAgICBteSAoQGJ1aWxkQXJncykgPSBA XzsKKyAgICBteSAoQGJ1aWxkQXJncykgPSBzb3J0IChAXywgQG9yaWdpbmFsQXJndik7CiAKICAg ICAjIFdlIGNoZWNrIHRoaXMgZmlyc3QsIGJlY2F1c2Ugd2UgYWx3YXlzIHdhbnQgdG8gY3JlYXRl IHRoaXMgZmlsZSBmb3IgYSBmcmVzaCBidWlsZC4KICAgICBteSAkcHJvZHVjdERpciA9IEZpbGU6 OlNwZWMtPmNhdGRpcihiYXNlUHJvZHVjdERpcigpLCBjb25maWd1cmF0aW9uKCkpOwo=