114418 2013-04-11 00:42:07 -0700 [webkitpy] Remove lingering return_exit_code usage in scm_mock and rebaselineserver. 2013-04-11 01:25:43 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 114410 1 glenn glenn benjamin commit-queue dpranke rniwa oldest_to_newest 873595 0 glenn 2013-04-11 00:42:07 -0700 Complete removal of SCM.add() optional return_exit_code from scm_mock and rebaselineserver. Change rebaselineserver to catch ScriptError in order to determine failure and exit_code. 873596 1 197516 glenn 2013-04-11 00:47:15 -0700 Created attachment 197516 Patch 873598 2 197516 rniwa 2013-04-11 00:48:39 -0700 Comment on attachment 197516 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=197516&action=review > Tools/Scripts/webkitpy/tool/servers/rebaselineserver.py:121 > + except ScriptError, e: Please don't use one-letter variable name like e. Spell out error. > Tools/Scripts/webkitpy/tool/servers/rebaselineserver.py:157 > + except ScriptError, e: Ditto. 873601 3 197518 glenn 2013-04-11 00:55:05 -0700 Created attachment 197518 Patch for landing 873613 4 197518 commit-queue 2013-04-11 01:25:41 -0700 Comment on attachment 197518 Patch for landing Clearing flags on attachment: 197518 Committed r148183: <http://trac.webkit.org/changeset/148183> 873614 5 commit-queue 2013-04-11 01:25:43 -0700 All reviewed patches have been landed. Closing bug. 197516 2013-04-11 00:47:15 -0700 2013-04-11 00:55:01 -0700 Patch bug-114418-20130411014655.patch text/plain 4381 glenn U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MTc3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWIxYzExYWE2NDIxYjZhZjRkODJmMTQ5NjI0NGQ1ZTQ4 Zjg5ZmZkZS4uOTNiNTI1MTc4ZGJiZTdhZDhhYmM2YzRlYzQyZmIxZWE4MmNiZTBiOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5 IEBACiAyMDEzLTA0LTExICBHbGVubiBBZGFtcyAgPGdsZW5uQHNreW5hdi5jb20+CiAKKyAgICAg ICAgW3dlYmtpdHB5XSBSZW1vdmUgbGluZ2VyaW5nIHJldHVybl9leGl0X2NvZGUgdXNhZ2UgaW4g c2NtX21vY2sgYW5kIHJlYmFzZWxpbmVzZXJ2ZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQ0MTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0 L3NjbS9zY21fbW9jay5weToKKyAgICAgICAgKE1vY2tTQ00uYWRkKTogUmVtb3ZlIG9wdGlvbmFs IHJlbW92ZV9leGl0X2NvZGUgYXJndW1lbnQuCisgICAgICAgIChNb2NrU0NNLmFkZF9saXN0KTog UmVtb3ZlIG9wdGlvbmFsIHJlbW92ZV9leGl0X2NvZGUgYXJndW1lbnQgYW5kIHJldHVybiB2YWx1 ZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc2VydmVycy9yZWJhc2VsaW5lc2Vy dmVyLnB5OgorICAgICAgICAoX3JlYmFzZWxpbmVfdGVzdCk6IFVzZSBTY3JpcHRFcnJvciB0byBj YXB0dXJlIFNDTS5hZGQoKSBmYWlsdXJlIGFuZCBleGl0IGNvZGUuCisgICAgICAgIChfbW92ZV90 ZXN0X2Jhc2VsaW5lcyk6IFVzZSBTY3JpcHRFcnJvciB0byBjYXB0dXJlIFNDTS5hZGQoKSBmYWls dXJlIGFuZCBleGl0IGNvZGUuCisKKzIwMTMtMDQtMTEgIEdsZW5uIEFkYW1zICA8Z2xlbm5Ac2t5 bmF2LmNvbT4KKwogICAgICAgICBbd2Via2l0cHldIFNWTlRlc3QgZmFpbHMgZm91ciB0ZXN0cyB3 aGVuIHVzaW5nIHN1YnZlcnNpb24gY2xpZW50IDEuNyBvciBsYXRlcgogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE0Mzg2CiAKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fbW9jay5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fbW9jay5weQppbmRl eCBiNzAxYzM0MWEyNjk5ZWFjNDc4NGIxNGRlNjA5ZGJkMGY1M2EyM2EyLi5jNWQxMGZjYjE4OWIw YThiNTE5ZmE1NTYyNTAyMmE3MGM0ODZkNDRiIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX21vY2sucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV9tb2NrLnB5CkBAIC0zOCwxMyArMzgs MTEgQEAgY2xhc3MgTW9ja1NDTShvYmplY3QpOgogICAgICAgICBzZWxmLl9maWxlc3lzdGVtID0g ZmlsZXN5c3RlbSBvciBNb2NrRmlsZVN5c3RlbSgpCiAgICAgICAgIHNlbGYuX2V4ZWN1dGl2ZSA9 IGV4ZWN1dGl2ZSBvciBNb2NrRXhlY3V0aXZlKCkKIAotICAgIGRlZiBhZGQoc2VsZiwgZGVzdGlu YXRpb25fcGF0aCwgcmV0dXJuX2V4aXRfY29kZT1GYWxzZSk6Ci0gICAgICAgIHNlbGYuYWRkX2xp c3QoW2Rlc3RpbmF0aW9uX3BhdGhdLCByZXR1cm5fZXhpdF9jb2RlKQorICAgIGRlZiBhZGQoc2Vs ZiwgZGVzdGluYXRpb25fcGF0aCk6CisgICAgICAgIHNlbGYuYWRkX2xpc3QoW2Rlc3RpbmF0aW9u X3BhdGhdKQogCi0gICAgZGVmIGFkZF9saXN0KHNlbGYsIGRlc3RpbmF0aW9uX3BhdGhzLCByZXR1 cm5fZXhpdF9jb2RlPUZhbHNlKToKKyAgICBkZWYgYWRkX2xpc3Qoc2VsZiwgZGVzdGluYXRpb25f cGF0aHMpOgogICAgICAgICBzZWxmLmFkZGVkX3BhdGhzLnVwZGF0ZShzZXQoZGVzdGluYXRpb25f cGF0aHMpKQotICAgICAgICBpZiByZXR1cm5fZXhpdF9jb2RlOgotICAgICAgICAgICAgcmV0dXJu IDAKIAogICAgIGRlZiBoYXNfd29ya2luZ19kaXJlY3RvcnlfY2hhbmdlcyhzZWxmKToKICAgICAg ICAgcmV0dXJuIEZhbHNlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv c2VydmVycy9yZWJhc2VsaW5lc2VydmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L3NlcnZlcnMvcmViYXNlbGluZXNlcnZlci5weQppbmRleCA5ZTljMzc5ZDZiMDU1ODk1ZTEzMDE1 ODQ4MTg3ZWQ5OWY3MTMyOTA3Li4wZjQxYjg5NTU0MzcyMDhlZTM3MzJjZWZiZDJmOWI5YTgxZjNl YzkyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc2VydmVycy9yZWJh c2VsaW5lc2VydmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zZXJ2ZXJz L3JlYmFzZWxpbmVzZXJ2ZXIucHkKQEAgLTMyLDYgKzMyLDcgQEAgaW1wb3J0IG9zLnBhdGgKIGlt cG9ydCBCYXNlSFRUUFNlcnZlcgogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0IGltcG9ydCBI b3N0ICAjIEZJWE1FOiBUaGlzIHNob3VsZCBub3QgYmUgbmVlZGVkIQorZnJvbSB3ZWJraXRweS5j b21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgU2NyaXB0RXJyb3IKIGZyb20gd2Via2l0cHku bGF5b3V0X3Rlc3RzLnBvcnQuYmFzZSBpbXBvcnQgUG9ydAogZnJvbSB3ZWJraXRweS50b29sLnNl cnZlcnMucmVmbGVjdGlvbmhhbmRsZXIgaW1wb3J0IFJlZmxlY3Rpb25IYW5kbGVyCiAKQEAgLTEx NCwxMyArMTE1LDEzIEBAIGRlZiBfcmViYXNlbGluZV90ZXN0KHRlc3RfZmlsZSwgYmFzZWxpbmVf dGFyZ2V0LCBiYXNlbGluZV9tb3ZlX3RvLCB0ZXN0X2NvbmZpZywKICAgICAgICAgZGVzdGluYXRp b25fcGF0aCA9IGZpbGVzeXN0ZW0uam9pbigKICAgICAgICAgICAgIHRhcmdldF9leHBlY3RhdGlv bnNfZGlyZWN0b3J5LCBkZXN0aW5hdGlvbl9maWxlKQogICAgICAgICBmaWxlc3lzdGVtLmNvcHlm aWxlKHNvdXJjZV9wYXRoLCBkZXN0aW5hdGlvbl9wYXRoKQotICAgICAgICBleGl0X2NvZGUgPSBz Y20uYWRkKGRlc3RpbmF0aW9uX3BhdGgsIHJldHVybl9leGl0X2NvZGU9VHJ1ZSkKLSAgICAgICAg aWYgZXhpdF9jb2RlOgorICAgICAgICB0cnk6CisgICAgICAgICAgICBzY20uYWRkKGRlc3RpbmF0 aW9uX3BhdGgpCisgICAgICAgICAgICBsb2coJyAgICBVcGRhdGVkICVzJyAlIGRlc3RpbmF0aW9u X2ZpbGUpCisgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKICAgICAgICAgICAgIGxvZygn ICAgIENvdWxkIG5vdCB1cGRhdGUgJXMgaW4gU0NNLCBleGl0IGNvZGUgJWQnICUKLSAgICAgICAg ICAgICAgICAoZGVzdGluYXRpb25fZmlsZSwgZXhpdF9jb2RlKSkKKyAgICAgICAgICAgICAgICAo ZGVzdGluYXRpb25fZmlsZSwgZS5leGl0X2NvZGUpKQogICAgICAgICAgICAgcmV0dXJuIEZhbHNl Ci0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBsb2coJyAgICBVcGRhdGVkICVzJyAlIGRlc3Rp bmF0aW9uX2ZpbGUpCiAKICAgICByZXR1cm4gVHJ1ZQogCkBAIC0xNTAsMTMgKzE1MSwxMyBAQCBk ZWYgX21vdmVfdGVzdF9iYXNlbGluZXModGVzdF9maWxlLCBleHRlbnNpb25zX3RvX21vdmUsIHNv dXJjZV9wbGF0Zm9ybSwgZGVzdGluYQogICAgICAgICBzb3VyY2VfcGF0aCA9IGZpbGVzeXN0ZW0u am9pbihzb3VyY2VfZGlyZWN0b3J5LCBmaWxlX25hbWUpCiAgICAgICAgIGRlc3RpbmF0aW9uX3Bh dGggPSBmaWxlc3lzdGVtLmpvaW4oZGVzdGluYXRpb25fZGlyZWN0b3J5LCBmaWxlX25hbWUpCiAg ICAgICAgIGZpbGVzeXN0ZW0uY29weWZpbGUoc291cmNlX3BhdGgsIGRlc3RpbmF0aW9uX3BhdGgp Ci0gICAgICAgIGV4aXRfY29kZSA9IHRlc3RfY29uZmlnLnNjbS5hZGQoZGVzdGluYXRpb25fcGF0 aCwgcmV0dXJuX2V4aXRfY29kZT1UcnVlKQotICAgICAgICBpZiBleGl0X2NvZGU6CisgICAgICAg IHRyeToKKyAgICAgICAgICAgIHRlc3RfY29uZmlnLnNjbS5hZGQoZGVzdGluYXRpb25fcGF0aCkK KyAgICAgICAgICAgIGxvZygnICAgIE1vdmVkICVzJyAlIGZpbGVfbmFtZSkKKyAgICAgICAgZXhj ZXB0IFNjcmlwdEVycm9yLCBlOgogICAgICAgICAgICAgbG9nKCcgICAgQ291bGQgbm90IHVwZGF0 ZSAlcyBpbiBTQ00sIGV4aXQgY29kZSAlZCcgJQotICAgICAgICAgICAgICAgIChmaWxlX25hbWUs IGV4aXRfY29kZSkpCisgICAgICAgICAgICAgICAgKGZpbGVfbmFtZSwgZS5leGl0X2NvZGUpKQog ICAgICAgICAgICAgcmV0dXJuIEZhbHNlCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBsb2co JyAgICBNb3ZlZCAlcycgJSBmaWxlX25hbWUpCiAKICAgICByZXR1cm4gVHJ1ZQogCg== 197518 2013-04-11 00:55:05 -0700 2013-04-11 01:25:41 -0700 Patch for landing bug-114418-20130411015444.patch text/plain 4395 glenn U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MTc3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWIxYzExYWE2NDIxYjZhZjRkODJmMTQ5NjI0NGQ1ZTQ4 Zjg5ZmZkZS4uOGYzM2U0NjBkMTQyZTk1Mzk2MzhiNDI2NzAxNWI2ODZhMjM0ODlhNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5 IEBACiAyMDEzLTA0LTExICBHbGVubiBBZGFtcyAgPGdsZW5uQHNreW5hdi5jb20+CiAKKyAgICAg ICAgW3dlYmtpdHB5XSBSZW1vdmUgbGluZ2VyaW5nIHJldHVybl9leGl0X2NvZGUgdXNhZ2UgaW4g c2NtX21vY2sgYW5kIHJlYmFzZWxpbmVzZXJ2ZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQ0MTgKKworICAgICAgICBSZXZpZXdlZCBieSBSeW9z dWtlIE5pd2EuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9z Y20vc2NtX21vY2sucHk6CisgICAgICAgIChNb2NrU0NNLmFkZCk6IFJlbW92ZSBvcHRpb25hbCBy ZW1vdmVfZXhpdF9jb2RlIGFyZ3VtZW50LgorICAgICAgICAoTW9ja1NDTS5hZGRfbGlzdCk6IFJl bW92ZSBvcHRpb25hbCByZW1vdmVfZXhpdF9jb2RlIGFyZ3VtZW50IGFuZCByZXR1cm4gdmFsdWUu CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMvcmViYXNlbGluZXNlcnZl ci5weToKKyAgICAgICAgKF9yZWJhc2VsaW5lX3Rlc3QpOiBVc2UgU2NyaXB0RXJyb3IgdG8gY2Fw dHVyZSBTQ00uYWRkKCkgZmFpbHVyZSBhbmQgZXhpdCBjb2RlLgorICAgICAgICAoX21vdmVfdGVz dF9iYXNlbGluZXMpOiBVc2UgU2NyaXB0RXJyb3IgdG8gY2FwdHVyZSBTQ00uYWRkKCkgZmFpbHVy ZSBhbmQgZXhpdCBjb2RlLgorCisyMDEzLTA0LTExICBHbGVubiBBZGFtcyAgPGdsZW5uQHNreW5h di5jb20+CisKICAgICAgICAgW3dlYmtpdHB5XSBTVk5UZXN0IGZhaWxzIGZvdXIgdGVzdHMgd2hl biB1c2luZyBzdWJ2ZXJzaW9uIGNsaWVudCAxLjcgb3IgbGF0ZXIKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDM4NgogCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX21vY2sucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX21vY2sucHkKaW5kZXgg YjcwMWMzNDFhMjY5OWVhYzQ3ODRiMTRkZTYwOWRiZDBmNTNhMjNhMi4uYzVkMTBmY2IxODliMGE4 YjUxOWZhNTU2MjUwMjJhNzBjNDg2ZDQ0YiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV9tb2NrLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fbW9jay5weQpAQCAtMzgsMTMgKzM4LDEx IEBAIGNsYXNzIE1vY2tTQ00ob2JqZWN0KToKICAgICAgICAgc2VsZi5fZmlsZXN5c3RlbSA9IGZp bGVzeXN0ZW0gb3IgTW9ja0ZpbGVTeXN0ZW0oKQogICAgICAgICBzZWxmLl9leGVjdXRpdmUgPSBl eGVjdXRpdmUgb3IgTW9ja0V4ZWN1dGl2ZSgpCiAKLSAgICBkZWYgYWRkKHNlbGYsIGRlc3RpbmF0 aW9uX3BhdGgsIHJldHVybl9leGl0X2NvZGU9RmFsc2UpOgotICAgICAgICBzZWxmLmFkZF9saXN0 KFtkZXN0aW5hdGlvbl9wYXRoXSwgcmV0dXJuX2V4aXRfY29kZSkKKyAgICBkZWYgYWRkKHNlbGYs IGRlc3RpbmF0aW9uX3BhdGgpOgorICAgICAgICBzZWxmLmFkZF9saXN0KFtkZXN0aW5hdGlvbl9w YXRoXSkKIAotICAgIGRlZiBhZGRfbGlzdChzZWxmLCBkZXN0aW5hdGlvbl9wYXRocywgcmV0dXJu X2V4aXRfY29kZT1GYWxzZSk6CisgICAgZGVmIGFkZF9saXN0KHNlbGYsIGRlc3RpbmF0aW9uX3Bh dGhzKToKICAgICAgICAgc2VsZi5hZGRlZF9wYXRocy51cGRhdGUoc2V0KGRlc3RpbmF0aW9uX3Bh dGhzKSkKLSAgICAgICAgaWYgcmV0dXJuX2V4aXRfY29kZToKLSAgICAgICAgICAgIHJldHVybiAw CiAKICAgICBkZWYgaGFzX3dvcmtpbmdfZGlyZWN0b3J5X2NoYW5nZXMoc2VsZik6CiAgICAgICAg IHJldHVybiBGYWxzZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3Nl cnZlcnMvcmViYXNlbGluZXNlcnZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9z ZXJ2ZXJzL3JlYmFzZWxpbmVzZXJ2ZXIucHkKaW5kZXggOWU5YzM3OWQ2YjA1NTg5NWUxMzAxNTg0 ODE4N2VkOTlmNzEzMjkwNy4uMDRjZTUxNzZjNTVmMDczNjU3NDE1MTkwZDhjZDEzMjgwZTEyMWNh MyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMvcmViYXNl bGluZXNlcnZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc2VydmVycy9y ZWJhc2VsaW5lc2VydmVyLnB5CkBAIC0zMiw2ICszMiw3IEBAIGltcG9ydCBvcy5wYXRoCiBpbXBv cnQgQmFzZUhUVFBTZXJ2ZXIKIAogZnJvbSB3ZWJraXRweS5jb21tb24uaG9zdCBpbXBvcnQgSG9z dCAgIyBGSVhNRTogVGhpcyBzaG91bGQgbm90IGJlIG5lZWRlZCEKK2Zyb20gd2Via2l0cHkuY29t bW9uLnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9yCiBmcm9tIHdlYmtpdHB5Lmxh eW91dF90ZXN0cy5wb3J0LmJhc2UgaW1wb3J0IFBvcnQKIGZyb20gd2Via2l0cHkudG9vbC5zZXJ2 ZXJzLnJlZmxlY3Rpb25oYW5kbGVyIGltcG9ydCBSZWZsZWN0aW9uSGFuZGxlcgogCkBAIC0xMTQs MTMgKzExNSwxMyBAQCBkZWYgX3JlYmFzZWxpbmVfdGVzdCh0ZXN0X2ZpbGUsIGJhc2VsaW5lX3Rh cmdldCwgYmFzZWxpbmVfbW92ZV90bywgdGVzdF9jb25maWcsCiAgICAgICAgIGRlc3RpbmF0aW9u X3BhdGggPSBmaWxlc3lzdGVtLmpvaW4oCiAgICAgICAgICAgICB0YXJnZXRfZXhwZWN0YXRpb25z X2RpcmVjdG9yeSwgZGVzdGluYXRpb25fZmlsZSkKICAgICAgICAgZmlsZXN5c3RlbS5jb3B5Zmls ZShzb3VyY2VfcGF0aCwgZGVzdGluYXRpb25fcGF0aCkKLSAgICAgICAgZXhpdF9jb2RlID0gc2Nt LmFkZChkZXN0aW5hdGlvbl9wYXRoLCByZXR1cm5fZXhpdF9jb2RlPVRydWUpCi0gICAgICAgIGlm IGV4aXRfY29kZToKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgc2NtLmFkZChkZXN0aW5hdGlv bl9wYXRoKQorICAgICAgICAgICAgbG9nKCcgICAgVXBkYXRlZCAlcycgJSBkZXN0aW5hdGlvbl9m aWxlKQorICAgICAgICBleGNlcHQgU2NyaXB0RXJyb3IsIGVycm9yOgogICAgICAgICAgICAgbG9n KCcgICAgQ291bGQgbm90IHVwZGF0ZSAlcyBpbiBTQ00sIGV4aXQgY29kZSAlZCcgJQotICAgICAg ICAgICAgICAgIChkZXN0aW5hdGlvbl9maWxlLCBleGl0X2NvZGUpKQorICAgICAgICAgICAgICAg IChkZXN0aW5hdGlvbl9maWxlLCBlcnJvci5leGl0X2NvZGUpKQogICAgICAgICAgICAgcmV0dXJu IEZhbHNlCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBsb2coJyAgICBVcGRhdGVkICVzJyAl IGRlc3RpbmF0aW9uX2ZpbGUpCiAKICAgICByZXR1cm4gVHJ1ZQogCkBAIC0xNTAsMTMgKzE1MSwx MyBAQCBkZWYgX21vdmVfdGVzdF9iYXNlbGluZXModGVzdF9maWxlLCBleHRlbnNpb25zX3RvX21v dmUsIHNvdXJjZV9wbGF0Zm9ybSwgZGVzdGluYQogICAgICAgICBzb3VyY2VfcGF0aCA9IGZpbGVz eXN0ZW0uam9pbihzb3VyY2VfZGlyZWN0b3J5LCBmaWxlX25hbWUpCiAgICAgICAgIGRlc3RpbmF0 aW9uX3BhdGggPSBmaWxlc3lzdGVtLmpvaW4oZGVzdGluYXRpb25fZGlyZWN0b3J5LCBmaWxlX25h bWUpCiAgICAgICAgIGZpbGVzeXN0ZW0uY29weWZpbGUoc291cmNlX3BhdGgsIGRlc3RpbmF0aW9u X3BhdGgpCi0gICAgICAgIGV4aXRfY29kZSA9IHRlc3RfY29uZmlnLnNjbS5hZGQoZGVzdGluYXRp b25fcGF0aCwgcmV0dXJuX2V4aXRfY29kZT1UcnVlKQotICAgICAgICBpZiBleGl0X2NvZGU6Cisg ICAgICAgIHRyeToKKyAgICAgICAgICAgIHRlc3RfY29uZmlnLnNjbS5hZGQoZGVzdGluYXRpb25f cGF0aCkKKyAgICAgICAgICAgIGxvZygnICAgIE1vdmVkICVzJyAlIGZpbGVfbmFtZSkKKyAgICAg ICAgZXhjZXB0IFNjcmlwdEVycm9yLCBlcnJvcjoKICAgICAgICAgICAgIGxvZygnICAgIENvdWxk IG5vdCB1cGRhdGUgJXMgaW4gU0NNLCBleGl0IGNvZGUgJWQnICUKLSAgICAgICAgICAgICAgICAo ZmlsZV9uYW1lLCBleGl0X2NvZGUpKQorICAgICAgICAgICAgICAgIChmaWxlX25hbWUsIGVycm9y LmV4aXRfY29kZSkpCiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKLSAgICAgICAgZWxzZToKLSAg ICAgICAgICAgIGxvZygnICAgIE1vdmVkICVzJyAlIGZpbGVfbmFtZSkKIAogICAgIHJldHVybiBU cnVlCiAK