114552 2013-04-13 00:51:17 -0700 Remove more Chromium specific code from webkitpy 2013-04-13 01:09:30 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 114553 1 rniwa rniwa benjamin dpranke pnormand oldest_to_newest 875112 0 rniwa 2013-04-13 00:51:17 -0700 Remove more Chromium specific code from webkitpy 875113 1 197923 rniwa 2013-04-13 00:51:39 -0700 Created attachment 197923 Cleanup 875115 2 197923 pnormand 2013-04-13 00:57:28 -0700 Comment on attachment 197923 Cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=197923&action=review > Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:-651 > -# Left here not to break anything. > -class JSONResultsGenerator(JSONResultsGeneratorBase): So that class is no longer used? 875116 3 rniwa 2013-04-13 01:01:03 -0700 Committed r148352: <http://trac.webkit.org/changeset/148352> 875119 4 rniwa 2013-04-13 01:03:58 -0700 (In reply to comment #2) > (From update of attachment 197923 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=197923&action=review > > > Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:-651 > > -# Left here not to break anything. > > -class JSONResultsGenerator(JSONResultsGeneratorBase): > > So that class is no longer used? Yes, we should probably rename JSONResultsGeneratorBase to JSONResultsGenerator in a follow up. 197923 2013-04-13 00:51:39 -0700 2013-04-13 00:57:27 -0700 Cleanup bug-114552-20130413005116.patch text/plain 9089 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE0ODM0OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMwIEBACisyMDEzLTA0LTEzICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIFJlbW92ZSBtb3JlIENocm9taXVtIHNwZWNpZmljIGNvZGUgZnJvbSB3ZWJraXRw eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE0NTUy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9ob3N0LnB5OgorICAgICAgICAoSG9zdC5jaGVja291dCk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNv bl9yZXN1bHRzX2dlbmVyYXRvci5weToKKyAgICAgICAgKEpTT05SZXN1bHRzR2VuZXJhdG9yQmFz ZSk6CisgICAgICAgIChKU09OUmVzdWx0c0dlbmVyYXRvckJhc2UuX19pbml0X18pOgorICAgICAg ICAoSlNPTlJlc3VsdHNHZW5lcmF0b3JCYXNlLl9pc19yZXN1bHRzX2FsbF9vZl90eXBlKToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHk6CisgICAg ICAgIChQb3J0KToKKyAgICAgICAgKFBvcnQuZXhwZWN0ZWRfZmlsZW5hbWUpOgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5Ogor ICAgICAgICAoUGVyZlRlc3RzUnVubmVyLl9wYXJzZV9hcmdzKToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzLnB5OgorICAgICAgICAoUGF0Y2hQcm9jZXNz aW5nUXVldWUuX25ld19wb3J0X25hbWVfZnJvbV9vbGQpOgorICAgICAgICAoQ29tbWl0UXVldWUu ZGlkX3Bhc3NfdGVzdGluZ19ld3MpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9j b21tYW5kcy9yZWJhc2VsaW5lLnB5OgorICAgICAgICAoUmViYXNlbGluZVRlc3QuX3Jlc3VsdHNf dXJsKToKKyAgICAgICAgKFJlYmFzZWxpbmUuX2J1aWxkZXJfd2l0aF9uYW1lKToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHk6CisgICAgICAgIChNb2NrVG9vbC5p cmMpOgorCiAyMDEzLTA0LTEzICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4K IAogICAgICAgICBGaXggZmxha2luZXNzIGRhc2hib2FyZCB1bml0IHRlc3QgZmFpbHVyZXMKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2hvc3QucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vaG9zdC5weQkocmV2aXNpb24gMTQ4MzQ2KQor KysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vaG9zdC5weQkod29ya2luZyBjb3B5KQpA QCAtODksMTEgKzg5LDYgQEAgY2xhc3MgSG9zdChTeXN0ZW1Ib3N0KToKICAgICBkZWYgY2hlY2tv dXQoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl9jaGVja291dAogCi0gICAgZGVmIGJ1aWxk Ym90X2Zvcl9idWlsZGVyX25hbWUoc2VsZiwgbmFtZSk6Ci0gICAgICAgIGlmIHNlbGYucG9ydF9m YWN0b3J5LmdldF9mcm9tX2J1aWxkZXJfbmFtZShuYW1lKS5pc19jaHJvbWl1bSgpOgotICAgICAg ICAgICAgcmV0dXJuIHNlbGYuY2hyb21pdW1fYnVpbGRib3QoKQotICAgICAgICByZXR1cm4gc2Vs Zi5idWlsZGJvdAotCiAgICAgQG1lbW9pemVkCiAgICAgZGVmIHdhdGNoX2xpc3Qoc2VsZik6CiAg ICAgICAgIHJldHVybiBXYXRjaExpc3RMb2FkZXIoc2VsZi5maWxlc3lzdGVtKS5sb2FkKCkKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pz b25fcmVzdWx0c19nZW5lcmF0b3IucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvci5w eQkocmV2aXNpb24gMTQ4MzQ2KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbGF5b3V0X3BhY2thZ2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvci5weQkod29ya2luZyBjb3B5 KQpAQCAtMTg4LDE2ICsxODgsMTIgQEAgY2xhc3MgSlNPTlJlc3VsdHNHZW5lcmF0b3JCYXNlKG9i amVjdCk6CiAKICAgICBVUkxfRk9SX1RFU1RfTElTVF9KU09OID0gImh0dHA6Ly8lcy90ZXN0Zmls ZT9idWlsZGVyPSVzJm5hbWU9JXMmdGVzdGxpc3Rqc29uPTEmdGVzdHR5cGU9JXMmbWFzdGVyPSVz IgogCi0gICAgIyBGSVhNRTogUmVtb3ZlIGdlbmVyYXRlX2luY3JlbWVudGFsX3Jlc3VsdHMgb25j ZSB0aGUgcmVmZXJlbmNlIHRvIGl0IGluCi0gICAgIyBodHRwOi8vc3JjLmNocm9taXVtLm9yZy92 aWV3dmMvY2hyb21lL3RydW5rL3Rvb2xzL2J1aWxkL3NjcmlwdHMvc2xhdmUvZ3Rlc3Rfc2xhdmVf dXRpbHMucHkKLSAgICAjIGhhcyBiZWVuIHJlbW92ZWQuCiAgICAgZGVmIF9faW5pdF9fKHNlbGYs IHBvcnQsIGJ1aWxkZXJfbmFtZSwgYnVpbGRfbmFtZSwgYnVpbGRfbnVtYmVyLAogICAgICAgICBy ZXN1bHRzX2ZpbGVfYmFzZV9wYXRoLCBidWlsZGVyX2Jhc2VfdXJsLAogICAgICAgICB0ZXN0X3Jl c3VsdHNfbWFwLCBzdm5fcmVwb3NpdG9yaWVzPU5vbmUsCiAgICAgICAgIHRlc3RfcmVzdWx0c19z ZXJ2ZXI9Tm9uZSwKICAgICAgICAgdGVzdF90eXBlPSIiLAotICAgICAgICBtYXN0ZXJfbmFtZT0i IiwKLSAgICAgICAgZ2VuZXJhdGVfaW5jcmVtZW50YWxfcmVzdWx0cz1Ob25lKToKKyAgICAgICAg bWFzdGVyX25hbWU9IiIpOgogICAgICAgICAiIiJNb2RpZmllcyB0aGUgcmVzdWx0cy5qc29uIGZp bGUuIEdyYWJzIGl0IG9mZiB0aGUgYXJjaGl2ZSBkaXJlY3RvcnkKICAgICAgICAgaWYgaXQgaXMg bm90IGZvdW5kIGxvY2FsbHkuCiAKQEAgLTY0NSw4ICs2NDEsMyBAQCBjbGFzcyBKU09OUmVzdWx0 c0dlbmVyYXRvckJhc2Uob2JqZWN0KToKICAgICAgICAgIiIiUmV0dXJucyB3aGV0aGVyIGFsbCB0 aGUgcmVzdWx0cyBhcmUgb2YgdGhlIGdpdmVuIHR5cGUKICAgICAgICAgKGUuZy4gYWxsIHBhc3Nl cykuIiIiCiAgICAgICAgIHJldHVybiBsZW4ocmVzdWx0cykgPT0gMSBhbmQgcmVzdWx0c1swXVsx XSA9PSB0eXBlCi0KLQotIyBMZWZ0IGhlcmUgbm90IHRvIGJyZWFrIGFueXRoaW5nLgotY2xhc3Mg SlNPTlJlc3VsdHNHZW5lcmF0b3IoSlNPTlJlc3VsdHNHZW5lcmF0b3JCYXNlKToKLSAgICBwYXNz CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9i YXNlLnB5CShyZXZpc2lvbiAxNDgzNDYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Jhc2UucHkJKHdvcmtpbmcgY29weSkKQEAgLTczLDggKzczLDcgQEAgY2xh c3MgUG9ydChvYmplY3QpOgogICAgICIiIkFic3RyYWN0IGNsYXNzIGZvciBQb3J0LXNwZWNpZmlj IGhvb2tzIGZvciB0aGUgbGF5b3V0X3Rlc3QgcGFja2FnZS4iIiIKIAogICAgICMgU3ViY2xhc3Nl cyBvdmVycmlkZSB0aGlzLiBUaGlzIHNob3VsZCBpbmRpY2F0ZSB0aGUgYmFzaWMgaW1wbGVtZW50 YXRpb24KLSAgICAjIHBhcnQgb2YgdGhlIHBvcnQgbmFtZSwgZS5nLiwgJ2Nocm9taXVtLW1hYycs ICd3aW4nLCAnZ3RrJzsgdGhlcmUgaXMgcHJvYmFibHkgKD8pCi0gICAgIyBvbmUgdW5pcXVlIHZh bHVlIHBlciBjbGFzcy4KKyAgICAjIHBhcnQgb2YgdGhlIHBvcnQgbmFtZSwgZS5nLiwgJ3dpbics ICdndGsnOyB0aGVyZSBpcyBwcm9iYWJseSAoPykgb25lIHVuaXF1ZSB2YWx1ZSBwZXIgY2xhc3Mu CiAKICAgICAjIEZJWE1FOiBXZSBzaG91bGQgcHJvYmFibHkgcmVuYW1lIHRoaXMgdG8gc29tZXRo aW5nIGxpa2UgJ2ltcGxlbWVudGF0aW9uX25hbWUnLgogICAgIHBvcnRfbmFtZSA9IE5vbmUKQEAg LTQ4NSw4ICs0ODQsNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgIHN1ZmZpeDogZmls ZSBzdWZmaXggb2YgdGhlIGV4cGVjdGVkIHJlc3VsdHMsIGluY2x1ZGluZyBkb3Q7IGUuZy4gJy50 eHQnCiAgICAgICAgICAgICBvciAnLnBuZycuICBUaGlzIHNob3VsZCBub3QgYmUgTm9uZSwgYnV0 IG1heSBiZSBhbiBlbXB0eSBzdHJpbmcuCiAgICAgICAgIHBsYXRmb3JtOiB0aGUgbW9zdC1zcGVj aWZpYyBkaXJlY3RvcnkgbmFtZSB0byB1c2UgdG8gYnVpbGQgdGhlCi0gICAgICAgICAgICBzZWFy Y2ggbGlzdCBvZiBkaXJlY3RvcmllcywgZS5nLiwgJ2Nocm9taXVtLXdpbicsIG9yCi0gICAgICAg ICAgICAnY2hyb21pdW0tY2ctbWFjLWxlb3BhcmQnICh3ZSBmb2xsb3cgdGhlIFdlYktpdCBmb3Jt YXQpCisgICAgICAgICAgICBzZWFyY2ggbGlzdCBvZiBkaXJlY3RvcmllczsgZS5nLiAnbW91bnRh aW5saW9uLXdrMicKICAgICAgICAgcmV0dXJuX2RlZmF1bHQ6IGlmIFRydWUsIHJldHVybnMgdGhl IHBhdGggdG8gdGhlIGdlbmVyaWMgZXhwZWN0YXRpb24gaWYgbm90aGluZwogICAgICAgICAgICAg ZWxzZSBpcyBmb3VuZDsgaWYgRmFsc2UsIHJldHVybnMgTm9uZS4KIApJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVz dHNydW5uZXIucHkJKHJldmlzaW9uIDE0ODM0NikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv cGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC04 NCwxMCArODQsNiBAQCBjbGFzcyBQZXJmVGVzdHNSdW5uZXIob2JqZWN0KToKICAgICAgICAgICAg ICAgICBoZWxwPSdTZXQgdGhlIGNvbmZpZ3VyYXRpb24gdG8gUmVsZWFzZScpLAogICAgICAgICAg ICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tcGxhdGZvcm0iLAogICAgICAgICAgICAgICAgIGhl bHA9IlNwZWNpZnkgcG9ydC9wbGF0Zm9ybSBiZWluZyB0ZXN0ZWQgKGkuZS4gY2hyb21pdW0tbWFj KSIpLAotICAgICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tY2hyb21pdW0iLAotICAg ICAgICAgICAgICAgIGFjdGlvbj0ic3RvcmVfY29uc3QiLCBjb25zdD0nY2hyb21pdW0nLCBkZXN0 PSdwbGF0Zm9ybScsIGhlbHA9J0FsaWFzIGZvciAtLXBsYXRmb3JtPWNocm9taXVtJyksCi0gICAg ICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1jaHJvbWl1bS1hbmRyb2lkIiwKLSAgICAg ICAgICAgICAgICBhY3Rpb249InN0b3JlX2NvbnN0IiwgY29uc3Q9J2Nocm9taXVtLWFuZHJvaWQn LCBkZXN0PSdwbGF0Zm9ybScsIGhlbHA9J0FsaWFzIGZvciAtLXBsYXRmb3JtPWNocm9taXVtLWFu ZHJvaWQnKSwKICAgICAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLWJ1aWxkZXItbmFt ZSIsCiAgICAgICAgICAgICAgICAgaGVscD0oIlRoZSBuYW1lIG9mIHRoZSBidWlsZGVyIHNob3du IG9uIHRoZSB3YXRlcmZhbGwgcnVubmluZyB0aGlzIHNjcmlwdCBlLmcuIGdvb2dsZS1tYWMtMi4i KSksCiAgICAgICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1idWlsZC1udW1iZXIiLApJ bmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL21vY2t0b29sLnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9tb2NrdG9vbC5weQkocmV2aXNpb24gMTQ4 MzQ2KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL21vY2t0b29sLnB5CSh3b3JraW5n IGNvcHkpCkBAIC04Myw2ICs4MywzIEBAIGNsYXNzIE1vY2tUb29sKE1vY2tIb3N0KToKIAogICAg IGRlZiBpcmMoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl9pcmMKLQotICAgIGRlZiBidWls ZGJvdF9mb3JfYnVpbGRlcl9uYW1lKHNlbGYsIG5hbWUpOgotICAgICAgICByZXR1cm4gTW9ja0J1 aWxkQm90KCkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1 ZXMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRz L3F1ZXVlcy5weQkocmV2aXNpb24gMTQ4MzQ2KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL2NvbW1hbmRzL3F1ZXVlcy5weQkod29ya2luZyBjb3B5KQpAQCAtMjYxLDkgKzI2MSw2IEBA IGNsYXNzIFBhdGNoUHJvY2Vzc2luZ1F1ZXVlKEFic3RyYWN0UGF0Y2gKIAogICAgICMgRklYTUU6 IFRoaXMgaXMgYSBoYWNrIHRvIG1hcCBiZXR3ZWVuIHRoZSBvbGQgcG9ydCBuYW1lcyBhbmQgdGhl IG5ldyBwb3J0IG5hbWVzLgogICAgIGRlZiBfbmV3X3BvcnRfbmFtZV9mcm9tX29sZChzZWxmLCBw b3J0X25hbWUsIHBsYXRmb3JtKToKLSAgICAgICAgIyBUaGUgbmV3IHBvcnQgc3lzdGVtIGhhcyBu byBjb25jZXB0IG9mIHh2ZmIgeWV0LgotICAgICAgICBpZiBwb3J0X25hbWUgPT0gJ2Nocm9taXVt LXh2ZmInOgotICAgICAgICAgICAgcmV0dXJuICdjaHJvbWl1bScKICAgICAgICAgIyBBcHBsZVBv cnQuZGV0ZXJtaW5lX2Z1bGxfcG9ydF9uYW1lIGFzc2VydHMgaWYgdGhlIG5hbWUgZG9lc24ndCBp bmNsdWRlIHZlcnNpb24uCiAgICAgICAgIGlmIHBvcnRfbmFtZSA9PSAnbWFjJzoKICAgICAgICAg ICAgIHJldHVybiAnbWFjLScgKyBwbGF0Zm9ybS5vc192ZXJzaW9uCkBAIC0zODEsOSArMzc4LDkg QEAgY2xhc3MgQ29tbWl0UXVldWUoUGF0Y2hQcm9jZXNzaW5nUXVldWUsIAogICAgICAgICByZXBv cnRlci5yZXBvcnRfZmxha3lfdGVzdHMocGF0Y2gsIGZsYWt5X3Rlc3RfcmVzdWx0cywgcmVzdWx0 c19hcmNoaXZlKQogCiAgICAgZGVmIGRpZF9wYXNzX3Rlc3RpbmdfZXdzKHNlbGYsIHBhdGNoKToK LSAgICAgICAgIyBDdXJyZW50bHksIGNocm9taXVtLWV3cyBpcyB0aGUgb25seSB0ZXN0aW5nIEVX Uy4gT25jZSB0aGVyZSBhcmUgbW9yZSwKLSAgICAgICAgIyBzaG91bGQgbWFrZSBzdXJlIHRoZXkg YWxsIHBhc3MuCi0gICAgICAgIHN0YXR1cyA9IHNlbGYuX3Rvb2wuc3RhdHVzX3NlcnZlci5wYXRj aF9zdGF0dXMoImNocm9taXVtLWV3cyIsIHBhdGNoLmlkKCkpCisgICAgICAgICMgT25seSBNYWMg YW5kIE1hYyBXSzIgcnVuIHRlc3RzCisgICAgICAgICMgRklYTUU6IFdlIHNob3VsZG4ndCBoYXZl IHRvIGhhcmQtY29kZSBpdCBoZXJlLgorICAgICAgICBzdGF0dXMgPSBzZWxmLl90b29sLnN0YXR1 c19zZXJ2ZXIucGF0Y2hfc3RhdHVzKCJtYWMiLCBwYXRjaC5pZCgpKQogICAgICAgICByZXR1cm4g c3RhdHVzID09IHNlbGYuX3Bhc3Nfc3RhdHVzCiAKICAgICAjIFN0ZXBTZXF1ZW5jZUVycm9ySGFu ZGxlciBtZXRob2RzCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMv cmViYXNlbGluZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv Y29tbWFuZHMvcmViYXNlbGluZS5weQkocmV2aXNpb24gMTQ4MzQ2KQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHkJKHdvcmtpbmcgY29weSkKQEAg LTg4LDcgKzg4LDcgQEAgY2xhc3MgUmViYXNlbGluZVRlc3QoQWJzdHJhY3RSZWJhc2VsaW5pbgog ICAgICAgICBzZWxmLl9zY21fY2hhbmdlcyA9IHsnYWRkJzogW119CiAKICAgICBkZWYgX3Jlc3Vs dHNfdXJsKHNlbGYsIGJ1aWxkZXJfbmFtZSk6Ci0gICAgICAgIHJldHVybiBzZWxmLl90b29sLmJ1 aWxkYm90X2Zvcl9idWlsZGVyX25hbWUoYnVpbGRlcl9uYW1lKS5idWlsZGVyX3dpdGhfbmFtZShi dWlsZGVyX25hbWUpLmxhdGVzdF9sYXlvdXRfdGVzdF9yZXN1bHRzX3VybCgpCisgICAgICAgIHJl dHVybiBzZWxmLl90b29sLmJ1aWxkYm90LmJ1aWxkZXJfd2l0aF9uYW1lKGJ1aWxkZXJfbmFtZSku bGF0ZXN0X2xheW91dF90ZXN0X3Jlc3VsdHNfdXJsKCkKIAogICAgIGRlZiBfYmFzZWxpbmVfZGly ZWN0b3J5KHNlbGYsIGJ1aWxkZXJfbmFtZSk6CiAgICAgICAgIHBvcnQgPSBzZWxmLl90b29sLnBv cnRfZmFjdG9yeS5nZXRfZnJvbV9idWlsZGVyX25hbWUoYnVpbGRlcl9uYW1lKQpAQCAtNDY1LDcg KzQ2NSw3IEBAIGNsYXNzIFJlYmFzZWxpbmUoQWJzdHJhY3RQYXJhbGxlbFJlYmFzZWwKICAgICAg ICAgcmV0dXJuIFtzZWxmLl9idWlsZGVyX3dpdGhfbmFtZShuYW1lKSBmb3IgbmFtZSBpbiBjaG9z ZW5fbmFtZXNdCiAKICAgICBkZWYgX2J1aWxkZXJfd2l0aF9uYW1lKHNlbGYsIG5hbWUpOgotICAg ICAgICByZXR1cm4gc2VsZi5fdG9vbC5idWlsZGJvdF9mb3JfYnVpbGRlcl9uYW1lKG5hbWUpLmJ1 aWxkZXJfd2l0aF9uYW1lKG5hbWUpCisgICAgICAgIHJldHVybiBzZWxmLl90b29sLmJ1aWxkYm90 LmJ1aWxkZXJfd2l0aF9uYW1lKG5hbWUpCiAKICAgICBkZWYgX3Rlc3RzX3RvX3VwZGF0ZShzZWxm LCBidWlsZGVyKToKICAgICAgICAgZmFpbGluZ190ZXN0cyA9IGJ1aWxkZXIubGF0ZXN0X2xheW91 dF90ZXN0X3Jlc3VsdHMoKS50ZXN0c19tYXRjaGluZ19mYWlsdXJlX3R5cGVzKFt0ZXN0X2ZhaWx1 cmVzLkZhaWx1cmVUZXh0TWlzbWF0Y2hdKQo=