200742 2019-08-14 16:12:57 -0700 [lldb-webkit] OptionSet summary shows size 0 sometimes for non-empty set 2019-08-22 15:14:54 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=201056 InRadar P2 Normal --- 1 dbates dbates jer.noble ryanhaddad simon.fraser webkit-bug-importer oldest_to_newest 1561376 0 dbates 2019-08-14 16:12:57 -0700 Sometimes the LLDB-pretty printed OptionSet summary for a non-empty set is 0. 1561382 1 376331 dbates 2019-08-14 16:44:49 -0700 Created attachment 376331 Patch 1563753 2 376331 dbates 2019-08-21 15:42:53 -0700 Comment on attachment 376331 Patch Clearing flags on attachment: 376331 Committed r248970: <https://trac.webkit.org/changeset/248970> 1563754 3 dbates 2019-08-21 15:42:54 -0700 All reviewed patches have been landed. Closing bug. 1563756 4 webkit-bug-importer 2019-08-21 15:43:42 -0700 <rdar://problem/54575345> 1563813 5 ryanhaddad 2019-08-21 17:06:48 -0700 There is a lldb_webkit_unittest test failure after this change: [1903/1912] lldb_webkit_unittest.TestSummaryProviders.serial_test_WTFOptionSetProvider_empty failed: Traceback (most recent call last): File "/Volumes/Data/slave/mojave-release-tests-wk2/build/Tools/lldb/lldb_webkit_unittest.py", line 188, in serial_test_WTFOptionSetProvider_empty self.assertEqual(provider.get_child_at_index(0), None) AssertionError: <lldb.SBValue; proxy of <Swig Object of type 'lldb::SBValue *' at 0x1176af2a0> > != None https://build.webkit.org/builders/Apple%20Mojave%20Release%20WK2%20(Tests)/builds/6078/steps/webkitpy-test/logs/stdio 1563825 6 dbates 2019-08-21 17:19:28 -0700 Not near a computer. Roll it out and I will fix offljne 1563833 7 ryanhaddad 2019-08-21 17:23:20 -0700 Reverted r248970 for reason: Caused lldb_webkit_unittest.TestSummaryProviders.serial_test_WTFOptionSetProvider_empty to fail. Committed r248980: <https://trac.webkit.org/changeset/248980> 1563925 8 dbates 2019-08-21 20:35:12 -0700 Something happened to EWS. It use to run these tests. 1564258 9 377058 dbates 2019-08-22 15:05:43 -0700 Created attachment 377058 To land 1564259 10 377058 dbates 2019-08-22 15:07:00 -0700 Comment on attachment 377058 To land Clearing flags on attachment: 377058 Committed r249030: <https://trac.webkit.org/changeset/249030> 1564260 11 dbates 2019-08-22 15:07:01 -0700 All reviewed patches have been landed. Closing bug. 1564262 12 377058 dbates 2019-08-22 15:08:34 -0700 Comment on attachment 377058 To land View in context: https://bugs.webkit.org/attachment.cgi?id=377058&action=review > Tools/lldb/lldb_webkit_unittest.py:188 > - self.assertEqual(provider.get_child_at_index(0), None) > + self.assertEqual(provider.get_child_at_index(0).GetName(), 'm_storage') In retrospect, probably would be better for this to assert provider.size == 0 and should add a new test to check that the last child of the provider is always 'm_storage'. 1564266 13 377058 dbates 2019-08-22 15:14:40 -0700 Comment on attachment 377058 To land View in context: https://bugs.webkit.org/attachment.cgi?id=377058&action=review >> Tools/lldb/lldb_webkit_unittest.py:188 >> + self.assertEqual(provider.get_child_at_index(0).GetName(), 'm_storage') > > In retrospect, probably would be better for this to assert provider.size == 0 and should add a new test to check that the last child of the provider is always 'm_storage'. Filed bug #201056 for this. 376331 2019-08-14 16:44:49 -0700 2019-08-22 15:05:42 -0700 Patch bug-200742-20190814164448.patch text/plain 6269 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4NTMxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmEzMmUzNTk5ODJlYmI4ZTgzZTZkNjZlN2I1NWViMzFi NDI1YTM3My4uNzU3NmU2N2U4NTAxZWFmZmUzZTAyYzgyNzQ2NjM1NWYzNjJhOGJiNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQy IEBACisyMDE5LTA4LTE0ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAg ICAgICBbbGxkYi13ZWJraXRdIE9wdGlvblNldCBzdW1tYXJ5IHNob3dzIHNpemUgMCBzb21ldGlt ZXMgZm9yIG5vbi1lbXB0eSBzZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwMDc0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoZSBPcHRpb25TZXQgc3ludGhldGljIHByb3ZpZGVyIG11c3QgcmVzcG9u ZCB0byByZXF1ZXN0cyBmb3IgdGhlIHZhbHVlIG9mIG1fc3RvcmFnZQorICAgICAgICAoaS5lLiBH ZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdtX3N0b3JhZ2UnKSkgdG8gYXZvaWQgaW50ZXJmZXJpbmcg d2l0aCB0aGUgY29tcHV0YXRpb24KKyAgICAgICAgb2YgdGhlIHR5cGUgc3VtbWFyeS4KKworICAg ICAgICBTeW50aGV0aWMgcHJvdmlkZXJzIHN1YnN0aXR1dGUgYWx0ZXJuYXRpdmUgZGVidWcgaW5m b3JtYXRpb24gKGNoaWxkcmVuKSBmb3IgdGhlIGRlZmF1bHQKKyAgICAgICAgaW5mb3JtYXRpb24g Zm9yIGEgdmFyaWFibGUuIFRoZSBPcHRpb25TZXQgdHlwZSBzdW1tYXJ5IGlzIGltcGxlbWVudGVk IGluIHRlcm1zIG9mIHRoZQorICAgICAgICBPcHRpb25TZXQgc3ludGhldGljIHByb3ZpZGVyIHRv IG1heGltaXplIGNvZGUgcmV1c2UuIElmIExMREIgaW5zdGFudGlhdGVzIHRoZSBwcm92aWRlcgor ICAgICAgICBiZWZvcmUgaW52b2tpbmcgdGhlIHR5cGUgc3VtbWFyeSBoYW5kbGVyIHRoZW4gZXZh bHVhdGluZyBHZXRDaGlsZE1lbWJlcldpdGhOYW1lKCkgb24KKyAgICAgICAgdGhlIFNCVmFsdWUg cGFzc2VkIHRvIHRoZSB0eXBlIHN1bW1hcnkgaGFuZGxlciB3aWxsIGFjY2VzcyB0aGUgc3Vic3Rp dHV0ZSBpbmZvcm1hdGlvbgorICAgICAgICBpbnN0ZWFkIG9mIHRoZSBvcmlnaW5hbCBkZWJ1ZyBp bmZvcm1hdGlvbi4gQXMgYSByZXN1bHQgT3B0aW9uU2V0J3Mgc3ludGhldGljIHByb3ZpZGVyJ3MK KyAgICAgICAgZ2V0X2NoaWxkX2luZGV4KCdtX3N0b3JhZ2UnKSByZXR1cm5zIE5vbmUgaGVuY2Ug U0JWYWx1ZS5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdtX3N0b3JhZ2UnKQorICAgICAgICByZXR1 cm5lZCBhbiBpbnZhbGlkIHZhbHVlOyA9PiBXVEZPcHRpb25TZXRQcm92aWRlci5fYml0bWFzaygp IHJldHVybnMgMDsgPT4gdGhlIHNpemUKKyAgICAgICAgcmVwb3J0ZWQgaW4gdGhlIHR5cGUgc3Vt bWFyeSBmb3IgdGhlIE9wdGlvblNldCBpcyAwLiBJbnN0ZWFkIGdldF9jaGlsZF9pbmRleCgnbV9z dG9yYWdlJykKKyAgICAgICAgc2hvdWxkIHJldHVybiBhIHZhbGlkIHZhbHVlLgorCisgICAgICAg ICogbGxkYi9sbGRiX3dlYmtpdC5weToKKyAgICAgICAgKEZsYWdFbnVtZXJhdGlvblByb3ZpZGVy Ll9faW5pdF9fKToKKyAgICAgICAgKEZsYWdFbnVtZXJhdGlvblByb3ZpZGVyKToKKyAgICAgICAg KEZsYWdFbnVtZXJhdGlvblByb3ZpZGVyLl9nZXRfY2hpbGRfaW5kZXgpOiBBZGRlZC4gV1RGT3B0 aW9uU2V0UHJvdmlkZXIgd2lsbCBvdmVycmlkZS4KKyAgICAgICAgKEZsYWdFbnVtZXJhdGlvblBy b3ZpZGVyLl9nZXRfY2hpbGRfYXRfaW5kZXgpOiBBZGRlZC4gV1RGT3B0aW9uU2V0UHJvdmlkZXIg d2lsbCBvdmVycmlkZS4KKyAgICAgICAgKEZsYWdFbnVtZXJhdGlvblByb3ZpZGVyLnNpemUpOiBB ZGRlZC4KKyAgICAgICAgKEZsYWdFbnVtZXJhdGlvblByb3ZpZGVyLmdldF9jaGlsZF9pbmRleCk6 IE1vZGlmaWVkIHRvIGNhbGwgX2dldF9jaGlsZF9pbmRleCgpLgorICAgICAgICAoRmxhZ0VudW1l cmF0aW9uUHJvdmlkZXIuZ2V0X2NoaWxkX2F0X2luZGV4KTogTW9kaWZpZWQgdG8gY2FsbCBfZ2V0 X2NoaWxkX2F0X2luZGV4KCkuCisgICAgICAgIChGbGFnRW51bWVyYXRpb25Qcm92aWRlci51cGRh dGUpOiBNb3ZlZCBpbml0aWFsaXphdGlvbiBvZiBzZWxmLl9lbGVtZW50cyB0byB0aGUgY29uc3Ry dWN0b3IKKyAgICAgICAgYW5kIHJlbW92ZWQgc2VsZi5zaXplLiBGb3IgdGhlIGxhdHRlciB3ZSBj YW4ganVzdCBleHBvc2UgYSBnZXR0ZXIgdGhhdCByZXR1cm5zIHRoZSBzaXplIG9mCisgICAgICAg IHRoZSBsaXN0IHNlbGYuX2VsZW1lbnRzLgorICAgICAgICAoV1RGT3B0aW9uU2V0UHJvdmlkZXIu X2dldF9jaGlsZF9pbmRleCk6IEFkZGVkLiBSZXR1cm4gdGhlIGluZGV4IGZvciBMTERCIHRvIHF1 ZXJ5IGZvciB0aGUKKyAgICAgICAgdmFsdWUgb2YgbV9zdG9yYWdlLgorICAgICAgICAoV1RGT3B0 aW9uU2V0UHJvdmlkZXIpOgorICAgICAgICAoV1RGT3B0aW9uU2V0UHJvdmlkZXIuX2dldF9jaGls ZF9hdF9pbmRleCk6IEFkZGVkLiBSZXR1cm4gdGhlIHZhbHVlIGZvciBtX3N0b3JhZ2UgaWYgaXQK KyAgICAgICAgbWF0Y2hlcyB0aGUgc3BlY2lmaWVkIGluZGV4LgorCiAyMDE5LTA4LTA4ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgYSB0ZXN0IHRvIGVu c3VyZSB0aGF0IHdlIGRpc3BhdGNoIGtleWRvd24gYW5kIGtleXVwIGV2ZW50cyB3aGVuIG11bHRp cGxlIGtleXMgYXJlIHByZXNzZWQgYXQgdGhlIHNhbWUgdGltZQpkaWZmIC0tZ2l0IGEvVG9vbHMv bGxkYi9sbGRiX3dlYmtpdC5weSBiL1Rvb2xzL2xsZGIvbGxkYl93ZWJraXQucHkKaW5kZXggZDhh NjFlYjEzNGRmZGQ3MDgzZDJhMDM3ZmM1ZDhmMzFmOGIxYTBkOC4uZjY4MzliYmIyNDJiOWNiZjFm ZmQxMDM0NjJmZWZhNTE3MDg4ZWZmYiAxMDA2NDQKLS0tIGEvVG9vbHMvbGxkYi9sbGRiX3dlYmtp dC5weQorKysgYi9Ub29scy9sbGRiL2xsZGJfd2Via2l0LnB5CkBAIC03MzgsNiArNzM4LDcgQEAg Y2xhc3MgV2ViQ29yZURvY3VtZW50UHJvdmlkZXI6CiBjbGFzcyBGbGFnRW51bWVyYXRpb25Qcm92 aWRlcihvYmplY3QpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCB2YWxvYmosIGludGVybmFsX2Rp Y3QpOgogICAgICAgICBzZWxmLnZhbG9iaiA9IHZhbG9iagorICAgICAgICBzZWxmLl9lbGVtZW50 cyA9IFtdCiAgICAgICAgIHNlbGYudXBkYXRlKCkKIAogICAgICMgU3ViY2xhc3NlcyBtdXN0IG92 ZXJyaWRlIHRoaXMgdG8gcmV0dXJuIGEgZGljdGlvbmFyeSB0aGF0IG1hcHMgZW11bWVyYXRvciB2 YWx1ZXMgdG8gbmFtZXMuCkBAIC03NTMsNiArNzU0LDI0IEBAIGNsYXNzIEZsYWdFbnVtZXJhdGlv blByb3ZpZGVyKG9iamVjdCk6CiAgICAgZGVmIF91cGRhdGUoc2VsZik6CiAgICAgICAgIHBhc3MK IAorICAgICMgU3ViY2xhc3NlcyBjYW4gb3ZlcnJpZGUgdGhpcyB0byBwcm92aWRlIHRoZSBpbmRl eCB0aGF0IGNvcnJlc3BvbmRzIHRvIHRoZSBzcGVjaWZpZWQgbmFtZS4KKyAgICAjIElmIHRoaXMg bWV0aG9kIGlzIG92ZXJyaWRkZW4gdGhlbiBpdCBpcyBhbHNvIGV4cGVjdGVkIHRoYXQgX2dldF9j aGlsZF9hdF9pbmRleCgpIHdpbGwgYmUKKyAgICAjIG92ZXJyaWRkZW4gdG8gcHJvdmlkZSB0aGUg dmFsdWUgZm9yIHRoZSBpbmRleCByZXR1cm5lZCBieSB0aGlzIG1ldGhvZC4gTm90ZSB0aGF0IHRo ZQorICAgICMgcmV0dXJuZWQgaW5kZXggbXVzdCBiZSBncmVhdGVyIHRoYW4gb3IgZXF1YWwgdG8g c2VsZi5zaXplIGluIG9yZGVyIHRvIGF2b2lkIGJyZWFraW5nCisgICAgIyBwcmludGluZyBvZiBz eW50aGV0aWMgY2hpbGRyZW4uCisgICAgZGVmIF9nZXRfY2hpbGRfaW5kZXgoc2VsZiwgbmFtZSk6 CisgICAgICAgIHJldHVybiBOb25lCisKKyAgICAjIFN1YmNsYXNzZXMgY2FuIG92ZXJyaWRlIHRo aXMgdG8gcHJvdmlkZSB0aGUgU0JWYWx1ZSBmb3IgdGhlIHNwZWNpZmllZCBpbmRleC4gSXQgaXMg b25seQorICAgICMgbWVhbmluZ2Z1bCB0byBvdmVycmlkZSB0aGlzIG1ldGhvZCBpZiBfZ2V0X2No aWxkX2luZGV4KCkgaXMgYWxzbyBvdmVycmlkZGVuLgorICAgIGRlZiBfZ2V0X2NoaWxkX2F0X2lu ZGV4KHNlbGYsIGluZGV4KToKKyAgICAgICAgcmV0dXJuIE5vbmUKKworICAgIEBwcm9wZXJ0eQor ICAgIGRlZiBzaXplKHNlbGYpOgorICAgICAgICByZXR1cm4gbGVuKHNlbGYuX2VsZW1lbnRzKQor CisgICAgIyBMTERCIG92ZXJyaWRlcwogICAgIGRlZiBoYXNfY2hpbGRyZW4oc2VsZik6CiAgICAg ICAgIHJldHVybiBib29sKHNlbGYuX2VsZW1lbnRzKQogCkBAIC03NjAsMTAgKzc3OSw3IEBAIGNs YXNzIEZsYWdFbnVtZXJhdGlvblByb3ZpZGVyKG9iamVjdCk6CiAgICAgICAgIHJldHVybiBsZW4o c2VsZi5fZWxlbWVudHMpCiAKICAgICBkZWYgZ2V0X2NoaWxkX2luZGV4KHNlbGYsIG5hbWUpOgot ICAgICAgICB0cnk6Ci0gICAgICAgICAgICByZXR1cm4gaW50KG5hbWUubHN0cmlwKCdbJykucnN0 cmlwKCddJykpCi0gICAgICAgIGV4Y2VwdDoKLSAgICAgICAgICAgIHJldHVybiBOb25lCisgICAg ICAgIHJldHVybiBzZWxmLl9nZXRfY2hpbGRfaW5kZXgobmFtZSkKIAogICAgIGRlZiBnZXRfY2hp bGRfYXRfaW5kZXgoc2VsZiwgaW5kZXgpOgogICAgICAgICBpZiBpbmRleCA8IDAgb3Igbm90IHNl bGYudmFsb2JqLklzVmFsaWQoKToKQEAgLTc3MSwxNCArNzg3LDExIEBAIGNsYXNzIEZsYWdFbnVt ZXJhdGlvblByb3ZpZGVyKG9iamVjdCk6CiAgICAgICAgIGlmIGluZGV4IDwgbGVuKHNlbGYuX2Vs ZW1lbnRzKToKICAgICAgICAgICAgIChuYW1lLCB2YWx1ZSkgPSBzZWxmLl9lbGVtZW50c1tpbmRl eF0KICAgICAgICAgICAgIHJldHVybiBzZWxmLnZhbG9iai5DcmVhdGVWYWx1ZUZyb21FeHByZXNz aW9uKG5hbWUsIHN0cih2YWx1ZSkpCi0gICAgICAgIHJldHVybiBOb25lCisgICAgICAgIHJldHVy biBzZWxmLl9nZXRfY2hpbGRfYXRfaW5kZXgoaW5kZXgpCiAKICAgICBkZWYgdXBkYXRlKHNlbGYp OgogICAgICAgICBzZWxmLl91cGRhdGUoKQogCi0gICAgICAgIHNlbGYuX2VsZW1lbnRzID0gW10K LSAgICAgICAgc2VsZi5zaXplID0gMAotCiAgICAgICAgIGVudW1lcmF0b3JfdmFsdWVfdG9fbmFt ZV9tYXAgPSBzZWxmLl9lbnVtZXJhdG9yX3ZhbHVlX3RvX25hbWVfbWFwKCkKICAgICAgICAgaWYg bm90IGVudW1lcmF0b3JfdmFsdWVfdG9fbmFtZV9tYXA6CiAgICAgICAgICAgICByZXR1cm4KQEAg LTc5Niw4ICs4MDksNiBAQCBjbGFzcyBGbGFnRW51bWVyYXRpb25Qcm92aWRlcihvYmplY3QpOgog ICAgICAgICAgICAgZWxlbWVudHMuYXBwZW5kKChlbnVtZXJhdG9yX3ZhbHVlX3RvX25hbWVfbWFw W2N1cnJlbnRdLCBjdXJyZW50KSkgICMgZS5nLiAoJ1NwZWxsaW5nJywgNCkKICAgICAgICAgICAg IGJpdG1hc2sgPSBiaXRtYXNrICYgKGJpdG1hc2sgLSAxKSAgIyBUdXJuIG9mZiB0aGUgcmlnaHRt b3N0IHNldCBiaXQuCiAgICAgICAgIHNlbGYuX2VsZW1lbnRzID0gZWxlbWVudHMKLSAgICAgICAg c2VsZi5zaXplID0gbGVuKGVsZW1lbnRzKQotCiAKIGNsYXNzIFdURk9wdGlvblNldFByb3ZpZGVy KEZsYWdFbnVtZXJhdGlvblByb3ZpZGVyKToKICAgICBkZWYgX2VudW1lcmF0b3JfdmFsdWVfdG9f bmFtZV9tYXAoc2VsZik6CkBAIC04MTUsNiArODI2LDE2IEBAIGNsYXNzIFdURk9wdGlvblNldFBy b3ZpZGVyKEZsYWdFbnVtZXJhdGlvblByb3ZpZGVyKToKICAgICBkZWYgX3VwZGF0ZShzZWxmKToK ICAgICAgICAgc2VsZi5zdG9yYWdlID0gc2VsZi52YWxvYmouR2V0Q2hpbGRNZW1iZXJXaXRoTmFt ZSgnbV9zdG9yYWdlJykgICMgTWF5IGJlIGFuIGludmFsaWQgdmFsdWUuCiAKKyAgICBkZWYgX2dl dF9jaGlsZF9pbmRleChzZWxmLCBuYW1lKToKKyAgICAgICAgaWYgbmFtZSA9PSAnbV9zdG9yYWdl JzoKKyAgICAgICAgICAgIHJldHVybiBzZWxmLnNpemUKKyAgICAgICAgcmV0dXJuIE5vbmUKKwor ICAgIGRlZiBfZ2V0X2NoaWxkX2F0X2luZGV4KHNlbGYsIGluZGV4KToKKyAgICAgICAgaWYgaW5k ZXggPT0gc2VsZi5zaXplOgorICAgICAgICAgICAgcmV0dXJuIHNlbGYuc3RvcmFnZQorICAgICAg ICByZXR1cm4gTm9uZQorCiAKIGNsYXNzIFJhd0JpdG1hc2tQcm92aWRlckJhc2UoRmxhZ0VudW1l cmF0aW9uUHJvdmlkZXIpOgogICAgIEVOVU1FUkFUT1JfVkFMVUVfVE9fTkFNRV9NQVAgPSB7fQo= 377058 2019-08-22 15:05:43 -0700 2019-08-22 15:05:43 -0700 To land bug-200742-20190822150542.patch text/plain 7275 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4NTMxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmEzMmUzNTk5ODJlYmI4ZTgzZTZkNjZlN2I1NWViMzFi NDI1YTM3My4uOTlkY2FlYzYxNTkxNThmZDRiMWFiOTFiZDIxZWVlNDRlOTFiNzA1NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ1 IEBACisyMDE5LTA4LTIyICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAg ICAgICBbbGxkYi13ZWJraXRdIE9wdGlvblNldCBzdW1tYXJ5IHNob3dzIHNpemUgMCBzb21ldGlt ZXMgZm9yIG5vbi1lbXB0eSBzZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwMDc0MgorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4K KworICAgICAgICBUaGUgT3B0aW9uU2V0IHN5bnRoZXRpYyBwcm92aWRlciBtdXN0IHJlc3BvbmQg dG8gcmVxdWVzdHMgZm9yIHRoZSB2YWx1ZSBvZiBtX3N0b3JhZ2UKKyAgICAgICAgKGkuZS4gR2V0 Q2hpbGRNZW1iZXJXaXRoTmFtZSgnbV9zdG9yYWdlJykpIHRvIGF2b2lkIGludGVyZmVyaW5nIHdp dGggdGhlIGNvbXB1dGF0aW9uCisgICAgICAgIG9mIHRoZSB0eXBlIHN1bW1hcnkuCisKKyAgICAg ICAgU3ludGhldGljIHByb3ZpZGVycyBzdWJzdGl0dXRlIGFsdGVybmF0aXZlIGRlYnVnIGluZm9y bWF0aW9uIChjaGlsZHJlbikgZm9yIHRoZSBkZWZhdWx0CisgICAgICAgIGluZm9ybWF0aW9uIGZv ciBhIHZhcmlhYmxlLiBUaGUgT3B0aW9uU2V0IHR5cGUgc3VtbWFyeSBpcyBpbXBsZW1lbnRlZCBp biB0ZXJtcyBvZiB0aGUKKyAgICAgICAgT3B0aW9uU2V0IHN5bnRoZXRpYyBwcm92aWRlciB0byBt YXhpbWl6ZSBjb2RlIHJldXNlLiBJZiBMTERCIGluc3RhbnRpYXRlcyB0aGUgcHJvdmlkZXIKKyAg ICAgICAgYmVmb3JlIGludm9raW5nIHRoZSB0eXBlIHN1bW1hcnkgaGFuZGxlciB0aGVuIGV2YWx1 YXRpbmcgR2V0Q2hpbGRNZW1iZXJXaXRoTmFtZSgpIG9uCisgICAgICAgIHRoZSBTQlZhbHVlIHBh c3NlZCB0byB0aGUgdHlwZSBzdW1tYXJ5IGhhbmRsZXIgd2lsbCBhY2Nlc3MgdGhlIHN1YnN0aXR1 dGUgaW5mb3JtYXRpb24KKyAgICAgICAgaW5zdGVhZCBvZiB0aGUgb3JpZ2luYWwgZGVidWcgaW5m b3JtYXRpb24uIEFzIGEgcmVzdWx0IE9wdGlvblNldCdzIHN5bnRoZXRpYyBwcm92aWRlcidzCisg ICAgICAgIGdldF9jaGlsZF9pbmRleCgnbV9zdG9yYWdlJykgcmV0dXJucyBOb25lIGhlbmNlIFNC VmFsdWUuR2V0Q2hpbGRNZW1iZXJXaXRoTmFtZSgnbV9zdG9yYWdlJykKKyAgICAgICAgcmV0dXJu ZWQgYW4gaW52YWxpZCB2YWx1ZTsgPT4gV1RGT3B0aW9uU2V0UHJvdmlkZXIuX2JpdG1hc2soKSBy ZXR1cm5zIDA7ID0+IHRoZSBzaXplCisgICAgICAgIHJlcG9ydGVkIGluIHRoZSB0eXBlIHN1bW1h cnkgZm9yIHRoZSBPcHRpb25TZXQgaXMgMC4gSW5zdGVhZCBnZXRfY2hpbGRfaW5kZXgoJ21fc3Rv cmFnZScpCisgICAgICAgIHNob3VsZCByZXR1cm4gYSB2YWxpZCB2YWx1ZS4KKworICAgICAgICAq IGxsZGIvbGxkYl93ZWJraXQucHk6CisgICAgICAgIChGbGFnRW51bWVyYXRpb25Qcm92aWRlci5f X2luaXRfXyk6CisgICAgICAgIChGbGFnRW51bWVyYXRpb25Qcm92aWRlcik6CisgICAgICAgIChG bGFnRW51bWVyYXRpb25Qcm92aWRlci5fZ2V0X2NoaWxkX2luZGV4KTogQWRkZWQuIFdURk9wdGlv blNldFByb3ZpZGVyIHdpbGwgb3ZlcnJpZGUuCisgICAgICAgIChGbGFnRW51bWVyYXRpb25Qcm92 aWRlci5fZ2V0X2NoaWxkX2F0X2luZGV4KTogQWRkZWQuIFdURk9wdGlvblNldFByb3ZpZGVyIHdp bGwgb3ZlcnJpZGUuCisgICAgICAgIChGbGFnRW51bWVyYXRpb25Qcm92aWRlci5zaXplKTogQWRk ZWQuCisgICAgICAgIChGbGFnRW51bWVyYXRpb25Qcm92aWRlci5nZXRfY2hpbGRfaW5kZXgpOiBN b2RpZmllZCB0byBjYWxsIF9nZXRfY2hpbGRfaW5kZXgoKS4KKyAgICAgICAgKEZsYWdFbnVtZXJh dGlvblByb3ZpZGVyLmdldF9jaGlsZF9hdF9pbmRleCk6IE1vZGlmaWVkIHRvIGNhbGwgX2dldF9j aGlsZF9hdF9pbmRleCgpLgorICAgICAgICAoRmxhZ0VudW1lcmF0aW9uUHJvdmlkZXIudXBkYXRl KTogTW92ZWQgaW5pdGlhbGl6YXRpb24gb2Ygc2VsZi5fZWxlbWVudHMgdG8gdGhlIGNvbnN0cnVj dG9yCisgICAgICAgIGFuZCByZW1vdmVkIHNlbGYuc2l6ZS4gRm9yIHRoZSBsYXR0ZXIgd2UgY2Fu IGp1c3QgZXhwb3NlIGEgZ2V0dGVyIHRoYXQgcmV0dXJucyB0aGUgc2l6ZSBvZgorICAgICAgICB0 aGUgbGlzdCBzZWxmLl9lbGVtZW50cy4KKyAgICAgICAgKFdURk9wdGlvblNldFByb3ZpZGVyLl9n ZXRfY2hpbGRfaW5kZXgpOiBBZGRlZC4gUmV0dXJuIHRoZSBpbmRleCBmb3IgTExEQiB0byBxdWVy eSBmb3IgdGhlCisgICAgICAgIHZhbHVlIG9mIG1fc3RvcmFnZS4KKyAgICAgICAgKFdURk9wdGlv blNldFByb3ZpZGVyKToKKyAgICAgICAgKFdURk9wdGlvblNldFByb3ZpZGVyLl9nZXRfY2hpbGRf YXRfaW5kZXgpOiBBZGRlZC4gUmV0dXJuIHRoZSB2YWx1ZSBmb3IgbV9zdG9yYWdlIGlmIGl0Cisg ICAgICAgIG1hdGNoZXMgdGhlIHNwZWNpZmllZCBpbmRleC4KKyAgICAgICAgKiBsbGRiL2xsZGJf d2Via2l0X3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdFN1bW1hcnlQcm92aWRlcnMuc2VyaWFs X3Rlc3RfV1RGT3B0aW9uU2V0UHJvdmlkZXJfZW1wdHkpOiBVcGRhdGUgZXhwZWN0ZWQgcmVzdWx0 IG5vdworICAgICAgICB0aGF0IHdlIHJldHVybiB0aGUgdmFsdWUgb2YgbV9zdG9yYWdlIGFzIHRo ZSBsYXN0IHN5bnRoZXRpYyBjaGlsZC4KKwogMjAxOS0wOC0wOCAgRGFuaWVsIEJhdGVzICA8ZGFi YXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGEgdGVzdCB0byBlbnN1cmUgdGhhdCB3ZSBk aXNwYXRjaCBrZXlkb3duIGFuZCBrZXl1cCBldmVudHMgd2hlbiBtdWx0aXBsZSBrZXlzIGFyZSBw cmVzc2VkIGF0IHRoZSBzYW1lIHRpbWUKZGlmZiAtLWdpdCBhL1Rvb2xzL2xsZGIvbGxkYl93ZWJr aXQucHkgYi9Ub29scy9sbGRiL2xsZGJfd2Via2l0LnB5CmluZGV4IGQ4YTYxZWIxMzRkZmRkNzA4 M2QyYTAzN2ZjNWQ4ZjMxZjhiMWEwZDguLmY2ODM5YmJiMjQyYjljYmYxZmZkMTAzNDYyZmVmYTUx NzA4OGVmZmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2xsZGIvbGxkYl93ZWJraXQucHkKKysrIGIvVG9v bHMvbGxkYi9sbGRiX3dlYmtpdC5weQpAQCAtNzM4LDYgKzczOCw3IEBAIGNsYXNzIFdlYkNvcmVE b2N1bWVudFByb3ZpZGVyOgogY2xhc3MgRmxhZ0VudW1lcmF0aW9uUHJvdmlkZXIob2JqZWN0KToK ICAgICBkZWYgX19pbml0X18oc2VsZiwgdmFsb2JqLCBpbnRlcm5hbF9kaWN0KToKICAgICAgICAg c2VsZi52YWxvYmogPSB2YWxvYmoKKyAgICAgICAgc2VsZi5fZWxlbWVudHMgPSBbXQogICAgICAg ICBzZWxmLnVwZGF0ZSgpCiAKICAgICAjIFN1YmNsYXNzZXMgbXVzdCBvdmVycmlkZSB0aGlzIHRv IHJldHVybiBhIGRpY3Rpb25hcnkgdGhhdCBtYXBzIGVtdW1lcmF0b3IgdmFsdWVzIHRvIG5hbWVz LgpAQCAtNzUzLDYgKzc1NCwyNCBAQCBjbGFzcyBGbGFnRW51bWVyYXRpb25Qcm92aWRlcihvYmpl Y3QpOgogICAgIGRlZiBfdXBkYXRlKHNlbGYpOgogICAgICAgICBwYXNzCiAKKyAgICAjIFN1YmNs YXNzZXMgY2FuIG92ZXJyaWRlIHRoaXMgdG8gcHJvdmlkZSB0aGUgaW5kZXggdGhhdCBjb3JyZXNw b25kcyB0byB0aGUgc3BlY2lmaWVkIG5hbWUuCisgICAgIyBJZiB0aGlzIG1ldGhvZCBpcyBvdmVy cmlkZGVuIHRoZW4gaXQgaXMgYWxzbyBleHBlY3RlZCB0aGF0IF9nZXRfY2hpbGRfYXRfaW5kZXgo KSB3aWxsIGJlCisgICAgIyBvdmVycmlkZGVuIHRvIHByb3ZpZGUgdGhlIHZhbHVlIGZvciB0aGUg aW5kZXggcmV0dXJuZWQgYnkgdGhpcyBtZXRob2QuIE5vdGUgdGhhdCB0aGUKKyAgICAjIHJldHVy bmVkIGluZGV4IG11c3QgYmUgZ3JlYXRlciB0aGFuIG9yIGVxdWFsIHRvIHNlbGYuc2l6ZSBpbiBv cmRlciB0byBhdm9pZCBicmVha2luZworICAgICMgcHJpbnRpbmcgb2Ygc3ludGhldGljIGNoaWxk cmVuLgorICAgIGRlZiBfZ2V0X2NoaWxkX2luZGV4KHNlbGYsIG5hbWUpOgorICAgICAgICByZXR1 cm4gTm9uZQorCisgICAgIyBTdWJjbGFzc2VzIGNhbiBvdmVycmlkZSB0aGlzIHRvIHByb3ZpZGUg dGhlIFNCVmFsdWUgZm9yIHRoZSBzcGVjaWZpZWQgaW5kZXguIEl0IGlzIG9ubHkKKyAgICAjIG1l YW5pbmdmdWwgdG8gb3ZlcnJpZGUgdGhpcyBtZXRob2QgaWYgX2dldF9jaGlsZF9pbmRleCgpIGlz IGFsc28gb3ZlcnJpZGRlbi4KKyAgICBkZWYgX2dldF9jaGlsZF9hdF9pbmRleChzZWxmLCBpbmRl eCk6CisgICAgICAgIHJldHVybiBOb25lCisKKyAgICBAcHJvcGVydHkKKyAgICBkZWYgc2l6ZShz ZWxmKToKKyAgICAgICAgcmV0dXJuIGxlbihzZWxmLl9lbGVtZW50cykKKworICAgICMgTExEQiBv dmVycmlkZXMKICAgICBkZWYgaGFzX2NoaWxkcmVuKHNlbGYpOgogICAgICAgICByZXR1cm4gYm9v bChzZWxmLl9lbGVtZW50cykKIApAQCAtNzYwLDEwICs3NzksNyBAQCBjbGFzcyBGbGFnRW51bWVy YXRpb25Qcm92aWRlcihvYmplY3QpOgogICAgICAgICByZXR1cm4gbGVuKHNlbGYuX2VsZW1lbnRz KQogCiAgICAgZGVmIGdldF9jaGlsZF9pbmRleChzZWxmLCBuYW1lKToKLSAgICAgICAgdHJ5Ogot ICAgICAgICAgICAgcmV0dXJuIGludChuYW1lLmxzdHJpcCgnWycpLnJzdHJpcCgnXScpKQotICAg ICAgICBleGNlcHQ6Ci0gICAgICAgICAgICByZXR1cm4gTm9uZQorICAgICAgICByZXR1cm4gc2Vs Zi5fZ2V0X2NoaWxkX2luZGV4KG5hbWUpCiAKICAgICBkZWYgZ2V0X2NoaWxkX2F0X2luZGV4KHNl bGYsIGluZGV4KToKICAgICAgICAgaWYgaW5kZXggPCAwIG9yIG5vdCBzZWxmLnZhbG9iai5Jc1Zh bGlkKCk6CkBAIC03NzEsMTQgKzc4NywxMSBAQCBjbGFzcyBGbGFnRW51bWVyYXRpb25Qcm92aWRl cihvYmplY3QpOgogICAgICAgICBpZiBpbmRleCA8IGxlbihzZWxmLl9lbGVtZW50cyk6CiAgICAg ICAgICAgICAobmFtZSwgdmFsdWUpID0gc2VsZi5fZWxlbWVudHNbaW5kZXhdCiAgICAgICAgICAg ICByZXR1cm4gc2VsZi52YWxvYmouQ3JlYXRlVmFsdWVGcm9tRXhwcmVzc2lvbihuYW1lLCBzdHIo dmFsdWUpKQotICAgICAgICByZXR1cm4gTm9uZQorICAgICAgICByZXR1cm4gc2VsZi5fZ2V0X2No aWxkX2F0X2luZGV4KGluZGV4KQogCiAgICAgZGVmIHVwZGF0ZShzZWxmKToKICAgICAgICAgc2Vs Zi5fdXBkYXRlKCkKIAotICAgICAgICBzZWxmLl9lbGVtZW50cyA9IFtdCi0gICAgICAgIHNlbGYu c2l6ZSA9IDAKLQogICAgICAgICBlbnVtZXJhdG9yX3ZhbHVlX3RvX25hbWVfbWFwID0gc2VsZi5f ZW51bWVyYXRvcl92YWx1ZV90b19uYW1lX21hcCgpCiAgICAgICAgIGlmIG5vdCBlbnVtZXJhdG9y X3ZhbHVlX3RvX25hbWVfbWFwOgogICAgICAgICAgICAgcmV0dXJuCkBAIC03OTYsOCArODA5LDYg QEAgY2xhc3MgRmxhZ0VudW1lcmF0aW9uUHJvdmlkZXIob2JqZWN0KToKICAgICAgICAgICAgIGVs ZW1lbnRzLmFwcGVuZCgoZW51bWVyYXRvcl92YWx1ZV90b19uYW1lX21hcFtjdXJyZW50XSwgY3Vy cmVudCkpICAjIGUuZy4gKCdTcGVsbGluZycsIDQpCiAgICAgICAgICAgICBiaXRtYXNrID0gYml0 bWFzayAmIChiaXRtYXNrIC0gMSkgICMgVHVybiBvZmYgdGhlIHJpZ2h0bW9zdCBzZXQgYml0Lgog ICAgICAgICBzZWxmLl9lbGVtZW50cyA9IGVsZW1lbnRzCi0gICAgICAgIHNlbGYuc2l6ZSA9IGxl bihlbGVtZW50cykKLQogCiBjbGFzcyBXVEZPcHRpb25TZXRQcm92aWRlcihGbGFnRW51bWVyYXRp b25Qcm92aWRlcik6CiAgICAgZGVmIF9lbnVtZXJhdG9yX3ZhbHVlX3RvX25hbWVfbWFwKHNlbGYp OgpAQCAtODE1LDYgKzgyNiwxNiBAQCBjbGFzcyBXVEZPcHRpb25TZXRQcm92aWRlcihGbGFnRW51 bWVyYXRpb25Qcm92aWRlcik6CiAgICAgZGVmIF91cGRhdGUoc2VsZik6CiAgICAgICAgIHNlbGYu c3RvcmFnZSA9IHNlbGYudmFsb2JqLkdldENoaWxkTWVtYmVyV2l0aE5hbWUoJ21fc3RvcmFnZScp ICAjIE1heSBiZSBhbiBpbnZhbGlkIHZhbHVlLgogCisgICAgZGVmIF9nZXRfY2hpbGRfaW5kZXgo c2VsZiwgbmFtZSk6CisgICAgICAgIGlmIG5hbWUgPT0gJ21fc3RvcmFnZSc6CisgICAgICAgICAg ICByZXR1cm4gc2VsZi5zaXplCisgICAgICAgIHJldHVybiBOb25lCisKKyAgICBkZWYgX2dldF9j aGlsZF9hdF9pbmRleChzZWxmLCBpbmRleCk6CisgICAgICAgIGlmIGluZGV4ID09IHNlbGYuc2l6 ZToKKyAgICAgICAgICAgIHJldHVybiBzZWxmLnN0b3JhZ2UKKyAgICAgICAgcmV0dXJuIE5vbmUK KwogCiBjbGFzcyBSYXdCaXRtYXNrUHJvdmlkZXJCYXNlKEZsYWdFbnVtZXJhdGlvblByb3ZpZGVy KToKICAgICBFTlVNRVJBVE9SX1ZBTFVFX1RPX05BTUVfTUFQID0ge30KZGlmZiAtLWdpdCBhL1Rv b2xzL2xsZGIvbGxkYl93ZWJraXRfdW5pdHRlc3QucHkgYi9Ub29scy9sbGRiL2xsZGJfd2Via2l0 X3VuaXR0ZXN0LnB5CmluZGV4IGVjODI0ZTc3NTg0N2IwYjllZjkzYjlhMTUxMjhmZDhhNjY1OTc2 YjcuLmMyODFmZmYxZjZhYzZiMWI0Yjg4Y2IwNTkzMTljMzMzYmQ0MzNjNmMgMTAwNzU1Ci0tLSBh L1Rvb2xzL2xsZGIvbGxkYl93ZWJraXRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvbGxkYi9sbGRi X3dlYmtpdF91bml0dGVzdC5weQpAQCAtMTg1LDcgKzE4NSw3IEBAIGNsYXNzIFRlc3RTdW1tYXJ5 UHJvdmlkZXJzKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgc2VyaWFsX3Rlc3RfV1RGT3B0 aW9uU2V0UHJvdmlkZXJfZW1wdHkoc2VsZik6CiAgICAgICAgIHZhcmlhYmxlID0gc2VsZi5fc2JG cmFtZS5GaW5kVmFyaWFibGUoJ2V4YW1wbGVGbGFnc0VtcHR5JykKICAgICAgICAgcHJvdmlkZXIg PSBsbGRiX3dlYmtpdC5XVEZPcHRpb25TZXRQcm92aWRlcih2YXJpYWJsZSwge30pCi0gICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwocHJvdmlkZXIuZ2V0X2NoaWxkX2F0X2luZGV4KDApLCBOb25lKQor ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHByb3ZpZGVyLmdldF9jaGlsZF9hdF9pbmRleCgwKS5H ZXROYW1lKCksICdtX3N0b3JhZ2UnKQogCiAgICAgZGVmIHNlcmlhbF90ZXN0X1dURk9wdGlvblNl dFByb3ZpZGVyX3NpbXBsZShzZWxmKToKICAgICAgICAgdmFyaWFibGUgPSBzZWxmLl9zYkZyYW1l LkZpbmRWYXJpYWJsZSgnZXhhbXBsZUZsYWdzU2ltcGxlJykK