158682 2016-06-12 19:45:49 -0700 /admin/tests is very slow 2016-06-13 12:38:30 -0700 1 1 1 Unclassified WebKit Perf Dashboard WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa cdumez commit-queue dewei_zhu rniwa slewis oldest_to_newest 1201763 0 rniwa 2016-06-12 19:45:49 -0700 Now that we have 32,000+ test configurations on the internal perf dashboard, /admin/tests takes several seconds to load :( 1201765 1 281147 rniwa 2016-06-12 19:55:13 -0700 Created attachment 281147 Speeds up the page 1201766 2 281148 rniwa 2016-06-12 19:55:56 -0700 Created attachment 281148 Removed unused instance variable 1201851 3 281148 cdumez 2016-06-13 09:19:31 -0700 Comment on attachment 281148 Removed unused instance variable Rs=me 1201907 4 281148 commit-queue 2016-06-13 12:38:25 -0700 Comment on attachment 281148 Removed unused instance variable Clearing flags on attachment: 281148 Committed r202000: <http://trac.webkit.org/changeset/202000> 1201908 5 commit-queue 2016-06-13 12:38:30 -0700 All reviewed patches have been landed. Closing bug. 281147 2016-06-12 19:55:13 -0700 2016-06-12 19:55:53 -0700 Speeds up the page bug-158682-20160612195646.patch text/plain 14411 rniwa SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMjAxOTg1KQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI1IEBACisyMDE2LTA2LTEyICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIC9hZG1pbi90ZXN0cyBpcyB2ZXJ5IHNsb3cKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODY4MgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBzbG93bmVzcyBjYW1lIGZyb20gVGVzdE5h bWVSZXNvbHZlcjo6X19jb25zdHJ1Y3QsIHdoaWNoIHdhcyBmZXRjaGluZyB0aGUgZW50aXJlIHRh YmxlIG9mIHRlc3RfY29uZmlndXJhdGlvbnMsCisgICAgICAgIHdoaWNoIGF0IHRoaXMgcG9pbnQg Y29udGFpbnMgbW9yZSB0aGFuIDMyLDAwMCByb3dzLiBEb24ndCBmZXRjaCB0aGUgZW50aXJlIHRh YmxlIGluIHRoZSBjb25zdHJ1Y3Rvci4gSW5zdGVhZCwKKyAgICAgICAgZmV0Y2ggYSBzdWJzZXQg b2Ygcm93cyBhcyBuZWVkZWQgaW4gY29uZmlndXJhdGlvbnNfZm9yX21ldHJpY19hbmRfcGxhdGZv cm0uIEV2ZW4gdGhvdWdoIHRoaXMgcmVzdWx0cyBpbiBtYW55IFNRTAorICAgICAgICBxdWVyaWVz IGJlaW5nIGlzc3VlZCwgdGhhdCdzIGEgbG90IG1vcmUgZWZmaWNpZW50IGluIHByYWN0aWNlIGJl Y2F1c2Ugd2Ugb25seSBmZXRjaCBhIGZldyBkb3plbiByb3dzIGluIHByYWN0aWNlLgorCisgICAg ICAgIEFsc28gcmVtb3ZlZCBhIHdob2xlIGJ1bmNoIG9mIGZlYXR1cmVzIGZyb20gL2FkbWluL3Rl c3RzIHRvIHNpbXBsaWZ5IHRoZSBwYWdlLiBJbiBwYXJ0aWN1bGFyLCB0aGUgYWJpbGl0eSB0byB1 cGRhdGUKKyAgICAgICAgdGhlIGxpc3Qgb2YgdHJpZ2dlcmFibGVzIGhhcyBiZWVuIHJlbW92ZWQg bm93IHRoYXQgc3luYy1idWlsZGJvdC5qcyBhdXRvbWF0aWNhbGx5IHVwZGF0ZXMgdGhhdCBmb3Ig dXMuIFRoaXMgcmVtb3ZlZAorICAgICAgICB0aGUgbGFzdCB1c2Ugb2YgdGVzdF9leGlzdHNfb25f cGxhdGZvcm0sIHdoaWNoIHdhcyBhbHNvIGRlcGVuZGVudCBvbiBmZXRjaGluZyB0ZXN0X2NvbmZp Z3VyYXRpb25zIHVwZnJvbnQuCisKKyAgICAgICAgKiBwdWJsaWMvYWRtaW4vdGVzdHMucGhwOgor ICAgICAgICAqIHB1YmxpYy9pbmNsdWRlL3Rlc3QtbmFtZS1yZXNvbHZlci5waHA6CisgICAgICAg IChUZXN0TmFtZVJlc29sdmVyOjpfX2NvbnN0cnVjdCk6IERvbid0IGZldGNoIHRoZSBlbnRpcmUg dGFibGUgb2YgdGVzdF9jb25maWd1cmF0aW9ucy4KKyAgICAgICAgKFRlc3ROYW1lUmVzb2x2ZXI6 OmNvbmZpZ3VyYXRpb25zX2Zvcl9tZXRyaWNfYW5kX3BsYXRmb3JtKTogSnVzdCBpc3N1ZSBhIFNR TCBxdWVyeSBmb3IgdGhlIHNwZWNpZmllZCBwbGF0Zm9ybSBhbmQgbWV0cmljLgorICAgICAgICAo VGVzdE5hbWVSZXNvbHZlcjo6dGVzdF9leGlzdHNfb25fcGxhdGZvcm0pOiBSZW1vdmVkLgorCiAy MDE2LTA2LTA4ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIHN5 bmMtYnVpbGRib3QuanMgc2hvdWxkIHVwZGF0ZSB0aGUgbGlzdCBvZiB0ZXN0cyBhbmQgcGxhdGZv cm1zIGFzc29jaWF0ZWQgd2l0aCBhIHRyaWdnZXJhYmxlCkluZGV4OiBXZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvcHVibGljL2FkbWluL3Rlc3RzLnBocAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvcHVibGljL2FkbWluL3Rlc3RzLnBocAkocmV2aXNpb24gMjAxOTg1KQor KysgV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9hZG1pbi90ZXN0cy5waHAJKHdvcmtp bmcgY29weSkKQEAgLTMsNTEgKzMsOSBAQAogcmVxdWlyZV9vbmNlKCcuLi9pbmNsdWRlL2FkbWlu LWhlYWRlci5waHAnKTsKIHJlcXVpcmVfb25jZSgnLi4vaW5jbHVkZS90ZXN0LW5hbWUtcmVzb2x2 ZXIucGhwJyk7CiAKLWlmICgkYWN0aW9uID09ICdkYXNoYm9hcmQnKSB7Ci0gICAgaWYgKGFycmF5 X2tleV9leGlzdHMoJ21ldHJpY19pZCcsICRfUE9TVCkpIHsKLSAgICAgICAgJG1ldHJpY19pZCA9 IGludHZhbCgkX1BPU1RbJ21ldHJpY19pZCddKTsKLSAgICAgICAgJGNvbmZpZ19pZHMgPSBhcnJh eSgpOwotICAgICAgICAkc3VjY2VlZGVkID0gVFJVRTsKLSAgICAgICAgaWYgKCEkZGItPnF1ZXJ5 X2FuZF9nZXRfYWZmZWN0ZWRfcm93cygiVVBEQVRFIHRlc3RfY29uZmlndXJhdGlvbnMgU0VUIGNv bmZpZ19pc19pbl9kYXNoYm9hcmQgPSBmYWxzZSBXSEVSRSBjb25maWdfbWV0cmljID0gJDEiLCBh cnJheSgkbWV0cmljX2lkKSkpIHsKLSAgICAgICAgICAgICRzdWNjZWVkZWQgPSBGQUxTRTsKLSAg ICAgICAgICAgIG5vdGljZSgiRmFpbGVkIHRvIHJlbW92ZSBzb21lIGNvbmZpZ3VyYXRpb25zIGZy b20gdGhlIGRhc2hib2FyZC4iKTsKLSAgICAgICAgfQotCi0gICAgICAgIGVsc2UgaWYgKGFycmF5 X2tleV9leGlzdHMoJ21ldHJpY19wbGF0Zm9ybXMnLCAkX1BPU1QpKSB7Ci0gICAgICAgICAgICBm b3JlYWNoICgkX1BPU1RbJ21ldHJpY19wbGF0Zm9ybXMnXSBhcyAkcGxhdGZvcm1faWQpIHsKLSAg ICAgICAgICAgICAgICBpZiAoISRkYi0+cXVlcnlfYW5kX2dldF9hZmZlY3RlZF9yb3dzKCJVUERB VEUgdGVzdF9jb25maWd1cmF0aW9ucyBTRVQgY29uZmlnX2lzX2luX2Rhc2hib2FyZCA9IHRydWUK LSAgICAgICAgICAgICAgICAgICAgV0hFUkUgY29uZmlnX21ldHJpYyA9ICQxIEFORCBjb25maWdf cGxhdGZvcm0gPSAkMiIsIGFycmF5KCRtZXRyaWNfaWQsICRwbGF0Zm9ybV9pZCkpKSB7Ci0gICAg ICAgICAgICAgICAgICAgICRzdWNjZWVkZWQgPSBGQUxTRTsKLSAgICAgICAgICAgICAgICAgICAg bm90aWNlKCJGYWlsZWQgdG8gYWRkIGNvbmZpZ3VyYXRpb25zIGZvciBtZXRyaWMgJG1ldHJpY19p ZCBhbmQgcGxhdGZvcm0gJHBsYXRmb3JtX2lkIHRvIHRoZSBkYXNoYm9hcmQuIik7Ci0gICAgICAg ICAgICAgICAgfQotICAgICAgICAgICAgfQotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKCRzdWNj ZWVkZWQpIHsKLSAgICAgICAgICAgIG5vdGljZSgiVXBkYXRlZCB0aGUgZGFzaGJvYXJkLiIpOwot ICAgICAgICAgICAgcmVnZW5lcmF0ZV9tYW5pZmVzdCgpOwotICAgICAgICB9Ci0gICAgfSBlbHNl Ci0gICAgICAgIG5vdGljZSgnSW52YWxpZCBwYXJhbWV0ZXJzJyk7Ci19IGVsc2UgaWYgKCRhY3Rp b24gPT0gJ3VwZGF0ZScpIHsKK2lmICgkYWN0aW9uID09ICd1cGRhdGUnKSB7CiAgICAgaWYgKCF1 cGRhdGVfZmllbGQoJ3Rlc3RzJywgJ3Rlc3QnLCAndXJsJykpCiAgICAgICAgIG5vdGljZSgnSW52 YWxpZCBwYXJhbWV0ZXJzJyk7Ci19IGVsc2UgaWYgKCRhY3Rpb24gPT0gJ3VwZGF0ZS10cmlnZ2Vy YWJsZScpIHsKLSAgICAkdGVzdF9pZCA9IGludHZhbCgkX1BPU1RbJ3Rlc3QnXSk7Ci0gICAgJHBs YXRmb3JtX2lkID0gaW50dmFsKCRfUE9TVFsncGxhdGZvcm0nXSk7Ci0KLSAgICAkdHJpZ2dlcmFi bGVfaWQgPSBhcnJheV9nZXQoJF9QT1NULCAndHJpZ2dlcmFibGUnKTsKLSAgICBpZiAoJHRyaWdn ZXJhYmxlX2lkKSB7Ci0gICAgICAgICR0cmlnZ2VyYWJsZV9pZCA9IGludHZhbCgkdHJpZ2dlcmFi bGVfaWQpOwotICAgICAgICAkYXNzb2NpYXRpb24gPSBhcnJheSgndGVzdCcgPT4gJHRlc3RfaWQs ICdwbGF0Zm9ybScgPT4gJHBsYXRmb3JtX2lkLCAndHJpZ2dlcmFibGUnID0+ICR0cmlnZ2VyYWJs ZV9pZCk7Ci0gICAgICAgIGlmICghJGRiLT5pbnNlcnRfcm93KCd0cmlnZ2VyYWJsZV9jb25maWd1 cmF0aW9ucycsICd0cmlnY29uZmlnJywgJGFzc29jaWF0aW9uLCBOVUxMKSkgewotICAgICAgICAg ICAgJHN1Y2VlZGVkID0gRkFMU0U7Ci0gICAgICAgICAgICBub3RpY2UoIkZhaWxlZCB0byBhc3Nv Y2lhdGUgdHJpZ2dlcmFibGUgJHRyaWdnZXJhYmxlX2lkIHdpdGggdGVzdCAkdGVzdF9pZCBvbiBw bGF0Zm9ybSAkcGxhdGZvcm1faWQuIik7Ci0gICAgICAgIH0KLSAgICB9IGVsc2UgewotICAgICAg ICAkZGItPnF1ZXJ5X2FuZF9nZXRfYWZmZWN0ZWRfcm93cygnREVMRVRFIEZST00gdHJpZ2dlcmFi bGVfY29uZmlndXJhdGlvbnMgV0hFUkUgdHJpZ2NvbmZpZ190ZXN0ID0gJDEgQU5EIHRyaWdjb25m aWdfcGxhdGZvcm0gPSAkMicsCi0gICAgICAgICAgICBhcnJheSgkdGVzdF9pZCwgJHBsYXRmb3Jt X2lkKSk7Ci0gICAgfQogfSBlbHNlIGlmICgkYWN0aW9uID09ICdhZGQnKSB7CiAgICAgaWYgKGFy cmF5X2tleV9leGlzdHMoJ3Rlc3RfaWQnLCAkX1BPU1QpICYmIGFycmF5X2tleV9leGlzdHMoJ21l dHJpY19uYW1lJywgJF9QT1NUKSkgewogICAgICAgICAkaWQgPSBpbnR2YWwoJF9QT1NUWyd0ZXN0 X2lkJ10pOwpAQCAtNzQsNyArMzIsMTEgQEAgaWYgKCRkYikgewogICAgICAgICBmb3JlYWNoICgk YWdncmVnYXRvcnNfdGFibGUgYXMgJGFnZ3JlZ2F0b3Jfcm93KQogICAgICAgICAgICAgJGFnZ3Jl Z2F0b3JzWyRhZ2dyZWdhdG9yX3Jvd1snYWdncmVnYXRvcl9pZCddXSA9ICRhZ2dyZWdhdG9yX3Jv d1snYWdncmVnYXRvcl9uYW1lJ107CiAgICAgfQotICAgICRidWlsZF90cmlnZ2VyYWJsZV90YWJs ZSA9ICRkYi0+ZmV0Y2hfdGFibGUoJ2J1aWxkX3RyaWdnZXJhYmxlcycsICd0cmlnZ2VyYWJsZV9u YW1lJykgb3IgYXJyYXkoKTsKKyAgICAkdHJpZ2dlcmFibGVzID0gYXJyYXkoKTsKKyAgICBpZiAo JHRyaWdnZXJhYmxlX3RhYmxlID0gJGRiLT5mZXRjaF90YWJsZSgnYnVpbGRfdHJpZ2dlcmFibGVz JywgJ3RyaWdnZXJhYmxlX25hbWUnKSkgeworICAgICAgICBmb3JlYWNoICgkdHJpZ2dlcmFibGVf dGFibGUgYXMgJHRyaWdnZXJhYmxlX3JvdykKKyAgICAgICAgICAgICR0cmlnZ2VyYWJsZXNbJHRy aWdnZXJhYmxlX3Jvd1sndHJpZ2dlcmFibGVfaWQnXV0gPSAkdHJpZ2dlcmFibGVfcm93OworICAg IH0KIAogICAgICR0ZXN0X25hbWVfcmVzb2x2ZXIgPSBuZXcgVGVzdE5hbWVSZXNvbHZlcigkZGIp OwogICAgIGlmICgkdGVzdF9uYW1lX3Jlc29sdmVyLT50ZXN0cygpKSB7CkBAIC05Niw3ICs1OCw3 IEBAIGlmICgkZGIpIHsKIDx0YWJsZT4KIDx0aGVhZD4KICAgICA8dHI+PHRkPlRlc3QgSUQ8L3Rk Pjx0ZD5GdWxsIE5hbWU8L3RkPjx0ZD5QYXJlbnQgSUQ8L3RkPjx0ZD5VUkw8L3RkPjx0ZD5Ucmln Z2VyYWJsZXM8L3RkPgotICAgICAgICA8dGQ+TWV0cmljIElEPC90ZD48dGQ+TWV0cmljIE5hbWU8 L3RkPjx0ZD5BZ2dyZWdhdG9yPC90ZD48dGQ+RGFzaGJvYXJkPC90ZD4KKyAgICAgICAgPHRkPk1l dHJpYyBJRDwvdGQ+PHRkPk1ldHJpYyBOYW1lPC90ZD48dGQ+QWdncmVnYXRvcjwvdGQ+CiA8L3Ro ZWFkPgogPHRib2R5PgogPD9waHAKQEAgLTExMCw0NSArNzIsMjkgQEAgaWYgKCRkYikgewogICAg ICAgICAgICAgJHJvd19jb3VudCA9IGNvdW50KCR0ZXN0X21ldHJpY3MpOwogICAgICAgICAgICAg JGNoaWxkX21ldHJpY3MgPSAkdGVzdF9uYW1lX3Jlc29sdmVyLT5jaGlsZF9tZXRyaWNzX2Zvcl90 ZXN0X2lkKCR0ZXN0X2lkKTsKICAgICAgICAgICAgICRsaW5rZWRfdGVzdF9uYW1lID0gaHRtbHNw ZWNpYWxjaGFycygkdGVzdFsnZnVsbF9uYW1lJ10pOwotICAgICAgICAgICAgaWYgKCRjaGlsZF9t ZXRyaWNzKSB7Ci0gICAgICAgICAgICAgICAgJHJvd19jb3VudCsrOworICAgICAgICAgICAgaWYg KCRjaGlsZF9tZXRyaWNzKQogICAgICAgICAgICAgICAgICRsaW5rZWRfdGVzdF9uYW1lID0gJzxh IGhyZWY9Ii9hZG1pbi90ZXN0cy8nIC4gaHRtbHNwZWNpYWxjaGFycygkdGVzdFsnZnVsbF9uYW1l J10pIC4gJyI+JyAuICRsaW5rZWRfdGVzdF9uYW1lIC4gJzwvYT4nOwotICAgICAgICAgICAgfQog CiAgICAgICAgICAgICAkdGJvZHlfY2xhc3MgPSAkb2RkID8gJ29kZCcgOiAnZXZlbic7CiAgICAg ICAgICAgICAkb2RkID0gISRvZGQ7CiAKICAgICAgICAgICAgICR0ZXN0X3VybCA9IGh0bWxzcGVj aWFsY2hhcnMoJHRlc3RbJ3Rlc3RfdXJsJ10pOwogCi0gICAgICAgICAgICAkdHJpZ2dlcmFibGVf cGxhdGZvcm1zID0gJGRiLT5xdWVyeV9hbmRfZmV0Y2hfYWxsKCdTRUxFQ1QgKiBGUk9NIHBsYXRm b3JtcwotICAgICAgICAgICAgICAgIExFRlQgT1VURVIgSk9JTiB0cmlnZ2VyYWJsZV9jb25maWd1 cmF0aW9ucyBPTiB0cmlnY29uZmlnX3BsYXRmb3JtID0gcGxhdGZvcm1faWQgQU5EIHRyaWdjb25m aWdfdGVzdCA9ICQxIE9SREVSIEJZIHBsYXRmb3JtX25hbWUnLCBhcnJheSgkdGVzdF9pZCkpOwot ICAgICAgICAgICAgJHRyaWdnZXJhYmxlcyA9ICcnOwotICAgICAgICAgICAgZm9yZWFjaCAoJHRy aWdnZXJhYmxlX3BsYXRmb3JtcyBhcyAkcGxhdGZvcm1fcm93KSB7Ci0gICAgICAgICAgICAgICAg aWYgKCEkdGVzdF9uYW1lX3Jlc29sdmVyLT50ZXN0X2V4aXN0c19vbl9wbGF0Zm9ybSgkdGVzdF9p ZCwgJHBsYXRmb3JtX3Jvd1sncGxhdGZvcm1faWQnXSkpCi0gICAgICAgICAgICAgICAgICAgIGNv bnRpbnVlOwotCi0gICAgICAgICAgICAgICAgJHRyaWdnZXJhYmxlcyAuPSA8PDwgRU5ECi08Zm9y bSBtZXRob2Q9IlBPU1QiPgotICAgIDxpbnB1dCB0eXBlPSJoaWRkZW4iIG5hbWU9InRlc3QiIHZh bHVlPSIkdGVzdF9pZCI+Ci0gICAgPGlucHV0IHR5cGU9ImhpZGRlbiIgbmFtZT0icGxhdGZvcm0i IHZhbHVlPSJ7JHBsYXRmb3JtX3Jvd1sncGxhdGZvcm1faWQnXX0iPgotICAgIDxpbnB1dCB0eXBl PSJoaWRkZW4iIG5hbWU9ImFjdGlvbiIgdmFsdWU9InVwZGF0ZS10cmlnZ2VyYWJsZSI+Ci0gICAg PGxhYmVsPgotICAgICAgICB7JHBsYXRmb3JtX3Jvd1sncGxhdGZvcm1fbmFtZSddfQotICAgICAg ICA8c2VsZWN0IG5hbWU9InRyaWdnZXJhYmxlIiBvbmNoYW5nZT0idGhpcy5mb3JtLnN1Ym1pdCgp OyI+Ci0gICAgICAgICAgICA8b3B0aW9uIHZhbHVlPSIiPk5vbmU8L29wdGlvbj4KLUVORDsKLSAg ICAgICAgICAgICAgICAkc2VsZWN0ZWRfdHJpZ2dlcmFibGUgPSBhcnJheV9nZXQoJHBsYXRmb3Jt X3JvdywgJ3RyaWdjb25maWdfdHJpZ2dlcmFibGUnKTsKLSAgICAgICAgICAgICAgICBmb3JlYWNo ICgkYnVpbGRfdHJpZ2dlcmFibGVfdGFibGUgYXMgJHRyaWdnZXJhYmxlX3JvdykgewotICAgICAg ICAgICAgICAgICAgICAkdHJpZ2dlcmFibGVfaWQgPSAkdHJpZ2dlcmFibGVfcm93Wyd0cmlnZ2Vy YWJsZV9pZCddOwotICAgICAgICAgICAgICAgICAgICAkc2VsZWN0ZWQgPSAkdHJpZ2dlcmFibGVf aWQgPT0gJHNlbGVjdGVkX3RyaWdnZXJhYmxlID8gJyBzZWxlY3RlZCcgOiAnJzsKLSAgICAgICAg ICAgICAgICAgICAgJHRyaWdnZXJhYmxlcyAuPSAiPG9wdGlvbiB2YWx1ZT1cIiR0cmlnZ2VyYWJs ZV9pZFwiJHNlbGVjdGVkPnskdHJpZ2dlcmFibGVfcm93Wyd0cmlnZ2VyYWJsZV9uYW1lJ119PC9v cHRpb24+IjsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgJHRyaWdnZXJhYmxl cyAuPSA8PDwgRU5ECi0gICAgICAgIDwvc2VsZWN0PgotICAgIDwvbGFiZWw+Ci08L2Zvcm0+Ci08 YnI+Ci1FTkQ7CisgICAgICAgICAgICAkdHJpZ2dlcmFibGVfcGxhdGZvcm1fbGlzdCA9ICcnOwor CisgICAgICAgICAgICAkdHJpZ2dlcmFibGVfcGxhdGZvcm1zID0gJGRiLT5xdWVyeV9hbmRfZmV0 Y2hfYWxsKCdTRUxFQ1QgKiBGUk9NIHBsYXRmb3JtcyBKT0lOIHRyaWdnZXJhYmxlX2NvbmZpZ3Vy YXRpb25zCisgICAgICAgICAgICAgICAgT04gdHJpZ2NvbmZpZ19wbGF0Zm9ybSA9IHBsYXRmb3Jt X2lkIEFORCB0cmlnY29uZmlnX3Rlc3QgPSAkMSBPUkRFUiBCWSB0cmlnY29uZmlnX3RyaWdnZXJh YmxlJywgYXJyYXkoJHRlc3RfaWQpKTsKKyAgICAgICAgICAgICRwcmV2aW91c190cmlnZ2VyYWJs ZSA9IG51bGw7CisgICAgICAgICAgICBmb3JlYWNoICgkdHJpZ2dlcmFibGVfcGxhdGZvcm1zIGFz ICRyb3cpIHsKKyAgICAgICAgICAgICAgICBpZiAoJHByZXZpb3VzX3RyaWdnZXJhYmxlICE9ICRy b3dbJ3RyaWdjb25maWdfdHJpZ2dlcmFibGUnXSkgeworICAgICAgICAgICAgICAgICAgICAkcHJl dmlvdXNfdHJpZ2dlcmFibGUgPSAkcm93Wyd0cmlnY29uZmlnX3RyaWdnZXJhYmxlJ107CisgICAg ICAgICAgICAgICAgICAgIGlmICgkdHJpZ2dlcmFibGVfcGxhdGZvcm1fbGlzdCkKKyAgICAgICAg ICAgICAgICAgICAgICAgICR0cmlnZ2VyYWJsZV9wbGF0Zm9ybV9saXN0IC49ICc8YnI+JzsKKyAg ICAgICAgICAgICAgICAgICAgJG5hbWUgPSAkdHJpZ2dlcmFibGVzWyRwcmV2aW91c190cmlnZ2Vy YWJsZV1bJ3RyaWdnZXJhYmxlX25hbWUnXTsKKyAgICAgICAgICAgICAgICAgICAgJHRyaWdnZXJh YmxlX3BsYXRmb3JtX2xpc3QgLj0gIjxzdHJvbmc+JG5hbWU6PC9zdHJvbmc+ICI7CisgICAgICAg ICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgICAgICR0cmlnZ2VyYWJsZV9wbGF0Zm9y bV9saXN0IC49ICcsICc7CisgICAgICAgICAgICAgICAgJHRyaWdnZXJhYmxlX3BsYXRmb3JtX2xp c3QgLj0gJHJvd1sncGxhdGZvcm1fbmFtZSddOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAg ICBlY2hvIDw8PEVPRgpAQCAtMTYxLDcgKzEwNyw3IEBAIEVORDsKICAgICAgICAgPGZvcm0gbWV0 aG9kPSJQT1NUIj48aW5wdXQgdHlwZT0iaGlkZGVuIiBuYW1lPSJpZCIgdmFsdWU9IiR0ZXN0X2lk Ij4KICAgICAgICAgPGlucHV0IHR5cGU9ImhpZGRlbiIgbmFtZT0iYWN0aW9uIiB2YWx1ZT0idXBk YXRlIj4KICAgICAgICAgPGlucHV0IHR5cGU9InVybCIgbmFtZT0idXJsIiB2YWx1ZT0iJHRlc3Rf dXJsIiBzaXplPSIzMCI+PC9mb3JtPjwvdGQ+Ci0gICAgICAgIDx0ZCByb3dzcGFuPSIkcm93X2Nv dW50Ij4kdHJpZ2dlcmFibGVzPC90ZD4KKyAgICAgICAgPHRkIHJvd3NwYW49IiRyb3dfY291bnQi PiR0cmlnZ2VyYWJsZV9wbGF0Zm9ybV9saXN0PC90ZD4KIEVPRjsKIAogICAgICAgICAgICAgaWYg KCR0ZXN0X21ldHJpY3MpIHsKQEAgLTE4Niw2MSArMTMyLDEyIEBAIEVPRjsKICAgICAgICAgPHRk PjxhIGhyZWY9Ii9hZG1pbi90ZXN0LWNvbmZpZ3VyYXRpb25zP21ldHJpYz0kbWV0cmljX2lkIj4k bWV0cmljX2lkPC9hPjwvdGQ+CiAgICAgICAgIDx0ZD57JG1ldHJpY1snbWV0cmljX25hbWUnXX08 L3RkPgogICAgICAgICA8dGQ+JGFnZ3JlZ2F0b3JfbmFtZSAkYWdncmVnYXRvcl9hY3Rpb248L3Rk PgotICAgICAgICA8dGQ+PGZvcm0gbWV0aG9kPSJQT1NUIj48aW5wdXQgdHlwZT0iaGlkZGVuIiBu YW1lPSJtZXRyaWNfaWQiIHZhbHVlPSIkbWV0cmljX2lkIj4KLUVPRjsKLQotICAgICAgICAgICAg ICAgICAgICBmb3JlYWNoICgkcGxhdGZvcm1fbmFtZXMgYXMgJHBsYXRmb3JtX25hbWUpIHsKLSAg ICAgICAgICAgICAgICAgICAgICAgICRwbGF0Zm9ybV9uYW1lID0gaHRtbHNwZWNpYWxjaGFycygk cGxhdGZvcm1fbmFtZSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAkcGxhdGZvcm0gPSAkbmFt ZV90b19wbGF0Zm9ybVskcGxhdGZvcm1fbmFtZV07Ci0gICAgICAgICAgICAgICAgICAgICAgICAk Y29uZmlndXJhdGlvbnMgPSAkdGVzdF9uYW1lX3Jlc29sdmVyLT5jb25maWd1cmF0aW9uc19mb3Jf bWV0cmljX2FuZF9wbGF0Zm9ybSgkbWV0cmljX2lkLCAkcGxhdGZvcm1bJ3BsYXRmb3JtX2lkJ10p OwotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCEkY29uZmlndXJhdGlvbnMpCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICAgICAgICAgICAgICBl Y2hvICI8bGFiZWw+PGlucHV0IHR5cGU9XCJjaGVja2JveFwiIG5hbWU9XCJtZXRyaWNfcGxhdGZv cm1zW11cIiB2YWx1ZT1cInskcGxhdGZvcm1bJ3BsYXRmb3JtX2lkJ119XCIiOwotICAgICAgICAg ICAgICAgICAgICAgICAgaWYgKERhdGFiYXNlOjppc190cnVlKCRjb25maWd1cmF0aW9uc1swXVsn Y29uZmlnX2lzX2luX2Rhc2hib2FyZCddKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBl Y2hvICcgY2hlY2tlZCc7Ci0gICAgICAgICAgICAgICAgICAgICAgICBlbHNlIGlmIChEYXRhYmFz ZTo6aXNfdHJ1ZSgkcGxhdGZvcm1bJ3BsYXRmb3JtX2hpZGRlbiddKSkKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICBlY2hvICdkaXNhYmxlZCc7Ci0gICAgICAgICAgICAgICAgICAgICAgICBl Y2hvICI+JHBsYXRmb3JtX25hbWU8L2xhYmVsPiI7Ci0gICAgICAgICAgICAgICAgICAgIH0KLQot ICAgICAgICAgICAgICAgICAgICBlY2hvIDw8PEVPRgotICAgICAgICA8YnV0dG9uIHR5cGU9InN1 Ym1pdCIgbmFtZT0iYWN0aW9uIiB2YWx1ZT0iZGFzaGJvYXJkIj5TYXZlPC9idXR0b24+PC9mb3Jt PgotICAgICAgICA8L3RkPgogICAgIDwvdHI+CiBFT0Y7CiAgICAgICAgICAgICAgICAgfQotICAg ICAgICAgICAgfQotCi0gICAgICAgICAgICBpZiAoJGNoaWxkX21ldHJpY3MpIHsKLSAgICAgICAg ICAgICAgICBlY2hvIDw8PEVPRgotICAgICAgICA8dGQgY29sc3Bhbj0iNSI+PGZvcm0gbWV0aG9k PSJQT1NUIj4KLSAgICAgICAgPGlucHV0IHR5cGU9ImhpZGRlbiIgbmFtZT0idGVzdF9pZCIgdmFs dWU9IiR0ZXN0X2lkIj4KLSAgICAgICAgPGxhYmVsPk5hbWU8c2VsZWN0IG5hbWU9Im1ldHJpY19u YW1lIj4KLUVPRjsKLQotICAgICAgICAgICAgICAgIGZvcmVhY2ggKCRjaGlsZF9tZXRyaWNzIGFz ICRtZXRyaWMpIHsKLSAgICAgICAgICAgICAgICAgICAgJG1ldHJpY19uYW1lID0gaHRtbHNwZWNp YWxjaGFycygkbWV0cmljWydtZXRyaWNfbmFtZSddKTsKLSAgICAgICAgICAgICAgICAgICAgZWNo byAiCi0gICAgICAgICAgICA8b3B0aW9uPiRtZXRyaWNfbmFtZTwvb3B0aW9uPiI7Ci0gICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgZWNobyAnPHRk IGNvbHNwYW49IjMiPjwvdGQ+JzsKIAotICAgICAgICAgICAgICAgIGVjaG8gPDw8RU9GCi0gICAg ICAgIDwvc2VsZWN0PjwvbGFiZWw+Ci0gICAgICAgIDxsYWJlbD5BZ2dyZWdhdG9yCi0gICAgICAg IDxzZWxlY3QgbmFtZT0ibWV0cmljX2FnZ3JlZ2F0b3IiPgotICAgICAgICAgICAgPG9wdGlvbiB2 YWx1ZT0iIj4tPC9vcHRpb24+Ci1FT0Y7Ci0gICAgICAgICAgICBmb3JlYWNoICgkYWdncmVnYXRv cnMgYXMgJGlkID0+ICRuYW1lKSB7Ci0gICAgICAgICAgICAgICAgJG5hbWUgPSBodG1sc3BlY2lh bGNoYXJzKCRuYW1lKTsKLSAgICAgICAgICAgICAgICBlY2hvICIKLSAgICAgICAgICAgIDxvcHRp b24gdmFsdWU9XCIkaWRcIj4kbmFtZTwvb3B0aW9uPiI7Ci0gICAgICAgICAgICB9Ci0gICAgICAg ICAgICBlY2hvIDw8PEVPRgotICAgICAgICA8L3NlbGVjdD48L2xhYmVsPgotICAgICAgICA8YnV0 dG9uIHR5cGU9InN1Ym1pdCIgbmFtZT0iYWN0aW9uIiB2YWx1ZT0iYWRkIj5BZGQ8L2J1dHRvbj48 L2Zvcm0+PC90ZD4KLSAgICA8L3RyPgotRU9GOwotICAgICAgICAgICAgfQogICAgICAgICAgICAg ZWNobyA8PDxFT0YKICAgICA8L3Rib2R5PgogRU9GOwpJbmRleDogV2Vic2l0ZXMvcGVyZi53ZWJr aXQub3JnL3B1YmxpYy9pbmNsdWRlL3Rlc3QtbmFtZS1yZXNvbHZlci5waHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9pbmNsdWRlL3Rlc3QtbmFtZS1yZXNv bHZlci5waHAJKHJldmlzaW9uIDIwMTk4NSkKKysrIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9w dWJsaWMvaW5jbHVkZS90ZXN0LW5hbWUtcmVzb2x2ZXIucGhwCSh3b3JraW5nIGNvcHkpCkBAIC04 LDcgKzgsNyBAQCBjbGFzcyBUZXN0TmFtZVJlc29sdmVyIHsKICAgICAgICAgJHRoaXMtPnRlc3Rf aWRfdG9fY2hpbGRfbWV0cmljcyA9IGFycmF5KCk7CiAgICAgICAgICR0aGlzLT50ZXN0X3RvX21l dHJpY3MgPSBhcnJheSgpOwogICAgICAgICAkdGhpcy0+dGVzdHNfc29ydGVkX2J5X2Z1bGxfbmFt ZSA9IGFycmF5KCk7Ci0gICAgICAgICR0aGlzLT5tZXRyaWNfdG9fY29uZmlndXJhdGlvbnMgPSBh cnJheSgpOworICAgICAgICAkdGhpcy0+bWV0cmljX3RvX2NvbmZpZ3VyYXRpb25zID0gTlVMTDsK ICAgICAgICAgJHRoaXMtPmlkX3RvX21ldHJpYyA9IGFycmF5KCk7CiAgICAgICAgICR0aGlzLT5p ZF90b19hZ2dyZWdhdG9yID0gYXJyYXkoKTsKIApAQCAtMjgsMTYgKzI4LDYgQEAgY2xhc3MgVGVz dE5hbWVSZXNvbHZlciB7CiAgICAgICAgICR0aGlzLT50ZXN0X3RvX21ldHJpY3MgPSAkdGhpcy0+ bWFwX21ldHJpY3NfdG9fdGVzdHMoJGRiLT5mZXRjaF90YWJsZSgndGVzdF9tZXRyaWNzJyksICR0 ZXN0X2lkX3RvX3BhcmVudCk7CiAgICAgICAgICR0aGlzLT50ZXN0c19zb3J0ZWRfYnlfZnVsbF9u YW1lID0gJHRoaXMtPnNvcnRfdGVzdHNfYnlfZnVsbF9uYW1lKCR0aGlzLT5mdWxsX25hbWVfdG9f dGVzdCk7CiAKLSAgICAgICAgaWYgKCRjb25maWd1cmF0aW9ucyA9ICRkYi0+ZmV0Y2hfdGFibGUo J3Rlc3RfY29uZmlndXJhdGlvbnMnKSkgewotICAgICAgICAgICAgZm9yZWFjaCAoJGNvbmZpZ3Vy YXRpb25zIGFzICRjb25maWcpIHsKLSAgICAgICAgICAgICAgICAkbWV0cmljX2lkID0gJGNvbmZp Z1snY29uZmlnX21ldHJpYyddOwotICAgICAgICAgICAgICAgICRwbGF0Zm9ybV9pZCA9ICRjb25m aWdbJ2NvbmZpZ19wbGF0Zm9ybSddOwotICAgICAgICAgICAgICAgIGFycmF5X3NldF9kZWZhdWx0 KCR0aGlzLT5tZXRyaWNfdG9fY29uZmlndXJhdGlvbnMsICRtZXRyaWNfaWQsIGFycmF5KCkpOwot ICAgICAgICAgICAgICAgIGFycmF5X3NldF9kZWZhdWx0KCR0aGlzLT5tZXRyaWNfdG9fY29uZmln dXJhdGlvbnNbJG1ldHJpY19pZF0sICRwbGF0Zm9ybV9pZCwgYXJyYXkoKSk7Ci0gICAgICAgICAg ICAgICAgYXJyYXlfcHVzaCgkdGhpcy0+bWV0cmljX3RvX2NvbmZpZ3VyYXRpb25zWyRtZXRyaWNf aWRdWyRwbGF0Zm9ybV9pZF0sICRjb25maWcpOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0K ICAgICAgICAgaWYgKCRhZ2dyZWdhdG9yX3RhYmxlID0gJGRiLT5mZXRjaF90YWJsZSgnYWdncmVn YXRvcnMnKSkgewogICAgICAgICAgICAgZm9yZWFjaCAoJGFnZ3JlZ2F0b3JfdGFibGUgYXMgJGFn Z3JlZ2F0b3IpCiAgICAgICAgICAgICAgICAgJHRoaXMtPmlkX3RvX2FnZ3JlZ2F0b3JbJGFnZ3Jl Z2F0b3JbJ2FnZ3JlZ2F0b3JfaWQnXV0gPSAkYWdncmVnYXRvcjsKQEAgLTEyNiwyMCArMTE2LDgg QEAgY2xhc3MgVGVzdE5hbWVSZXNvbHZlciB7CiAgICAgfQogCiAgICAgZnVuY3Rpb24gY29uZmln dXJhdGlvbnNfZm9yX21ldHJpY19hbmRfcGxhdGZvcm0oJG1ldHJpY19pZCwgJHBsYXRmb3JtX2lk KSB7Ci0gICAgICAgICRtZXRyaWNfY29uZmlndXJhdGlvbnMgPSBhcnJheV9nZXQoJHRoaXMtPm1l dHJpY190b19jb25maWd1cmF0aW9ucywgJG1ldHJpY19pZCwgYXJyYXkoKSk7Ci0gICAgICAgIHJl dHVybiBhcnJheV9nZXQoJG1ldHJpY19jb25maWd1cmF0aW9ucywgJHBsYXRmb3JtX2lkKTsKLSAg ICB9Ci0KLSAgICBmdW5jdGlvbiB0ZXN0X2V4aXN0c19vbl9wbGF0Zm9ybSgkdGVzdF9pZCwgJHBs YXRmb3JtX2lkKSB7Ci0gICAgICAgIGZvcmVhY2ggKCR0aGlzLT5tZXRyaWNzX2Zvcl90ZXN0X2lk KCR0ZXN0X2lkKSBhcyAkbWV0cmljKSB7Ci0gICAgICAgICAgICBpZiAoJHRoaXMtPmNvbmZpZ3Vy YXRpb25zX2Zvcl9tZXRyaWNfYW5kX3BsYXRmb3JtKCRtZXRyaWNbJ21ldHJpY19pZCddLCAkcGxh dGZvcm1faWQpKQotICAgICAgICAgICAgICAgIHJldHVybiBUUlVFOwotICAgICAgICB9Ci0gICAg ICAgIGZvcmVhY2ggKCR0aGlzLT5jaGlsZF9tZXRyaWNzX2Zvcl90ZXN0X2lkKCR0ZXN0X2lkKSBh cyAkbWV0cmljKSB7Ci0gICAgICAgICAgICBpZiAoJHRoaXMtPmNvbmZpZ3VyYXRpb25zX2Zvcl9t ZXRyaWNfYW5kX3BsYXRmb3JtKCRtZXRyaWNbJ21ldHJpY19pZCddLCAkcGxhdGZvcm1faWQpKQot ICAgICAgICAgICAgICAgIHJldHVybiBUUlVFOwotICAgICAgICB9Ci0gICAgICAgIHJldHVybiBG QUxTRTsKKyAgICAgICAgcmV0dXJuICR0aGlzLT5kYi0+cXVlcnlfYW5kX2ZldGNoX2FsbCgnU0VM RUNUICogRlJPTSB0ZXN0X2NvbmZpZ3VyYXRpb25zIFdIRVJFIGNvbmZpZ19tZXRyaWMgPSAkMSBB TkQgY29uZmlnX3BsYXRmb3JtID0gJDIKKyAgICAgICAgICAgIE9SREVSIEJZIGNvbmZpZ19pZCcs IGFycmF5KCRtZXRyaWNfaWQsICRwbGF0Zm9ybV9pZCkpOwogICAgIH0KIH0KIAo= 281148 2016-06-12 19:55:56 -0700 2016-06-13 12:38:25 -0700 Removed unused instance variable bug-158682-20160612195730.patch text/plain 14362 rniwa SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMjAxOTg1KQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI1IEBACisyMDE2LTA2LTEyICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIC9hZG1pbi90ZXN0cyBpcyB2ZXJ5IHNsb3cKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODY4MgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBzbG93bmVzcyBjYW1lIGZyb20gVGVzdE5h bWVSZXNvbHZlcjo6X19jb25zdHJ1Y3QsIHdoaWNoIHdhcyBmZXRjaGluZyB0aGUgZW50aXJlIHRh YmxlIG9mIHRlc3RfY29uZmlndXJhdGlvbnMsCisgICAgICAgIHdoaWNoIGF0IHRoaXMgcG9pbnQg Y29udGFpbnMgbW9yZSB0aGFuIDMyLDAwMCByb3dzLiBEb24ndCBmZXRjaCB0aGUgZW50aXJlIHRh YmxlIGluIHRoZSBjb25zdHJ1Y3Rvci4gSW5zdGVhZCwKKyAgICAgICAgZmV0Y2ggYSBzdWJzZXQg b2Ygcm93cyBhcyBuZWVkZWQgaW4gY29uZmlndXJhdGlvbnNfZm9yX21ldHJpY19hbmRfcGxhdGZv cm0uIEV2ZW4gdGhvdWdoIHRoaXMgcmVzdWx0cyBpbiBtYW55IFNRTAorICAgICAgICBxdWVyaWVz IGJlaW5nIGlzc3VlZCwgdGhhdCdzIGEgbG90IG1vcmUgZWZmaWNpZW50IGluIHByYWN0aWNlIGJl Y2F1c2Ugd2Ugb25seSBmZXRjaCBhIGZldyBkb3plbiByb3dzIGluIHByYWN0aWNlLgorCisgICAg ICAgIEFsc28gcmVtb3ZlZCBhIHdob2xlIGJ1bmNoIG9mIGZlYXR1cmVzIGZyb20gL2FkbWluL3Rl c3RzIHRvIHNpbXBsaWZ5IHRoZSBwYWdlLiBJbiBwYXJ0aWN1bGFyLCB0aGUgYWJpbGl0eSB0byB1 cGRhdGUKKyAgICAgICAgdGhlIGxpc3Qgb2YgdHJpZ2dlcmFibGVzIGhhcyBiZWVuIHJlbW92ZWQg bm93IHRoYXQgc3luYy1idWlsZGJvdC5qcyBhdXRvbWF0aWNhbGx5IHVwZGF0ZXMgdGhhdCBmb3Ig dXMuIFRoaXMgcmVtb3ZlZAorICAgICAgICB0aGUgbGFzdCB1c2Ugb2YgdGVzdF9leGlzdHNfb25f cGxhdGZvcm0sIHdoaWNoIHdhcyBhbHNvIGRlcGVuZGVudCBvbiBmZXRjaGluZyB0ZXN0X2NvbmZp Z3VyYXRpb25zIHVwZnJvbnQuCisKKyAgICAgICAgKiBwdWJsaWMvYWRtaW4vdGVzdHMucGhwOgor ICAgICAgICAqIHB1YmxpYy9pbmNsdWRlL3Rlc3QtbmFtZS1yZXNvbHZlci5waHA6CisgICAgICAg IChUZXN0TmFtZVJlc29sdmVyOjpfX2NvbnN0cnVjdCk6IERvbid0IGZldGNoIHRoZSBlbnRpcmUg dGFibGUgb2YgdGVzdF9jb25maWd1cmF0aW9ucy4KKyAgICAgICAgKFRlc3ROYW1lUmVzb2x2ZXI6 OmNvbmZpZ3VyYXRpb25zX2Zvcl9tZXRyaWNfYW5kX3BsYXRmb3JtKTogSnVzdCBpc3N1ZSBhIFNR TCBxdWVyeSBmb3IgdGhlIHNwZWNpZmllZCBwbGF0Zm9ybSBhbmQgbWV0cmljLgorICAgICAgICAo VGVzdE5hbWVSZXNvbHZlcjo6dGVzdF9leGlzdHNfb25fcGxhdGZvcm0pOiBSZW1vdmVkLgorCiAy MDE2LTA2LTA4ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIHN5 bmMtYnVpbGRib3QuanMgc2hvdWxkIHVwZGF0ZSB0aGUgbGlzdCBvZiB0ZXN0cyBhbmQgcGxhdGZv cm1zIGFzc29jaWF0ZWQgd2l0aCBhIHRyaWdnZXJhYmxlCkluZGV4OiBXZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvcHVibGljL2FkbWluL3Rlc3RzLnBocAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvcHVibGljL2FkbWluL3Rlc3RzLnBocAkocmV2aXNpb24gMjAxOTg1KQor KysgV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9hZG1pbi90ZXN0cy5waHAJKHdvcmtp bmcgY29weSkKQEAgLTMsNTEgKzMsOSBAQAogcmVxdWlyZV9vbmNlKCcuLi9pbmNsdWRlL2FkbWlu LWhlYWRlci5waHAnKTsKIHJlcXVpcmVfb25jZSgnLi4vaW5jbHVkZS90ZXN0LW5hbWUtcmVzb2x2 ZXIucGhwJyk7CiAKLWlmICgkYWN0aW9uID09ICdkYXNoYm9hcmQnKSB7Ci0gICAgaWYgKGFycmF5 X2tleV9leGlzdHMoJ21ldHJpY19pZCcsICRfUE9TVCkpIHsKLSAgICAgICAgJG1ldHJpY19pZCA9 IGludHZhbCgkX1BPU1RbJ21ldHJpY19pZCddKTsKLSAgICAgICAgJGNvbmZpZ19pZHMgPSBhcnJh eSgpOwotICAgICAgICAkc3VjY2VlZGVkID0gVFJVRTsKLSAgICAgICAgaWYgKCEkZGItPnF1ZXJ5 X2FuZF9nZXRfYWZmZWN0ZWRfcm93cygiVVBEQVRFIHRlc3RfY29uZmlndXJhdGlvbnMgU0VUIGNv bmZpZ19pc19pbl9kYXNoYm9hcmQgPSBmYWxzZSBXSEVSRSBjb25maWdfbWV0cmljID0gJDEiLCBh cnJheSgkbWV0cmljX2lkKSkpIHsKLSAgICAgICAgICAgICRzdWNjZWVkZWQgPSBGQUxTRTsKLSAg ICAgICAgICAgIG5vdGljZSgiRmFpbGVkIHRvIHJlbW92ZSBzb21lIGNvbmZpZ3VyYXRpb25zIGZy b20gdGhlIGRhc2hib2FyZC4iKTsKLSAgICAgICAgfQotCi0gICAgICAgIGVsc2UgaWYgKGFycmF5 X2tleV9leGlzdHMoJ21ldHJpY19wbGF0Zm9ybXMnLCAkX1BPU1QpKSB7Ci0gICAgICAgICAgICBm b3JlYWNoICgkX1BPU1RbJ21ldHJpY19wbGF0Zm9ybXMnXSBhcyAkcGxhdGZvcm1faWQpIHsKLSAg ICAgICAgICAgICAgICBpZiAoISRkYi0+cXVlcnlfYW5kX2dldF9hZmZlY3RlZF9yb3dzKCJVUERB VEUgdGVzdF9jb25maWd1cmF0aW9ucyBTRVQgY29uZmlnX2lzX2luX2Rhc2hib2FyZCA9IHRydWUK LSAgICAgICAgICAgICAgICAgICAgV0hFUkUgY29uZmlnX21ldHJpYyA9ICQxIEFORCBjb25maWdf cGxhdGZvcm0gPSAkMiIsIGFycmF5KCRtZXRyaWNfaWQsICRwbGF0Zm9ybV9pZCkpKSB7Ci0gICAg ICAgICAgICAgICAgICAgICRzdWNjZWVkZWQgPSBGQUxTRTsKLSAgICAgICAgICAgICAgICAgICAg bm90aWNlKCJGYWlsZWQgdG8gYWRkIGNvbmZpZ3VyYXRpb25zIGZvciBtZXRyaWMgJG1ldHJpY19p ZCBhbmQgcGxhdGZvcm0gJHBsYXRmb3JtX2lkIHRvIHRoZSBkYXNoYm9hcmQuIik7Ci0gICAgICAg ICAgICAgICAgfQotICAgICAgICAgICAgfQotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKCRzdWNj ZWVkZWQpIHsKLSAgICAgICAgICAgIG5vdGljZSgiVXBkYXRlZCB0aGUgZGFzaGJvYXJkLiIpOwot ICAgICAgICAgICAgcmVnZW5lcmF0ZV9tYW5pZmVzdCgpOwotICAgICAgICB9Ci0gICAgfSBlbHNl Ci0gICAgICAgIG5vdGljZSgnSW52YWxpZCBwYXJhbWV0ZXJzJyk7Ci19IGVsc2UgaWYgKCRhY3Rp b24gPT0gJ3VwZGF0ZScpIHsKK2lmICgkYWN0aW9uID09ICd1cGRhdGUnKSB7CiAgICAgaWYgKCF1 cGRhdGVfZmllbGQoJ3Rlc3RzJywgJ3Rlc3QnLCAndXJsJykpCiAgICAgICAgIG5vdGljZSgnSW52 YWxpZCBwYXJhbWV0ZXJzJyk7Ci19IGVsc2UgaWYgKCRhY3Rpb24gPT0gJ3VwZGF0ZS10cmlnZ2Vy YWJsZScpIHsKLSAgICAkdGVzdF9pZCA9IGludHZhbCgkX1BPU1RbJ3Rlc3QnXSk7Ci0gICAgJHBs YXRmb3JtX2lkID0gaW50dmFsKCRfUE9TVFsncGxhdGZvcm0nXSk7Ci0KLSAgICAkdHJpZ2dlcmFi bGVfaWQgPSBhcnJheV9nZXQoJF9QT1NULCAndHJpZ2dlcmFibGUnKTsKLSAgICBpZiAoJHRyaWdn ZXJhYmxlX2lkKSB7Ci0gICAgICAgICR0cmlnZ2VyYWJsZV9pZCA9IGludHZhbCgkdHJpZ2dlcmFi bGVfaWQpOwotICAgICAgICAkYXNzb2NpYXRpb24gPSBhcnJheSgndGVzdCcgPT4gJHRlc3RfaWQs ICdwbGF0Zm9ybScgPT4gJHBsYXRmb3JtX2lkLCAndHJpZ2dlcmFibGUnID0+ICR0cmlnZ2VyYWJs ZV9pZCk7Ci0gICAgICAgIGlmICghJGRiLT5pbnNlcnRfcm93KCd0cmlnZ2VyYWJsZV9jb25maWd1 cmF0aW9ucycsICd0cmlnY29uZmlnJywgJGFzc29jaWF0aW9uLCBOVUxMKSkgewotICAgICAgICAg ICAgJHN1Y2VlZGVkID0gRkFMU0U7Ci0gICAgICAgICAgICBub3RpY2UoIkZhaWxlZCB0byBhc3Nv Y2lhdGUgdHJpZ2dlcmFibGUgJHRyaWdnZXJhYmxlX2lkIHdpdGggdGVzdCAkdGVzdF9pZCBvbiBw bGF0Zm9ybSAkcGxhdGZvcm1faWQuIik7Ci0gICAgICAgIH0KLSAgICB9IGVsc2UgewotICAgICAg ICAkZGItPnF1ZXJ5X2FuZF9nZXRfYWZmZWN0ZWRfcm93cygnREVMRVRFIEZST00gdHJpZ2dlcmFi bGVfY29uZmlndXJhdGlvbnMgV0hFUkUgdHJpZ2NvbmZpZ190ZXN0ID0gJDEgQU5EIHRyaWdjb25m aWdfcGxhdGZvcm0gPSAkMicsCi0gICAgICAgICAgICBhcnJheSgkdGVzdF9pZCwgJHBsYXRmb3Jt X2lkKSk7Ci0gICAgfQogfSBlbHNlIGlmICgkYWN0aW9uID09ICdhZGQnKSB7CiAgICAgaWYgKGFy cmF5X2tleV9leGlzdHMoJ3Rlc3RfaWQnLCAkX1BPU1QpICYmIGFycmF5X2tleV9leGlzdHMoJ21l dHJpY19uYW1lJywgJF9QT1NUKSkgewogICAgICAgICAkaWQgPSBpbnR2YWwoJF9QT1NUWyd0ZXN0 X2lkJ10pOwpAQCAtNzQsNyArMzIsMTEgQEAgaWYgKCRkYikgewogICAgICAgICBmb3JlYWNoICgk YWdncmVnYXRvcnNfdGFibGUgYXMgJGFnZ3JlZ2F0b3Jfcm93KQogICAgICAgICAgICAgJGFnZ3Jl Z2F0b3JzWyRhZ2dyZWdhdG9yX3Jvd1snYWdncmVnYXRvcl9pZCddXSA9ICRhZ2dyZWdhdG9yX3Jv d1snYWdncmVnYXRvcl9uYW1lJ107CiAgICAgfQotICAgICRidWlsZF90cmlnZ2VyYWJsZV90YWJs ZSA9ICRkYi0+ZmV0Y2hfdGFibGUoJ2J1aWxkX3RyaWdnZXJhYmxlcycsICd0cmlnZ2VyYWJsZV9u YW1lJykgb3IgYXJyYXkoKTsKKyAgICAkdHJpZ2dlcmFibGVzID0gYXJyYXkoKTsKKyAgICBpZiAo JHRyaWdnZXJhYmxlX3RhYmxlID0gJGRiLT5mZXRjaF90YWJsZSgnYnVpbGRfdHJpZ2dlcmFibGVz JywgJ3RyaWdnZXJhYmxlX25hbWUnKSkgeworICAgICAgICBmb3JlYWNoICgkdHJpZ2dlcmFibGVf dGFibGUgYXMgJHRyaWdnZXJhYmxlX3JvdykKKyAgICAgICAgICAgICR0cmlnZ2VyYWJsZXNbJHRy aWdnZXJhYmxlX3Jvd1sndHJpZ2dlcmFibGVfaWQnXV0gPSAkdHJpZ2dlcmFibGVfcm93OworICAg IH0KIAogICAgICR0ZXN0X25hbWVfcmVzb2x2ZXIgPSBuZXcgVGVzdE5hbWVSZXNvbHZlcigkZGIp OwogICAgIGlmICgkdGVzdF9uYW1lX3Jlc29sdmVyLT50ZXN0cygpKSB7CkBAIC05Niw3ICs1OCw3 IEBAIGlmICgkZGIpIHsKIDx0YWJsZT4KIDx0aGVhZD4KICAgICA8dHI+PHRkPlRlc3QgSUQ8L3Rk Pjx0ZD5GdWxsIE5hbWU8L3RkPjx0ZD5QYXJlbnQgSUQ8L3RkPjx0ZD5VUkw8L3RkPjx0ZD5Ucmln Z2VyYWJsZXM8L3RkPgotICAgICAgICA8dGQ+TWV0cmljIElEPC90ZD48dGQ+TWV0cmljIE5hbWU8 L3RkPjx0ZD5BZ2dyZWdhdG9yPC90ZD48dGQ+RGFzaGJvYXJkPC90ZD4KKyAgICAgICAgPHRkPk1l dHJpYyBJRDwvdGQ+PHRkPk1ldHJpYyBOYW1lPC90ZD48dGQ+QWdncmVnYXRvcjwvdGQ+CiA8L3Ro ZWFkPgogPHRib2R5PgogPD9waHAKQEAgLTExMCw0NSArNzIsMjkgQEAgaWYgKCRkYikgewogICAg ICAgICAgICAgJHJvd19jb3VudCA9IGNvdW50KCR0ZXN0X21ldHJpY3MpOwogICAgICAgICAgICAg JGNoaWxkX21ldHJpY3MgPSAkdGVzdF9uYW1lX3Jlc29sdmVyLT5jaGlsZF9tZXRyaWNzX2Zvcl90 ZXN0X2lkKCR0ZXN0X2lkKTsKICAgICAgICAgICAgICRsaW5rZWRfdGVzdF9uYW1lID0gaHRtbHNw ZWNpYWxjaGFycygkdGVzdFsnZnVsbF9uYW1lJ10pOwotICAgICAgICAgICAgaWYgKCRjaGlsZF9t ZXRyaWNzKSB7Ci0gICAgICAgICAgICAgICAgJHJvd19jb3VudCsrOworICAgICAgICAgICAgaWYg KCRjaGlsZF9tZXRyaWNzKQogICAgICAgICAgICAgICAgICRsaW5rZWRfdGVzdF9uYW1lID0gJzxh IGhyZWY9Ii9hZG1pbi90ZXN0cy8nIC4gaHRtbHNwZWNpYWxjaGFycygkdGVzdFsnZnVsbF9uYW1l J10pIC4gJyI+JyAuICRsaW5rZWRfdGVzdF9uYW1lIC4gJzwvYT4nOwotICAgICAgICAgICAgfQog CiAgICAgICAgICAgICAkdGJvZHlfY2xhc3MgPSAkb2RkID8gJ29kZCcgOiAnZXZlbic7CiAgICAg ICAgICAgICAkb2RkID0gISRvZGQ7CiAKICAgICAgICAgICAgICR0ZXN0X3VybCA9IGh0bWxzcGVj aWFsY2hhcnMoJHRlc3RbJ3Rlc3RfdXJsJ10pOwogCi0gICAgICAgICAgICAkdHJpZ2dlcmFibGVf cGxhdGZvcm1zID0gJGRiLT5xdWVyeV9hbmRfZmV0Y2hfYWxsKCdTRUxFQ1QgKiBGUk9NIHBsYXRm b3JtcwotICAgICAgICAgICAgICAgIExFRlQgT1VURVIgSk9JTiB0cmlnZ2VyYWJsZV9jb25maWd1 cmF0aW9ucyBPTiB0cmlnY29uZmlnX3BsYXRmb3JtID0gcGxhdGZvcm1faWQgQU5EIHRyaWdjb25m aWdfdGVzdCA9ICQxIE9SREVSIEJZIHBsYXRmb3JtX25hbWUnLCBhcnJheSgkdGVzdF9pZCkpOwot ICAgICAgICAgICAgJHRyaWdnZXJhYmxlcyA9ICcnOwotICAgICAgICAgICAgZm9yZWFjaCAoJHRy aWdnZXJhYmxlX3BsYXRmb3JtcyBhcyAkcGxhdGZvcm1fcm93KSB7Ci0gICAgICAgICAgICAgICAg aWYgKCEkdGVzdF9uYW1lX3Jlc29sdmVyLT50ZXN0X2V4aXN0c19vbl9wbGF0Zm9ybSgkdGVzdF9p ZCwgJHBsYXRmb3JtX3Jvd1sncGxhdGZvcm1faWQnXSkpCi0gICAgICAgICAgICAgICAgICAgIGNv bnRpbnVlOwotCi0gICAgICAgICAgICAgICAgJHRyaWdnZXJhYmxlcyAuPSA8PDwgRU5ECi08Zm9y bSBtZXRob2Q9IlBPU1QiPgotICAgIDxpbnB1dCB0eXBlPSJoaWRkZW4iIG5hbWU9InRlc3QiIHZh bHVlPSIkdGVzdF9pZCI+Ci0gICAgPGlucHV0IHR5cGU9ImhpZGRlbiIgbmFtZT0icGxhdGZvcm0i IHZhbHVlPSJ7JHBsYXRmb3JtX3Jvd1sncGxhdGZvcm1faWQnXX0iPgotICAgIDxpbnB1dCB0eXBl PSJoaWRkZW4iIG5hbWU9ImFjdGlvbiIgdmFsdWU9InVwZGF0ZS10cmlnZ2VyYWJsZSI+Ci0gICAg PGxhYmVsPgotICAgICAgICB7JHBsYXRmb3JtX3Jvd1sncGxhdGZvcm1fbmFtZSddfQotICAgICAg ICA8c2VsZWN0IG5hbWU9InRyaWdnZXJhYmxlIiBvbmNoYW5nZT0idGhpcy5mb3JtLnN1Ym1pdCgp OyI+Ci0gICAgICAgICAgICA8b3B0aW9uIHZhbHVlPSIiPk5vbmU8L29wdGlvbj4KLUVORDsKLSAg ICAgICAgICAgICAgICAkc2VsZWN0ZWRfdHJpZ2dlcmFibGUgPSBhcnJheV9nZXQoJHBsYXRmb3Jt X3JvdywgJ3RyaWdjb25maWdfdHJpZ2dlcmFibGUnKTsKLSAgICAgICAgICAgICAgICBmb3JlYWNo ICgkYnVpbGRfdHJpZ2dlcmFibGVfdGFibGUgYXMgJHRyaWdnZXJhYmxlX3JvdykgewotICAgICAg ICAgICAgICAgICAgICAkdHJpZ2dlcmFibGVfaWQgPSAkdHJpZ2dlcmFibGVfcm93Wyd0cmlnZ2Vy YWJsZV9pZCddOwotICAgICAgICAgICAgICAgICAgICAkc2VsZWN0ZWQgPSAkdHJpZ2dlcmFibGVf aWQgPT0gJHNlbGVjdGVkX3RyaWdnZXJhYmxlID8gJyBzZWxlY3RlZCcgOiAnJzsKLSAgICAgICAg ICAgICAgICAgICAgJHRyaWdnZXJhYmxlcyAuPSAiPG9wdGlvbiB2YWx1ZT1cIiR0cmlnZ2VyYWJs ZV9pZFwiJHNlbGVjdGVkPnskdHJpZ2dlcmFibGVfcm93Wyd0cmlnZ2VyYWJsZV9uYW1lJ119PC9v cHRpb24+IjsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgJHRyaWdnZXJhYmxl cyAuPSA8PDwgRU5ECi0gICAgICAgIDwvc2VsZWN0PgotICAgIDwvbGFiZWw+Ci08L2Zvcm0+Ci08 YnI+Ci1FTkQ7CisgICAgICAgICAgICAkdHJpZ2dlcmFibGVfcGxhdGZvcm1fbGlzdCA9ICcnOwor CisgICAgICAgICAgICAkdHJpZ2dlcmFibGVfcGxhdGZvcm1zID0gJGRiLT5xdWVyeV9hbmRfZmV0 Y2hfYWxsKCdTRUxFQ1QgKiBGUk9NIHBsYXRmb3JtcyBKT0lOIHRyaWdnZXJhYmxlX2NvbmZpZ3Vy YXRpb25zCisgICAgICAgICAgICAgICAgT04gdHJpZ2NvbmZpZ19wbGF0Zm9ybSA9IHBsYXRmb3Jt X2lkIEFORCB0cmlnY29uZmlnX3Rlc3QgPSAkMSBPUkRFUiBCWSB0cmlnY29uZmlnX3RyaWdnZXJh YmxlJywgYXJyYXkoJHRlc3RfaWQpKTsKKyAgICAgICAgICAgICRwcmV2aW91c190cmlnZ2VyYWJs ZSA9IG51bGw7CisgICAgICAgICAgICBmb3JlYWNoICgkdHJpZ2dlcmFibGVfcGxhdGZvcm1zIGFz ICRyb3cpIHsKKyAgICAgICAgICAgICAgICBpZiAoJHByZXZpb3VzX3RyaWdnZXJhYmxlICE9ICRy b3dbJ3RyaWdjb25maWdfdHJpZ2dlcmFibGUnXSkgeworICAgICAgICAgICAgICAgICAgICAkcHJl dmlvdXNfdHJpZ2dlcmFibGUgPSAkcm93Wyd0cmlnY29uZmlnX3RyaWdnZXJhYmxlJ107CisgICAg ICAgICAgICAgICAgICAgIGlmICgkdHJpZ2dlcmFibGVfcGxhdGZvcm1fbGlzdCkKKyAgICAgICAg ICAgICAgICAgICAgICAgICR0cmlnZ2VyYWJsZV9wbGF0Zm9ybV9saXN0IC49ICc8YnI+JzsKKyAg ICAgICAgICAgICAgICAgICAgJG5hbWUgPSAkdHJpZ2dlcmFibGVzWyRwcmV2aW91c190cmlnZ2Vy YWJsZV1bJ3RyaWdnZXJhYmxlX25hbWUnXTsKKyAgICAgICAgICAgICAgICAgICAgJHRyaWdnZXJh YmxlX3BsYXRmb3JtX2xpc3QgLj0gIjxzdHJvbmc+JG5hbWU6PC9zdHJvbmc+ICI7CisgICAgICAg ICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgICAgICR0cmlnZ2VyYWJsZV9wbGF0Zm9y bV9saXN0IC49ICcsICc7CisgICAgICAgICAgICAgICAgJHRyaWdnZXJhYmxlX3BsYXRmb3JtX2xp c3QgLj0gJHJvd1sncGxhdGZvcm1fbmFtZSddOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAg ICBlY2hvIDw8PEVPRgpAQCAtMTYxLDcgKzEwNyw3IEBAIEVORDsKICAgICAgICAgPGZvcm0gbWV0 aG9kPSJQT1NUIj48aW5wdXQgdHlwZT0iaGlkZGVuIiBuYW1lPSJpZCIgdmFsdWU9IiR0ZXN0X2lk Ij4KICAgICAgICAgPGlucHV0IHR5cGU9ImhpZGRlbiIgbmFtZT0iYWN0aW9uIiB2YWx1ZT0idXBk YXRlIj4KICAgICAgICAgPGlucHV0IHR5cGU9InVybCIgbmFtZT0idXJsIiB2YWx1ZT0iJHRlc3Rf dXJsIiBzaXplPSIzMCI+PC9mb3JtPjwvdGQ+Ci0gICAgICAgIDx0ZCByb3dzcGFuPSIkcm93X2Nv dW50Ij4kdHJpZ2dlcmFibGVzPC90ZD4KKyAgICAgICAgPHRkIHJvd3NwYW49IiRyb3dfY291bnQi PiR0cmlnZ2VyYWJsZV9wbGF0Zm9ybV9saXN0PC90ZD4KIEVPRjsKIAogICAgICAgICAgICAgaWYg KCR0ZXN0X21ldHJpY3MpIHsKQEAgLTE4Niw2MSArMTMyLDEyIEBAIEVPRjsKICAgICAgICAgPHRk PjxhIGhyZWY9Ii9hZG1pbi90ZXN0LWNvbmZpZ3VyYXRpb25zP21ldHJpYz0kbWV0cmljX2lkIj4k bWV0cmljX2lkPC9hPjwvdGQ+CiAgICAgICAgIDx0ZD57JG1ldHJpY1snbWV0cmljX25hbWUnXX08 L3RkPgogICAgICAgICA8dGQ+JGFnZ3JlZ2F0b3JfbmFtZSAkYWdncmVnYXRvcl9hY3Rpb248L3Rk PgotICAgICAgICA8dGQ+PGZvcm0gbWV0aG9kPSJQT1NUIj48aW5wdXQgdHlwZT0iaGlkZGVuIiBu YW1lPSJtZXRyaWNfaWQiIHZhbHVlPSIkbWV0cmljX2lkIj4KLUVPRjsKLQotICAgICAgICAgICAg ICAgICAgICBmb3JlYWNoICgkcGxhdGZvcm1fbmFtZXMgYXMgJHBsYXRmb3JtX25hbWUpIHsKLSAg ICAgICAgICAgICAgICAgICAgICAgICRwbGF0Zm9ybV9uYW1lID0gaHRtbHNwZWNpYWxjaGFycygk cGxhdGZvcm1fbmFtZSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAkcGxhdGZvcm0gPSAkbmFt ZV90b19wbGF0Zm9ybVskcGxhdGZvcm1fbmFtZV07Ci0gICAgICAgICAgICAgICAgICAgICAgICAk Y29uZmlndXJhdGlvbnMgPSAkdGVzdF9uYW1lX3Jlc29sdmVyLT5jb25maWd1cmF0aW9uc19mb3Jf bWV0cmljX2FuZF9wbGF0Zm9ybSgkbWV0cmljX2lkLCAkcGxhdGZvcm1bJ3BsYXRmb3JtX2lkJ10p OwotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCEkY29uZmlndXJhdGlvbnMpCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICAgICAgICAgICAgICBl Y2hvICI8bGFiZWw+PGlucHV0IHR5cGU9XCJjaGVja2JveFwiIG5hbWU9XCJtZXRyaWNfcGxhdGZv cm1zW11cIiB2YWx1ZT1cInskcGxhdGZvcm1bJ3BsYXRmb3JtX2lkJ119XCIiOwotICAgICAgICAg ICAgICAgICAgICAgICAgaWYgKERhdGFiYXNlOjppc190cnVlKCRjb25maWd1cmF0aW9uc1swXVsn Y29uZmlnX2lzX2luX2Rhc2hib2FyZCddKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBl Y2hvICcgY2hlY2tlZCc7Ci0gICAgICAgICAgICAgICAgICAgICAgICBlbHNlIGlmIChEYXRhYmFz ZTo6aXNfdHJ1ZSgkcGxhdGZvcm1bJ3BsYXRmb3JtX2hpZGRlbiddKSkKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICBlY2hvICdkaXNhYmxlZCc7Ci0gICAgICAgICAgICAgICAgICAgICAgICBl Y2hvICI+JHBsYXRmb3JtX25hbWU8L2xhYmVsPiI7Ci0gICAgICAgICAgICAgICAgICAgIH0KLQot ICAgICAgICAgICAgICAgICAgICBlY2hvIDw8PEVPRgotICAgICAgICA8YnV0dG9uIHR5cGU9InN1 Ym1pdCIgbmFtZT0iYWN0aW9uIiB2YWx1ZT0iZGFzaGJvYXJkIj5TYXZlPC9idXR0b24+PC9mb3Jt PgotICAgICAgICA8L3RkPgogICAgIDwvdHI+CiBFT0Y7CiAgICAgICAgICAgICAgICAgfQotICAg ICAgICAgICAgfQotCi0gICAgICAgICAgICBpZiAoJGNoaWxkX21ldHJpY3MpIHsKLSAgICAgICAg ICAgICAgICBlY2hvIDw8PEVPRgotICAgICAgICA8dGQgY29sc3Bhbj0iNSI+PGZvcm0gbWV0aG9k PSJQT1NUIj4KLSAgICAgICAgPGlucHV0IHR5cGU9ImhpZGRlbiIgbmFtZT0idGVzdF9pZCIgdmFs dWU9IiR0ZXN0X2lkIj4KLSAgICAgICAgPGxhYmVsPk5hbWU8c2VsZWN0IG5hbWU9Im1ldHJpY19u YW1lIj4KLUVPRjsKLQotICAgICAgICAgICAgICAgIGZvcmVhY2ggKCRjaGlsZF9tZXRyaWNzIGFz ICRtZXRyaWMpIHsKLSAgICAgICAgICAgICAgICAgICAgJG1ldHJpY19uYW1lID0gaHRtbHNwZWNp YWxjaGFycygkbWV0cmljWydtZXRyaWNfbmFtZSddKTsKLSAgICAgICAgICAgICAgICAgICAgZWNo byAiCi0gICAgICAgICAgICA8b3B0aW9uPiRtZXRyaWNfbmFtZTwvb3B0aW9uPiI7Ci0gICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgZWNobyAnPHRk IGNvbHNwYW49IjMiPjwvdGQ+JzsKIAotICAgICAgICAgICAgICAgIGVjaG8gPDw8RU9GCi0gICAg ICAgIDwvc2VsZWN0PjwvbGFiZWw+Ci0gICAgICAgIDxsYWJlbD5BZ2dyZWdhdG9yCi0gICAgICAg IDxzZWxlY3QgbmFtZT0ibWV0cmljX2FnZ3JlZ2F0b3IiPgotICAgICAgICAgICAgPG9wdGlvbiB2 YWx1ZT0iIj4tPC9vcHRpb24+Ci1FT0Y7Ci0gICAgICAgICAgICBmb3JlYWNoICgkYWdncmVnYXRv cnMgYXMgJGlkID0+ICRuYW1lKSB7Ci0gICAgICAgICAgICAgICAgJG5hbWUgPSBodG1sc3BlY2lh bGNoYXJzKCRuYW1lKTsKLSAgICAgICAgICAgICAgICBlY2hvICIKLSAgICAgICAgICAgIDxvcHRp b24gdmFsdWU9XCIkaWRcIj4kbmFtZTwvb3B0aW9uPiI7Ci0gICAgICAgICAgICB9Ci0gICAgICAg ICAgICBlY2hvIDw8PEVPRgotICAgICAgICA8L3NlbGVjdD48L2xhYmVsPgotICAgICAgICA8YnV0 dG9uIHR5cGU9InN1Ym1pdCIgbmFtZT0iYWN0aW9uIiB2YWx1ZT0iYWRkIj5BZGQ8L2J1dHRvbj48 L2Zvcm0+PC90ZD4KLSAgICA8L3RyPgotRU9GOwotICAgICAgICAgICAgfQogICAgICAgICAgICAg ZWNobyA8PDxFT0YKICAgICA8L3Rib2R5PgogRU9GOwpJbmRleDogV2Vic2l0ZXMvcGVyZi53ZWJr aXQub3JnL3B1YmxpYy9pbmNsdWRlL3Rlc3QtbmFtZS1yZXNvbHZlci5waHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9pbmNsdWRlL3Rlc3QtbmFtZS1yZXNv bHZlci5waHAJKHJldmlzaW9uIDIwMTk4NSkKKysrIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9w dWJsaWMvaW5jbHVkZS90ZXN0LW5hbWUtcmVzb2x2ZXIucGhwCSh3b3JraW5nIGNvcHkpCkBAIC04 LDcgKzgsNiBAQCBjbGFzcyBUZXN0TmFtZVJlc29sdmVyIHsKICAgICAgICAgJHRoaXMtPnRlc3Rf aWRfdG9fY2hpbGRfbWV0cmljcyA9IGFycmF5KCk7CiAgICAgICAgICR0aGlzLT50ZXN0X3RvX21l dHJpY3MgPSBhcnJheSgpOwogICAgICAgICAkdGhpcy0+dGVzdHNfc29ydGVkX2J5X2Z1bGxfbmFt ZSA9IGFycmF5KCk7Ci0gICAgICAgICR0aGlzLT5tZXRyaWNfdG9fY29uZmlndXJhdGlvbnMgPSBh cnJheSgpOwogICAgICAgICAkdGhpcy0+aWRfdG9fbWV0cmljID0gYXJyYXkoKTsKICAgICAgICAg JHRoaXMtPmlkX3RvX2FnZ3JlZ2F0b3IgPSBhcnJheSgpOwogCkBAIC0yOCwxNiArMjcsNiBAQCBj bGFzcyBUZXN0TmFtZVJlc29sdmVyIHsKICAgICAgICAgJHRoaXMtPnRlc3RfdG9fbWV0cmljcyA9 ICR0aGlzLT5tYXBfbWV0cmljc190b190ZXN0cygkZGItPmZldGNoX3RhYmxlKCd0ZXN0X21ldHJp Y3MnKSwgJHRlc3RfaWRfdG9fcGFyZW50KTsKICAgICAgICAgJHRoaXMtPnRlc3RzX3NvcnRlZF9i eV9mdWxsX25hbWUgPSAkdGhpcy0+c29ydF90ZXN0c19ieV9mdWxsX25hbWUoJHRoaXMtPmZ1bGxf bmFtZV90b190ZXN0KTsKIAotICAgICAgICBpZiAoJGNvbmZpZ3VyYXRpb25zID0gJGRiLT5mZXRj aF90YWJsZSgndGVzdF9jb25maWd1cmF0aW9ucycpKSB7Ci0gICAgICAgICAgICBmb3JlYWNoICgk Y29uZmlndXJhdGlvbnMgYXMgJGNvbmZpZykgewotICAgICAgICAgICAgICAgICRtZXRyaWNfaWQg PSAkY29uZmlnWydjb25maWdfbWV0cmljJ107Ci0gICAgICAgICAgICAgICAgJHBsYXRmb3JtX2lk ID0gJGNvbmZpZ1snY29uZmlnX3BsYXRmb3JtJ107Ci0gICAgICAgICAgICAgICAgYXJyYXlfc2V0 X2RlZmF1bHQoJHRoaXMtPm1ldHJpY190b19jb25maWd1cmF0aW9ucywgJG1ldHJpY19pZCwgYXJy YXkoKSk7Ci0gICAgICAgICAgICAgICAgYXJyYXlfc2V0X2RlZmF1bHQoJHRoaXMtPm1ldHJpY190 b19jb25maWd1cmF0aW9uc1skbWV0cmljX2lkXSwgJHBsYXRmb3JtX2lkLCBhcnJheSgpKTsKLSAg ICAgICAgICAgICAgICBhcnJheV9wdXNoKCR0aGlzLT5tZXRyaWNfdG9fY29uZmlndXJhdGlvbnNb JG1ldHJpY19pZF1bJHBsYXRmb3JtX2lkXSwgJGNvbmZpZyk7Ci0gICAgICAgICAgICB9Ci0gICAg ICAgIH0KLQogICAgICAgICBpZiAoJGFnZ3JlZ2F0b3JfdGFibGUgPSAkZGItPmZldGNoX3RhYmxl KCdhZ2dyZWdhdG9ycycpKSB7CiAgICAgICAgICAgICBmb3JlYWNoICgkYWdncmVnYXRvcl90YWJs ZSBhcyAkYWdncmVnYXRvcikKICAgICAgICAgICAgICAgICAkdGhpcy0+aWRfdG9fYWdncmVnYXRv clskYWdncmVnYXRvclsnYWdncmVnYXRvcl9pZCddXSA9ICRhZ2dyZWdhdG9yOwpAQCAtMTI2LDIw ICsxMTUsOCBAQCBjbGFzcyBUZXN0TmFtZVJlc29sdmVyIHsKICAgICB9CiAKICAgICBmdW5jdGlv biBjb25maWd1cmF0aW9uc19mb3JfbWV0cmljX2FuZF9wbGF0Zm9ybSgkbWV0cmljX2lkLCAkcGxh dGZvcm1faWQpIHsKLSAgICAgICAgJG1ldHJpY19jb25maWd1cmF0aW9ucyA9IGFycmF5X2dldCgk dGhpcy0+bWV0cmljX3RvX2NvbmZpZ3VyYXRpb25zLCAkbWV0cmljX2lkLCBhcnJheSgpKTsKLSAg ICAgICAgcmV0dXJuIGFycmF5X2dldCgkbWV0cmljX2NvbmZpZ3VyYXRpb25zLCAkcGxhdGZvcm1f aWQpOwotICAgIH0KLQotICAgIGZ1bmN0aW9uIHRlc3RfZXhpc3RzX29uX3BsYXRmb3JtKCR0ZXN0 X2lkLCAkcGxhdGZvcm1faWQpIHsKLSAgICAgICAgZm9yZWFjaCAoJHRoaXMtPm1ldHJpY3NfZm9y X3Rlc3RfaWQoJHRlc3RfaWQpIGFzICRtZXRyaWMpIHsKLSAgICAgICAgICAgIGlmICgkdGhpcy0+ Y29uZmlndXJhdGlvbnNfZm9yX21ldHJpY19hbmRfcGxhdGZvcm0oJG1ldHJpY1snbWV0cmljX2lk J10sICRwbGF0Zm9ybV9pZCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIFRSVUU7Ci0gICAgICAg IH0KLSAgICAgICAgZm9yZWFjaCAoJHRoaXMtPmNoaWxkX21ldHJpY3NfZm9yX3Rlc3RfaWQoJHRl c3RfaWQpIGFzICRtZXRyaWMpIHsKLSAgICAgICAgICAgIGlmICgkdGhpcy0+Y29uZmlndXJhdGlv bnNfZm9yX21ldHJpY19hbmRfcGxhdGZvcm0oJG1ldHJpY1snbWV0cmljX2lkJ10sICRwbGF0Zm9y bV9pZCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIFRSVUU7Ci0gICAgICAgIH0KLSAgICAgICAg cmV0dXJuIEZBTFNFOworICAgICAgICByZXR1cm4gJHRoaXMtPmRiLT5xdWVyeV9hbmRfZmV0Y2hf YWxsKCdTRUxFQ1QgKiBGUk9NIHRlc3RfY29uZmlndXJhdGlvbnMgV0hFUkUgY29uZmlnX21ldHJp YyA9ICQxIEFORCBjb25maWdfcGxhdGZvcm0gPSAkMgorICAgICAgICAgICAgT1JERVIgQlkgY29u ZmlnX2lkJywgYXJyYXkoJG1ldHJpY19pZCwgJHBsYXRmb3JtX2lkKSk7CiAgICAgfQogfQogCg==