156393 2016-04-07 22:16:37 -0700 Fix various bugs in the new syncing script 2016-04-08 00:15:48 -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 joepeck rniwa slewis oldest_to_newest 1182066 0 rniwa 2016-04-07 22:16:37 -0700 There are a few minor bugs in the new syncing script. Fix 'em all. 1182068 1 275981 rniwa 2016-04-07 22:25:32 -0700 Created attachment 275981 Fixes bugs 1182081 2 275981 commit-queue 2016-04-08 00:15:43 -0700 Comment on attachment 275981 Fixes bugs Clearing flags on attachment: 275981 Committed r199220: <http://trac.webkit.org/changeset/199220> 1182082 3 commit-queue 2016-04-08 00:15:48 -0700 All reviewed patches have been landed. Closing bug. 275981 2016-04-07 22:25:32 -0700 2016-04-08 00:15:43 -0700 Fixes bugs bug-156393-20160407222535.patch text/plain 15563 rniwa SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMTk5MjE3KQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMyIEBACisyMDE2LTA0LTA3ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIEZpeCB2YXJpb3VzIGJ1Z3MgaW4gdGhlIG5ldyBzeW5jaW5nIHNjcmlwdAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2MzkzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzZXJ2ZXItdGVz dHMvcmVzb3VyY2VzL2NvbW1vbi1vcGVyYXRpb25zLmpzOiBBZGRlZC4gVGhpcyBmaWxlIHdhcyBz dXBwb3NlZCB0byBiZSBhZGRlZCBpbiByMTk5MTkxLgorICAgICAgICAoYWRkQnVpbGRlckZvclJl cG9ydCk6CisgICAgICAgIChhZGRTbGF2ZUZvclJlcG9ydCk6CisgICAgICAgIChjb25uZWN0VG9E YXRhYmFzZUluRXZlcnlUZXN0KToKKyAgICAgICAgKHN1Ym1pdFJlcG9ydCk6CisgICAgICAgICog dG9vbHMvanMvYnVpbGRib3QtdHJpZ2dlcmFibGUuanM6CisgICAgICAgIChCdWlsZGJvdFRyaWdn ZXJhYmxlLnByb3RvdHlwZS5fcHVsbEJ1aWxkYm90T25BbGxTeW5jZXJzKTogRG9uJ3QgbG9nIGV2 ZXJ5IHRpbWUgd2UgcHVsbCBmcm9tIGJ1aWxkYm90CisgICAgICAgIGJ1aWxkZXIgYXMgdGhpcyBk cmFtYXRpY2FsbHkgaW5jcmVhc2VzIHRoZSBhbW91bnQgb2YgbG9nIHdlIGdlbmVyYXRlLgorICAg ICAgICAqIHRvb2xzL2pzL3BhcnNlLWFyZ3VtZW50cy5qczoKKyAgICAgICAgKHBhcnNlQXJndW1l bnRzKTogRml4ZWQgYSB0eXBvLiBUaGlzIHNob3VsZCBiZSBwYXJzZUFyZ3VtZW50KnMqLCBub3Qg cGFyc2VBcmd1bWVudC4KKyAgICAgICAgKiB0b29scy9qcy9yZW1vdGUuanM6CisgICAgICAgIChS ZW1vdGVBUEkucHJvdG90eXBlLnVybCk6IEZpeGVkIGEgYnVnIHRoYXQgcG9ydFN1ZmZpeCB3YXNu J3QgYmVpbmcgZXhwYW5kZWQgaW4gdGhlIHRlbXBsYXRlIGxpdGVyYWwuCisgICAgICAgIChSZW1v dGVBUEkucHJvdG90eXBlLmNvbmZpZ3VyZSk6IEFkZGVkIG1vcmUgdmFsaWRhdGlvbnMgd2l0aCBu aWNlIGVycm9yIG1lc3NhZ2VzLgorICAgICAgICAoUmVtb3RlQVBJLnByb3RvdHlwZS5zZW5kSHR0 cFJlcXVlc3QpOiBGYWxsaW5nIGJhY2sgdG8gcG9ydCA4MCBpc24ndCByaWdodCB3aGVuIHNjaGVt ZSBpcyBodHRwcy4gQ29tcHV0ZQorICAgICAgICB0aGUgcmlnaHQgcG9ydCBpbiBjb25maWd1cmUg aW5zdGVhZCBiYXNlZCBvbiB0aGUgc2NoZW1lLgorICAgICAgICAqIHRvb2xzL3N5bmMtYnVpbGRi b3QuanM6CisgICAgICAgIChzeW5jTG9vcCk6IEZpeGVkIHRoZSBidWcgdGhhdCBzeW5jaW5nIG11 bHRpcGxlIHRpbWVzIGZhaWwgYmVjYXVzZSBNYW5pZmVzdC5mZXRjaCgpIGNyZWF0ZSBuZXcgUGxh dGZvcm0KKyAgICAgICAgYW5kIFRlc3Qgb2JqZWN0cy4gVGhpcyByZXN1bHRzIGluIHZhcmlvdXMg cmVmZXJlbmNlcyBpbiBCdWlsZFJlcXVlc3Qgb2JqZWN0cyB0byBnZXQgb3V0ZGF0ZWQuIEZpeGlu ZyB0aGlzCisgICAgICAgIHByb3Blcmx5IGluIE1hbmlmZXN0LmZldGNoKCkgYmVjYXVzZSB3ZSBk byBuZWVkIHRvICJmb3JnZXQiIGFib3V0IHNvbWUgdGVzdHMgYW5kIHBsYXRmb3JtcyBpbiBzb21l IGNhc2VzLgorICAgICAgICBGb3Igbm93LCBkZWxldGUgYWxsIHYzIG1vZGVsIG9iamVjdHMgYW5k IHN0YXJ0IG92ZXIgaW4gZWFjaCBzeW5jaW5nIGN5Y2xlLgorICAgICAgICAqIHVuaXQtdGVzdHMv dG9vbHMtanMtcmVtb3RlLXRlc3RzLmpzOiBBZGRlZC4gVW5pdCB0ZXN0cyBmb3IgdGhlIGFmb3Jl bWVudGlvbmVkIGNoYW5nZXMgdG8gUmVtb3RlQVBJLgorCiAyMDE2LTA0LTA3ICBSeW9zdWtlIE5p d2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIHN5bmMtYnVpbGRib3QuanMgZG9lc24n dCBtYXJrIGRpc2FwcGVhcmVkIGJ1aWxkcyBhcyBmYWlsZWQKSW5kZXg6IFdlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvcmVzb3VyY2VzL2NvbW1vbi1vcGVyYXRpb25zLmpzCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvcmVzb3Vy Y2VzL2NvbW1vbi1vcGVyYXRpb25zLmpzCShyZXZpc2lvbiAwKQorKysgV2Vic2l0ZXMvcGVyZi53 ZWJraXQub3JnL3NlcnZlci10ZXN0cy9yZXNvdXJjZXMvY29tbW9uLW9wZXJhdGlvbnMuanMJKHdv cmtpbmcgY29weSkKQEAgLTAsMCArMSw0NiBAQAorCitjb25zdCBjcnlwdG8gPSByZXF1aXJlKCdj cnlwdG8nKTsKKworZnVuY3Rpb24gYWRkQnVpbGRlckZvclJlcG9ydChyZXBvcnQpCit7CisgICAg cmV0dXJuIFRlc3RTZXJ2ZXIuZGF0YWJhc2UoKS5pbnNlcnQoJ2J1aWxkZXJzJywgeworICAgICAg ICBuYW1lOiByZXBvcnQuYnVpbGRlck5hbWUsCisgICAgICAgIHBhc3N3b3JkX2hhc2g6IGNyeXB0 by5jcmVhdGVIYXNoKCdzaGEyNTYnKS51cGRhdGUocmVwb3J0LmJ1aWxkZXJQYXNzd29yZCkuZGln ZXN0KCdoZXgnKQorICAgIH0pOworfQorCitmdW5jdGlvbiBhZGRTbGF2ZUZvclJlcG9ydChyZXBv cnQpCit7CisgICAgcmV0dXJuIFRlc3RTZXJ2ZXIuZGF0YWJhc2UoKS5pbnNlcnQoJ2J1aWxkX3Ns YXZlcycsIHsKKyAgICAgICAgbmFtZTogcmVwb3J0LnNsYXZlTmFtZSwKKyAgICAgICAgcGFzc3dv cmRfaGFzaDogY3J5cHRvLmNyZWF0ZUhhc2goJ3NoYTI1NicpLnVwZGF0ZShyZXBvcnQuc2xhdmVQ YXNzd29yZCkuZGlnZXN0KCdoZXgnKQorICAgIH0pOworfQorCitmdW5jdGlvbiBjb25uZWN0VG9E YXRhYmFzZUluRXZlcnlUZXN0KCkKK3sKKyAgICBiZWZvcmVFYWNoKGZ1bmN0aW9uICgpIHsKKyAg ICAgICAgVGVzdFNlcnZlci5kYXRhYmFzZSgpLmNvbm5lY3Qoe2tlZXBBbGl2ZTogdHJ1ZX0pOwor ICAgIH0pOworCisgICAgYWZ0ZXJFYWNoKGZ1bmN0aW9uICgpIHsKKyAgICAgICAgVGVzdFNlcnZl ci5kYXRhYmFzZSgpLmRpc2Nvbm5lY3QoKTsKKyAgICB9KTsKK30KKworZnVuY3Rpb24gc3VibWl0 UmVwb3J0KHJlcG9ydCkKK3sKKyAgICByZXR1cm4gVGVzdFNlcnZlci5kYXRhYmFzZSgpLmluc2Vy dCgnYnVpbGRlcnMnLCB7CisgICAgICAgIG5hbWU6IHJlcG9ydFswXS5idWlsZGVyTmFtZSwKKyAg ICAgICAgcGFzc3dvcmRfaGFzaDogY3J5cHRvLmNyZWF0ZUhhc2goJ3NoYTI1NicpLnVwZGF0ZShy ZXBvcnRbMF0uYnVpbGRlclBhc3N3b3JkKS5kaWdlc3QoJ2hleCcpCisgICAgfSkudGhlbihmdW5j dGlvbiAoKSB7CisgICAgICAgIHJldHVybiBUZXN0U2VydmVyLnJlbW90ZUFQSSgpLnBvc3RKU09O KCcvYXBpL3JlcG9ydC8nLCByZXBvcnQpOworICAgIH0pOworfQorCitpZiAodHlwZW9mIG1vZHVs ZSAhPSAndW5kZWZpbmVkJykgeworICAgIG1vZHVsZS5leHBvcnRzLmFkZEJ1aWxkZXJGb3JSZXBv cnQgPSBhZGRCdWlsZGVyRm9yUmVwb3J0OworICAgIG1vZHVsZS5leHBvcnRzLmFkZFNsYXZlRm9y UmVwb3J0ID0gYWRkU2xhdmVGb3JSZXBvcnQ7CisgICAgbW9kdWxlLmV4cG9ydHMuY29ubmVjdFRv RGF0YWJhc2VJbkV2ZXJ5VGVzdCA9IGNvbm5lY3RUb0RhdGFiYXNlSW5FdmVyeVRlc3Q7CisgICAg bW9kdWxlLmV4cG9ydHMuc3VibWl0UmVwb3J0ID0gc3VibWl0UmVwb3J0OworfQpJbmRleDogV2Vi c2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL3N5bmMtYnVpbGRib3QuanMKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL3N5bmMtYnVpbGRib3QuanMJKHJldmlz aW9uIDE5OTIxNikKKysrIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9zeW5jLWJ1aWxk Ym90LmpzCSh3b3JraW5nIGNvcHkpCkBAIC0yMSw2ICsyMSwxOCBAQCBmdW5jdGlvbiBtYWluKGFy Z3YpCiAKIGZ1bmN0aW9uIHN5bmNMb29wKG9wdGlvbnMpCiB7CisgICAgLy8gRklYTUU6IEZpeCBN YW5pZmVzdC5mZXRjaCgpIHRvIHVzZSBlbnN1cmVTaW5nbGV0b24gdG8gY3JlYXRlIG1vZGVsIG9i amVjdHMuCisgICAgZ2xvYmFsLkFuYWx5c2lzVGFzay5fZmV0Y2hBbGxQcm9taXNlID0gbnVsbDsK KyAgICBnbG9iYWwuQW5hbHlzaXNUYXNrLmNsZWFyU3RhdGljTWFwKCk7CisgICAgZ2xvYmFsLkJ1 aWxkUmVxdWVzdC5jbGVhclN0YXRpY01hcCgpOworICAgIGdsb2JhbC5Db21taXRMb2cuY2xlYXJT dGF0aWNNYXAoKTsKKyAgICBnbG9iYWwuTWV0cmljLmNsZWFyU3RhdGljTWFwKCk7CisgICAgZ2xv YmFsLlBsYXRmb3JtLmNsZWFyU3RhdGljTWFwKCk7CisgICAgZ2xvYmFsLlJlcG9zaXRvcnkuY2xl YXJTdGF0aWNNYXAoKTsKKyAgICBnbG9iYWwuUm9vdFNldC5jbGVhclN0YXRpY01hcCgpOworICAg IGdsb2JhbC5UZXN0LmNsZWFyU3RhdGljTWFwKCk7CisgICAgZ2xvYmFsLlRlc3RHcm91cC5jbGVh clN0YXRpY01hcCgpOworCiAgICAgbGV0IHNlcnZlckNvbmZpZyA9IEpTT04ucGFyc2UoZnMucmVh ZEZpbGVTeW5jKG9wdGlvbnNbJy0tc2VydmVyLWNvbmZpZy1qc29uJ10sICd1dGY4JykpOwogICAg IGxldCBidWlsZGJvdENvbmZpZyA9IEpTT04ucGFyc2UoZnMucmVhZEZpbGVTeW5jKG9wdGlvbnNb Jy0tYnVpbGRib3QtY29uZmlnLWpzb24nXSwgJ3V0ZjgnKSk7CiAgICAgbGV0IGJ1aWxkYm90UmVt b3RlID0gbmV3IFJlbW90ZUFQSShidWlsZGJvdENvbmZpZy5zZXJ2ZXIpOwpJbmRleDogV2Vic2l0 ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL2pzL2J1aWxkYm90LXRyaWdnZXJhYmxlLmpzCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9qcy9idWlsZGJvdC10cmln Z2VyYWJsZS5qcwkocmV2aXNpb24gMTk5MjE2KQorKysgV2Vic2l0ZXMvcGVyZi53ZWJraXQub3Jn L3Rvb2xzL2pzL2J1aWxkYm90LXRyaWdnZXJhYmxlLmpzCSh3b3JraW5nIGNvcHkpCkBAIC04Myw3 ICs4Myw2IEBAIGNsYXNzIEJ1aWxkYm90VHJpZ2dlcmFibGUgewogICAgICAgICBsZXQgYXNzb2Np YXRlZFJlcXVlc3RzID0gbmV3IFNldDsKICAgICAgICAgbGV0IHNlbGYgPSB0aGlzOwogICAgICAg ICByZXR1cm4gUHJvbWlzZS5hbGwodGhpcy5fc3luY2Vycy5tYXAoZnVuY3Rpb24gKHN5bmNlcikg ewotICAgICAgICAgICAgc2VsZi5fbG9nZ2VyLmxvZyhgRmV0Y2hpbmcgYnVpbGRzIG9uICR7c3lu Y2VyLmJ1aWxkZXJOYW1lKCl9YCk7CiAgICAgICAgICAgICByZXR1cm4gc3luY2VyLnB1bGxCdWls ZGJvdChzZWxmLl9sb29rYmFja0NvdW50KS50aGVuKGZ1bmN0aW9uIChlbnRyeUxpc3QpIHsKICAg ICAgICAgICAgICAgICBmb3IgKGxldCBlbnRyeSBvZiBlbnRyeUxpc3QpIHsKICAgICAgICAgICAg ICAgICAgICAgbGV0IHJlcXVlc3QgPSBCdWlsZFJlcXVlc3QuZmluZEJ5SWQoZW50cnkuYnVpbGRS ZXF1ZXN0SWQoKSk7CkluZGV4OiBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvanMvcGFy c2UtYXJndW1lbnRzLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90 b29scy9qcy9wYXJzZS1hcmd1bWVudHMuanMJKHJldmlzaW9uIDE5OTIxNikKKysrIFdlYnNpdGVz L3BlcmYud2Via2l0Lm9yZy90b29scy9qcy9wYXJzZS1hcmd1bWVudHMuanMJKHdvcmtpbmcgY29w eSkKQEAgLTEsNSArMSw1IEBACiAKLWZ1bmN0aW9uIHBhcnNlQXJndW1lbnQoYXJndiwgYWNjZXB0 ZWRPcHRpb25zKSB7CitmdW5jdGlvbiBwYXJzZUFyZ3VtZW50cyhhcmd2LCBhY2NlcHRlZE9wdGlv bnMpIHsKICAgICB2YXIgYXJncyA9IGFyZ3Yuc2xpY2UoMik7CiAgICAgdmFyIG9wdGlvbnMgPSB7 fQogICAgIGZvciAodmFyIGkgPSAwOyBpIDwgYXJncy5sZW5ndGg7IGkgKz0gMikgewpAQCAtMzEs NCArMzEsNCBAQCBmdW5jdGlvbiBwYXJzZUFyZ3VtZW50KGFyZ3YsIGFjY2VwdGVkT3B0CiB9CiAK IGlmICh0eXBlb2YgbW9kdWxlICE9ICd1bmRlZmluZWQnKQotICAgIG1vZHVsZS5leHBvcnRzLnBh cnNlQXJndW1lbnQgPSBwYXJzZUFyZ3VtZW50OworICAgIG1vZHVsZS5leHBvcnRzLnBhcnNlQXJn dW1lbnRzID0gcGFyc2VBcmd1bWVudHM7CkluZGV4OiBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcv dG9vbHMvanMvcmVtb3RlLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9y Zy90b29scy9qcy9yZW1vdGUuanMJKHJldmlzaW9uIDE5OTIxNikKKysrIFdlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy90b29scy9qcy9yZW1vdGUuanMJKHdvcmtpbmcgY29weSkKQEAgLTE3LDE5ICsx NywzNyBAQCBjbGFzcyBSZW1vdGVBUEkgewogICAgIHsKICAgICAgICAgbGV0IHNjaGVtZSA9IHRo aXMuX3NlcnZlci5zY2hlbWU7CiAgICAgICAgIGxldCBwb3J0ID0gdGhpcy5fc2VydmVyLnBvcnQ7 Ci0gICAgICAgIGxldCBwb3J0U3VmZml4ID0gKHNjaGVtZSA9PSAnaHR0cCcgJiYgcG9ydCA9PSA4 MCkgfHwgKHNjaGVtZSA9PSAnaHR0cHMnICYmIHBvcnQgPT0gNDQzKSA/ICcnIDogYDoke3BvcnR9 YDsKKyAgICAgICAgbGV0IHBvcnRTdWZmaXggPSB0aGlzLl9zZXJ2ZXIucG9ydCA9PSB0aGlzLl9z ZXJ2ZXIuZGVmYXVsdFBvcnQgPyAnJyA6IGA6JHtwb3J0fWA7CiAgICAgICAgIGlmIChwYXRoLmNo YXJBdCgwKSAhPSAnLycpCiAgICAgICAgICAgICBwYXRoID0gJy8nICsgcGF0aDsKLSAgICAgICAg cmV0dXJuIGAke3NjaGVtZX06Ly8ke3RoaXMuX3NlcnZlci5ob3N0fXBvcnRTdWZmaXgke3BhdGh9 YDsKKyAgICAgICAgcmV0dXJuIGAke3NjaGVtZX06Ly8ke3RoaXMuX3NlcnZlci5ob3N0fSR7cG9y dFN1ZmZpeH0ke3BhdGh9YDsKICAgICB9CiAKICAgICBjb25maWd1cmUoc2VydmVyKQogICAgIHsK ICAgICAgICAgYXNzZXJ0KHNlcnZlci5zY2hlbWUgPT09ICdodHRwJyB8fCBzZXJ2ZXIuc2NoZW1l ID09PSAnaHR0cHMnKTsKLSAgICAgICAgYXNzZXJ0LmVxdWFsKHR5cGVvZihzZXJ2ZXIuaG9zdCks ICdzdHJpbmcnKTsKLSAgICAgICAgYXNzZXJ0KCFzZXJ2ZXIucG9ydCB8fCB0eXBlb2Yoc2VydmVy LnBvcnQpID09ICdudW1iZXInKTsKLSAgICAgICAgYXNzZXJ0KCFzZXJ2ZXIuYXV0aCB8fCB0eXBl b2Yoc2VydmVyLmF1dGgpID09ICdvYmplY3QnKTsKLSAgICAgICAgdGhpcy5fc2VydmVyID0gc2Vy dmVyOworICAgICAgICBhc3NlcnQuZXF1YWwodHlwZW9mKHNlcnZlci5ob3N0KSwgJ3N0cmluZycs ICdob3N0IHNob3VsZCBiZSBhIHN0cmluZycpOworICAgICAgICBhc3NlcnQoIXNlcnZlci5wb3J0 IHx8IHR5cGVvZihzZXJ2ZXIucG9ydCkgPT0gJ251bWJlcicsICdwb3J0IHNob3VsZCBiZSBhIG51 bWJlcicpOworCisgICAgICAgIGxldCBhdXRoID0gbnVsbDsKKyAgICAgICAgaWYgKHNlcnZlci5h dXRoKSB7CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwodHlwZW9mKHNlcnZlci5hdXRoKSwgJ29i amVjdCcsICdhdXRoIHNob3VsZCBiZSBhIGRpY3Rpb25hcnkgd2l0aCB1c2VybmFtZSBhbmQgcGFz c3dvcmQgYXMga2V5cycpOworICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHR5cGVvZihzZXJ2ZXIu YXV0aC51c2VybmFtZSksICdzdHJpbmcnLCAnYXV0aCBzaG91bGQgY29udGFpbiBhIHN0cmluZyB1 c2VybmFtZScpOworICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHR5cGVvZihzZXJ2ZXIuYXV0aC5w YXNzd29yZCksICdzdHJpbmcnLCAnYXV0aCBzaG91bGQgY29udGFpbiBhIHN0cmluZyBwYXNzd29y ZCcpOworICAgICAgICAgICAgYXV0aCA9IHsKKyAgICAgICAgICAgICAgICB1c2VybmFtZTogc2Vy dmVyLmF1dGgudXNlcm5hbWUsCisgICAgICAgICAgICAgICAgcGFzc3dvcmQ6IHNlcnZlci5hdXRo LnBhc3N3b3JkLAorICAgICAgICAgICAgfTsKKyAgICAgICAgfQorCisgICAgICAgIGNvbnN0IGRl ZmF1bHRQb3J0ID0gc2VydmVyLnNjaGVtZSA9PSAnaHR0cCcgPyA4MCA6IDQ0MzsKKyAgICAgICAg dGhpcy5fc2VydmVyID0geworICAgICAgICAgICAgc2NoZW1lOiBzZXJ2ZXIuc2NoZW1lLAorICAg ICAgICAgICAgaG9zdDogc2VydmVyLmhvc3QsCisgICAgICAgICAgICBwb3J0OiBzZXJ2ZXIucG9y dCB8fCBkZWZhdWx0UG9ydCwKKyAgICAgICAgICAgIGRlZmF1bHRQb3J0OiBkZWZhdWx0UG9ydCwK KyAgICAgICAgICAgIGF1dGg6IGF1dGgsCisgICAgICAgIH07CiAgICAgfQogCiAgICAgZ2V0SlNP TihwYXRoKQpAQCAtNzIsNyArOTAsNyBAQCBjbGFzcyBSZW1vdGVBUEkgewogICAgICAgICByZXR1 cm4gbmV3IFByb21pc2UoZnVuY3Rpb24gKHJlc29sdmUsIHJlamVjdCkgewogICAgICAgICAgICAg bGV0IG9wdGlvbnMgPSB7CiAgICAgICAgICAgICAgICAgaG9zdG5hbWU6IHNlcnZlci5ob3N0LAot ICAgICAgICAgICAgICAgIHBvcnQ6IHNlcnZlci5wb3J0IHx8IDgwLAorICAgICAgICAgICAgICAg IHBvcnQ6IHNlcnZlci5wb3J0LAogICAgICAgICAgICAgICAgIGF1dGg6IHNlcnZlci5hdXRoID8g c2VydmVyLmF1dGgudXNlcm5hbWUgKyAnOicgKyBzZXJ2ZXIuYXV0aC5wYXNzd29yZCA6IG51bGws CiAgICAgICAgICAgICAgICAgbWV0aG9kOiBtZXRob2QsCiAgICAgICAgICAgICAgICAgcGF0aDog cGF0aCwKSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy91bml0LXRlc3RzL3Rvb2xzLWpz LXJlbW90ZS10ZXN0cy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcv dW5pdC10ZXN0cy90b29scy1qcy1yZW1vdGUtdGVzdHMuanMJKHJldmlzaW9uIDApCisrKyBXZWJz aXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy90b29scy1qcy1yZW1vdGUtdGVzdHMuanMJ KHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxMTIgQEAKKyd1c2Ugc3RyaWN0JzsKKworY29uc3Qg YXNzZXJ0ID0gcmVxdWlyZSgnYXNzZXJ0Jyk7CisKK2NvbnN0IFJlbW90ZUFQSSA9IHJlcXVpcmUo Jy4uL3Rvb2xzL2pzL3JlbW90ZS5qcycpLlJlbW90ZUFQSTsKKworZGVzY3JpYmUoJ1JlbW90ZUFQ SScsIGZ1bmN0aW9uICgpIHsKKyAgICBkZXNjcmliZSgnY29uZmlndXJlJywgZnVuY3Rpb24gKCkg eworICAgICAgICBpdCgnc2hvdWxkIGFjY2VwdCBhIHZhbGlkIGNvbmZpZ3VyYXRpb24nLCBmdW5j dGlvbiAoKSB7CisgICAgICAgICAgICBsZXQgcmVtb3RlID0gbmV3IFJlbW90ZUFQSSgpOworICAg ICAgICAgICAgYXNzZXJ0LmRvZXNOb3RUaHJvdyhmdW5jdGlvbiAoKSB7IHJlbW90ZS5jb25maWd1 cmUoe3NjaGVtZTogJ2h0dHAnLCBob3N0OiAnYnVpbGQud2Via2l0Lm9yZycsIHBvcnQ6IDgwfSk7 IH0pOworICAgICAgICB9KTsKKworICAgICAgICBpdCgnc2hvdWxkIHJlamVjdCBhIHNjaGVtZSBv dGhlciB0aGFuIGh0dHAgYW5kIGh0dHBzJywgZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgbGV0 IHJlbW90ZSA9IG5ldyBSZW1vdGVBUEkoKTsKKyAgICAgICAgICAgIGFzc2VydC5kb2VzTm90VGhy b3coZnVuY3Rpb24gKCkgeyByZW1vdGUuY29uZmlndXJlKHtzY2hlbWU6ICdodHRwJywgaG9zdDog J2J1aWxkLndlYmtpdC5vcmcnLCBwb3J0OiA4MH0pOyB9KTsKKyAgICAgICAgICAgIGFzc2VydC5k b2VzTm90VGhyb3coZnVuY3Rpb24gKCkgeyByZW1vdGUuY29uZmlndXJlKHtzY2hlbWU6ICdodHRw cycsIGhvc3Q6ICdidWlsZC53ZWJraXQub3JnJywgcG9ydDogOTk5OX0pOyB9KTsKKyAgICAgICAg ICAgIGFzc2VydC50aHJvd3MoZnVuY3Rpb24gKCkgeyByZW1vdGUuY29uZmlndXJlKHtzY2hlbWU6 ICdmdHAnLCBob3N0OiAnYnVpbGQud2Via2l0Lm9yZycsIHBvcnQ6IDk5OTl9KTsgfSk7CisgICAg ICAgIH0pOworCisgICAgICAgIGl0KCdzaG91bGQgYWNjZXB0IGEgY29uZmlndXJhdGlvbiB3aXRo b3V0IHBvcnQnLCBmdW5jdGlvbiAoKSB7CisgICAgICAgICAgICBsZXQgcmVtb3RlID0gbmV3IFJl bW90ZUFQSSgpOworICAgICAgICAgICAgYXNzZXJ0LmRvZXNOb3RUaHJvdyhmdW5jdGlvbiAoKSB7 IHJlbW90ZS5jb25maWd1cmUoe3NjaGVtZTogJ2h0dHAnLCBob3N0OiAnYnVpbGQud2Via2l0Lm9y Zyd9KTsgfSk7CisgICAgICAgIH0pOworCisgICAgICAgIGl0KCdzaG91bGQgcmVqZWN0IG5vbi1z dHJpbmcgdmFsdWUgZm9yIHNjaGVtZScsIGZ1bmN0aW9uICgpIHsKKyAgICAgICAgICAgIGxldCBy ZW1vdGUgPSBuZXcgUmVtb3RlQVBJKCk7CisgICAgICAgICAgICBhc3NlcnQudGhyb3dzKGZ1bmN0 aW9uICgpIHsgcmVtb3RlLmNvbmZpZ3VyZSh7c2NoZW1lOiAxLCBob3N0OiAnYnVpbGQud2Via2l0 Lm9yZycsIHBvcnQ6IDgwfSk7IH0pOworICAgICAgICAgICAgYXNzZXJ0LnRocm93cyhmdW5jdGlv biAoKSB7IHJlbW90ZS5jb25maWd1cmUoe3NjaGVtZToge30sIGhvc3Q6ICdidWlsZC53ZWJraXQu b3JnJywgcG9ydDogODB9KTsgfSk7CisgICAgICAgICAgICBhc3NlcnQudGhyb3dzKGZ1bmN0aW9u ICgpIHsgcmVtb3RlLmNvbmZpZ3VyZSh7c2NoZW1lOiBbXSwgaG9zdDogJ2J1aWxkLndlYmtpdC5v cmcnLCBwb3J0OiA4MH0pOyB9KTsKKyAgICAgICAgfSk7CisKKyAgICAgICAgaXQoJ3Nob3VsZCBy ZWplY3Qgbm9uLXN0cmluZyB2YWx1ZSBmb3IgaG9zdCcsIGZ1bmN0aW9uICgpIHsKKyAgICAgICAg ICAgIGxldCByZW1vdGUgPSBuZXcgUmVtb3RlQVBJKCk7CisgICAgICAgICAgICBhc3NlcnQudGhy b3dzKGZ1bmN0aW9uICgpIHsgcmVtb3RlLmNvbmZpZ3VyZSh7c2NoZW1lOiAnaHR0cCcsIGhvc3Q6 IDEsIHBvcnQ6IDgwfSk7IH0pOworICAgICAgICAgICAgYXNzZXJ0LnRocm93cyhmdW5jdGlvbiAo KSB7IHJlbW90ZS5jb25maWd1cmUoe3NjaGVtZTogJ2h0dHAnLCBob3N0OiB7fSwgcG9ydDogODB9 KTsgfSk7CisgICAgICAgICAgICBhc3NlcnQudGhyb3dzKGZ1bmN0aW9uICgpIHsgcmVtb3RlLmNv bmZpZ3VyZSh7c2NoZW1lOiAnaHR0cCcsIGhvc3Q6IFtdLCBwb3J0OiA4MH0pOyB9KTsKKyAgICAg ICAgfSk7CisKKyAgICAgICAgaXQoJ3Nob3VsZCByZWplY3Qgbm9uLW9iamVjdCB2YWx1ZSBmb3Ig YXV0aCcsIGZ1bmN0aW9uICgpIHsKKyAgICAgICAgICAgIGxldCByZW1vdGUgPSBuZXcgUmVtb3Rl QVBJKCk7CisgICAgICAgICAgICBhc3NlcnQudGhyb3dzKGZ1bmN0aW9uICgpIHsgcmVtb3RlLmNv bmZpZ3VyZSh7c2NoZW1lOiAnaHR0cCcsIGhvc3Q6ICdidWlsZC53ZWJraXQub3JnJywgcG9ydDog ODAsIGF1dGg6ICdhJ30pOyB9KTsKKyAgICAgICAgICAgIGFzc2VydC50aHJvd3MoZnVuY3Rpb24g KCkgeyByZW1vdGUuY29uZmlndXJlKHtzY2hlbWU6ICdodHRwJywgaG9zdDogJ2J1aWxkLndlYmtp dC5vcmcnLCBwb3J0OiA4MCwgYXV0aDogMX0pOyB9KTsKKyAgICAgICAgfSk7CisKKyAgICAgICAg aXQoJ3Nob3VsZCBhY2NlcHQgYSBjb25maWd1cmF0aW9uIHdpdGggYXV0aCcsIGZ1bmN0aW9uICgp IHsKKyAgICAgICAgICAgIGxldCByZW1vdGUgPSBuZXcgUmVtb3RlQVBJKCk7CisgICAgICAgICAg ICBhc3NlcnQuZG9lc05vdFRocm93KGZ1bmN0aW9uICgpIHsKKyAgICAgICAgICAgICAgICByZW1v dGUuY29uZmlndXJlKHsKKyAgICAgICAgICAgICAgICAgICAgc2NoZW1lOiAnaHR0cCcsCisgICAg ICAgICAgICAgICAgICAgIGhvc3Q6ICdidWlsZC53ZWJraXQub3JnJywKKyAgICAgICAgICAgICAg ICAgICAgcG9ydDogODAsCisgICAgICAgICAgICAgICAgICAgIGF1dGg6IHsKKyAgICAgICAgICAg ICAgICAgICAgICAgICd1c2VybmFtZSc6ICdhJywKKyAgICAgICAgICAgICAgICAgICAgICAgICdw YXNzd29yZCc6ICdiJywKKyAgICAgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB9 KTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9KTsKKworICAgICAgICBpdCgnc2hvdWxkIHJl amVjdCBhdXRoIHdpdGhvdXQgdXNlcm5hbWUgb3IgcGFzc3dvcmQgb3Igd2hlbiBlaXRoZXIgaXMg bm90IGEgc3RyaW5nJywgZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgbGV0IHJlbW90ZSA9IG5l dyBSZW1vdGVBUEkoKTsKKyAgICAgICAgICAgIGFzc2VydC50aHJvd3MoZnVuY3Rpb24gKCkgeyBy ZW1vdGUuY29uZmlndXJlKHtzY2hlbWU6ICdodHRwJywgaG9zdDogJ2J1aWxkLndlYmtpdC5vcmcn LCBwb3J0OiA4MCwgYXV0aDoge319KTsgfSk7CisgICAgICAgICAgICBhc3NlcnQudGhyb3dzKGZ1 bmN0aW9uICgpIHsgcmVtb3RlLmNvbmZpZ3VyZSh7c2NoZW1lOiAnaHR0cCcsIGhvc3Q6ICdidWls ZC53ZWJraXQub3JnJywgcG9ydDogODAsIGF1dGg6IHt1c2VybmFtZTogJ2EnfX0pOyB9KTsKKyAg ICAgICAgICAgIGFzc2VydC50aHJvd3MoZnVuY3Rpb24gKCkgeyByZW1vdGUuY29uZmlndXJlKHtz Y2hlbWU6ICdodHRwJywgaG9zdDogJ2J1aWxkLndlYmtpdC5vcmcnLCBwb3J0OiA4MCwgYXV0aDog e3Bhc3N3b3JkOiAnYid9fSk7IH0pOworICAgICAgICAgICAgYXNzZXJ0LnRocm93cyhmdW5jdGlv biAoKSB7IHJlbW90ZS5jb25maWd1cmUoe3NjaGVtZTogJ2h0dHAnLCBob3N0OiAnYnVpbGQud2Vi a2l0Lm9yZycsIHBvcnQ6IDgwLCBhdXRoOiB7dXNlcm5hbWU6IDEsIHBhc3N3b3JkOiAnYSd9fSk7 IH0pOworICAgICAgICAgICAgYXNzZXJ0LnRocm93cyhmdW5jdGlvbiAoKSB7IHJlbW90ZS5jb25m aWd1cmUoe3NjaGVtZTogJ2h0dHAnLCBob3N0OiAnYnVpbGQud2Via2l0Lm9yZycsIHBvcnQ6IDgw LCBhdXRoOiB7dXNlcm5hbWU6ICdhJywgcGFzc3dvcmQ6IDF9fSk7IH0pOworICAgICAgICB9KTsK KyAgICB9KTsKKworICAgIGRlc2NyaWJlKCd1cmwnLCBmdW5jdGlvbiAoKSB7CisgICAgICAgIGl0 KCdzaG91bGQgYmUgYWJsZSB0byBzZXJpYWxpemUgaHR0cDovL2J1aWxkLndlYmtpdC5vcmcnLCBm dW5jdGlvbiAoKSB7CisgICAgICAgICAgICBsZXQgcmVtb3RlID0gbmV3IFJlbW90ZUFQSSh7c2No ZW1lOiAnaHR0cCcsIGhvc3Q6ICdidWlsZC53ZWJraXQub3JnJywgcG9ydDogODB9KTsKKyAgICAg ICAgICAgIGFzc2VydC5lcXVhbChyZW1vdGUudXJsKCcvanNvbi9idWlsZGVycycpLCAnaHR0cDov L2J1aWxkLndlYmtpdC5vcmcvanNvbi9idWlsZGVycycpOworICAgICAgICB9KTsKKworICAgICAg ICBpdCgnc2hvdWxkIGJlIGFibGUgdG8gc2VyaWFsaXplIGh0dHA6Ly9idWlsZC53ZWJraXQub3Jn IHdoZW4gcG9ydCBpcyBub3Qgc3BlY2lmaWVkJywgZnVuY3Rpb24gKCkgeworICAgICAgICAgICAg bGV0IHJlbW90ZSA9IG5ldyBSZW1vdGVBUEkoe3NjaGVtZTogJ2h0dHAnLCBob3N0OiAnYnVpbGQu d2Via2l0Lm9yZyd9KTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZW1vdGUudXJsKCcvanNv bi9idWlsZGVycycpLCAnaHR0cDovL2J1aWxkLndlYmtpdC5vcmcvanNvbi9idWlsZGVycycpOwor ICAgICAgICB9KTsKKworICAgICAgICBpdCgnc2hvdWxkIGJlIGFibGUgdG8gc2VyaWFsaXplIGh0 dHBzOi8vYnVpbGQud2Via2l0Lm9yZyB3aGVuIHBvcnQgaXMgODAnLCBmdW5jdGlvbiAoKSB7Cisg ICAgICAgICAgICBsZXQgcmVtb3RlID0gbmV3IFJlbW90ZUFQSSh7c2NoZW1lOiAnaHR0cCcsIGhv c3Q6ICdidWlsZC53ZWJraXQub3JnJywgcG9ydDogODB9KTsKKyAgICAgICAgICAgIGFzc2VydC5l cXVhbChyZW1vdGUudXJsKCcvanNvbi9idWlsZGVycycpLCAnaHR0cDovL2J1aWxkLndlYmtpdC5v cmcvanNvbi9idWlsZGVycycpOworICAgICAgICB9KTsKKworICAgICAgICBpdCgnc2hvdWxkIGJl IGFibGUgdG8gc2VyaWFsaXplIGh0dHA6Ly9idWlsZC53ZWJraXQub3JnOjgwODAnLCBmdW5jdGlv biAoKSB7CisgICAgICAgICAgICBsZXQgcmVtb3RlID0gbmV3IFJlbW90ZUFQSSh7c2NoZW1lOiAn aHR0cCcsIGhvc3Q6ICdidWlsZC53ZWJraXQub3JnJywgcG9ydDogODA4MH0pOworICAgICAgICAg ICAgYXNzZXJ0LmVxdWFsKHJlbW90ZS51cmwoJy9qc29uL2J1aWxkZXJzJyksICdodHRwOi8vYnVp bGQud2Via2l0Lm9yZzo4MDgwL2pzb24vYnVpbGRlcnMnKTsKKyAgICAgICAgfSk7CisKKyAgICAg ICAgaXQoJ3Nob3VsZCBiZSBhYmxlIHRvIHNlcmlhbGl6ZSBodHRwczovL2J1aWxkLndlYmtpdC5v cmcgd2hlbiBwb3J0IGlzIG5vdCBzcGVjaWZpZWQnLCBmdW5jdGlvbiAoKSB7CisgICAgICAgICAg ICBsZXQgcmVtb3RlID0gbmV3IFJlbW90ZUFQSSh7c2NoZW1lOiAnaHR0cHMnLCBob3N0OiAnYnVp bGQud2Via2l0Lm9yZyd9KTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZW1vdGUudXJsKCcv anNvbi9idWlsZGVycycpLCAnaHR0cHM6Ly9idWlsZC53ZWJraXQub3JnL2pzb24vYnVpbGRlcnMn KTsKKyAgICAgICAgfSk7CisKKyAgICAgICAgaXQoJ3Nob3VsZCBiZSBhYmxlIHRvIHNlcmlhbGl6 ZSBodHRwczovL2J1aWxkLndlYmtpdC5vcmcgd2hlbiBwb3J0IGlzIDQ0MycsIGZ1bmN0aW9uICgp IHsKKyAgICAgICAgICAgIGxldCByZW1vdGUgPSBuZXcgUmVtb3RlQVBJKHtzY2hlbWU6ICdodHRw cycsIGhvc3Q6ICdidWlsZC53ZWJraXQub3JnJywgcG9ydDogNDQzfSk7CisgICAgICAgICAgICBh c3NlcnQuZXF1YWwocmVtb3RlLnVybCgnL2pzb24vYnVpbGRlcnMnKSwgJ2h0dHBzOi8vYnVpbGQu d2Via2l0Lm9yZy9qc29uL2J1aWxkZXJzJyk7CisgICAgICAgIH0pOworCisgICAgICAgIGl0KCdz aG91bGQgYmUgYWJsZSB0byBzZXJpYWxpemUgaHR0cHM6Ly9idWlsZC53ZWJraXQub3JnOjg0NDMn LCBmdW5jdGlvbiAoKSB7CisgICAgICAgICAgICBsZXQgcmVtb3RlID0gbmV3IFJlbW90ZUFQSSh7 c2NoZW1lOiAnaHR0cHMnLCBob3N0OiAnYnVpbGQud2Via2l0Lm9yZycsIHBvcnQ6IDg0NDN9KTsK KyAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZW1vdGUudXJsKCcvanNvbi9idWlsZGVycycpLCAn aHR0cHM6Ly9idWlsZC53ZWJraXQub3JnOjg0NDMvanNvbi9idWlsZGVycycpOworICAgICAgICB9 KTsKKworICAgICAgICBpdCgnc2hvdWxkIGF1dG9tYXRpY2FsbHkgcHJlZml4IHRoZSBwYXRoIHdp dGggLycsIGZ1bmN0aW9uICgpIHsKKyAgICAgICAgICAgIGxldCByZW1vdGUgPSBuZXcgUmVtb3Rl QVBJKHtzY2hlbWU6ICdodHRwJywgaG9zdDogJ2J1aWxkLndlYmtpdC5vcmcnfSk7CisgICAgICAg ICAgICBhc3NlcnQuZXF1YWwocmVtb3RlLnVybCgnanNvbi9idWlsZGVycycpLCAnaHR0cDovL2J1 aWxkLndlYmtpdC5vcmcvanNvbi9idWlsZGVycycpOworICAgICAgICB9KTsKKyAgICB9KTsKK30p Owo=