129291 2014-02-24 23:28:10 -0800 [GTK] Reduplicate common.top_level_path in scripts 2014-02-26 12:49:19 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mrobinson mrobinson cgarcia gustavo oldest_to_newest 984195 0 mrobinson 2014-02-24 23:28:10 -0800 Duplicating this very simple function prevents us having almost every GTK+ script depend on the jhbuild script and a lot of awkward Python system path manipulation. 984196 1 225123 mrobinson 2014-02-24 23:35:55 -0800 Created attachment 225123 Patch 984199 2 225123 cgarcia 2014-02-24 23:42:19 -0800 Comment on attachment 225123 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225123&action=review > Tools/gtk/check-gdom-symbols:29 > +def top_level_path(*args): > + global top_level_dir > + if not top_level_dir: > + top_level_dir = os.path.join(os.path.dirname(__file__), '..', '..') > + return os.path.join(*(top_level_dir,) + args) Why do we need this here if we are using common? 984203 3 225124 mrobinson 2014-02-24 23:44:29 -0800 Created attachment 225124 Patch 984204 4 mrobinson 2014-02-24 23:45:25 -0800 (In reply to comment #2) > Why do we need this here if we are using common? Whoops! Forgot to save a file before uploading. I've uploaded a new patch. 984855 5 mrobinson 2014-02-26 12:49:19 -0800 Committed r164739: <http://trac.webkit.org/changeset/164739> 225123 2014-02-24 23:35:55 -0800 2014-02-24 23:44:26 -0800 Patch bug-129291-20140224233554.patch text/plain 7083 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NjMyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGExNGQ4ZGUzZjNmNGYzOThjMmE1MTQ0NzVlZmUxNmRj ZmUwZDBhZC4uZTYwMTVhN2U1Nzc2YjUzNjVkY2RhYTVhYmZiOTk5MWM3MDY4OGQ5NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1 IEBACiAyMDE0LTAyLTI0ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4K IAorICAgICAgICBbR1RLXSBSZWR1cGxpY2F0ZSBjb21tb24udG9wX2xldmVsX3BhdGggaW4gc2Ny aXB0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5 MjkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRHVw bGljYXRlIGNvbW1vbi50b3BfbGV2ZWxfcGF0aCBhbmQgYXZvaWQgcG9sbHV0aW5nIG1hbnkgc2Ny aXB0cyB3aXRoIGF3a3dhcmQgc3lzdGVtCisgICAgICAgIHBhdGggbWFuaXB1bGF0aW9uIGFuZCB3 ZWlyZCBkZXBlbmRlbmNpZXMgb24gdGhlIGpoYnVpbGQgaW5mcmFzdHJ1Y3R1cmUuCisKKyAgICAg ICAgKiBTY3JpcHRzL3J1bi1ndGstdGVzdHM6IFVzZSBjb21tb24gYWdhaW4uCisgICAgICAgIChU ZXN0UnVubmVyLl9zZXR1cF90ZXN0aW5nX2Vudmlyb25tZW50KTogRGl0dG8uCisgICAgICAgICog Z3RrL2NoZWNrLWdkb20tc3ltYm9sczogRGl0dG8uCisgICAgICAgICogZ3RrL2NvbW1vbi5weToK KyAgICAgICAgKHRvcF9sZXZlbF9wYXRoKTogUmUtYWRkIHRvcF9sZXZlbF9wYXRoLi4KKyAgICAg ICAgKGdldF9idWlsZF9wYXRoKTogVXNlIHRoZSBidWlsdGluIHRvcF9sZXZlbF9wYXRoIGFnYWlu LgorICAgICAgICAqIGd0ay9maW5kLW1ha2UtZGlzdC1lcnJvcnM6IFVzZSBjb21tb24gYWdhaW4u CisgICAgICAgIChnZXRfbWlzc2luZ19oZWFkZXJzKTogRGl0dG8uCisgICAgICAgICogZ3RrL2dl bmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3QucHk6IERpdHRvLgorCisyMDE0LTAy LTI0ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKwogICAgICAgICBb R1RLXSBnZW5lcmF0ZS1ndGtkb2Mgc2hvdWxkIG5vdCBnZW5lcmF0ZSBkb2N1bWVudGF0aW9uIGZv ciBzb3VyY2UgZmlsZXMgZm9yIHVuYnVpbHQgc291cmNlIGZpbGVzCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg0MTcKIApkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzCmlu ZGV4IDUwODg0NDdhNGVmMWM4ODMwMDY4MDBhNDgzNjIwNThiNzI3MDJiYWYuLmU5ODA4NjAzOWIy ZWExMGU0NjI1NTk0NDBjMzQ4YmVmYzQ4NjU3MzAgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv cnVuLWd0ay10ZXN0cworKysgYi9Ub29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMKQEAgLTMxLDkg KzMxLDYgQEAgc3lzLnBhdGguYXBwZW5kKG9zLnBhdGguam9pbih0b3BfbGV2ZWxfZGlyZWN0b3J5 LCAiVG9vbHMiLCAiZ3RrIikpCiBpbXBvcnQgY29tbW9uCiBpbXBvcnQgamhidWlsZHV0aWxzCiAK LXN5cy5wYXRoLmluc2VydCgwLCBvcy5wYXRoLmpvaW4ob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9f KSwgIi4uL2poYnVpbGQiKSkKLWltcG9ydCBqaGJ1aWxkcmNfY29tbW9uIAotCiBjbGFzcyBTa2lw cGVkVGVzdDoKICAgICBFTlRJUkVfU1VJVEUgPSBOb25lCiAKQEAgLTE5OCw3ICsxOTUsNyBAQCBj bGFzcyBUZXN0UnVubmVyOgogICAgIGRlZiBfc2V0dXBfdGVzdGluZ19lbnZpcm9ubWVudChzZWxm KToKICAgICAgICAgc2VsZi5fdGVzdF9lbnYgPSBvcy5lbnZpcm9uCiAgICAgICAgIHNlbGYuX3Rl c3RfZW52WydHU0VUVElOR1NfQkFDS0VORCddID0gJ21lbW9yeScKLSAgICAgICAgc2VsZi5fdGVz dF9lbnZbIlRFU1RfV0VCS0lUX0FQSV9XRUJLSVQyX1JFU09VUkNFU19QQVRIIl0gPSBqaGJ1aWxk cmNfY29tbW9uLnRvcF9sZXZlbF9wYXRoKCJUb29scyIsICJUZXN0V2ViS2l0QVBJIiwgIlRlc3Rz IiwgIldlYktpdDIiKQorICAgICAgICBzZWxmLl90ZXN0X2VudlsiVEVTVF9XRUJLSVRfQVBJX1dF QktJVDJfUkVTT1VSQ0VTX1BBVEgiXSA9IGNvbW1vbi50b3BfbGV2ZWxfcGF0aCgiVG9vbHMiLCAi VGVzdFdlYktpdEFQSSIsICJUZXN0cyIsICJXZWJLaXQyIikKICAgICAgICAgc2VsZi5fdGVzdF9l bnZbIlRFU1RfV0VCS0lUX0FQSV9XRUJLSVQyX0lOSkVDVEVEX0JVTkRMRV9QQVRIIl0gPSBjb21t b24udGVzdHNfbGlicmFyeV9idWlsZF9wYXRoKCkKICAgICAgICAgc2VsZi5fdGVzdF9lbnZbIldF QktJVF9FWEVDX1BBVEgiXSA9IHNlbGYuX3Byb2dyYW1zX3BhdGgKIApkaWZmIC0tZ2l0IGEvVG9v bHMvZ3RrL2NoZWNrLWdkb20tc3ltYm9scyBiL1Rvb2xzL2d0ay9jaGVjay1nZG9tLXN5bWJvbHMK aW5kZXggNTg4YjdlODNlNzI5MDc5YWE0MjI5ZGUxMDZlY2IzOTFiNTlmYmNhZS4uZjI0M2FiNTM5 MWViOTRjNWQzOTkzM2U3NDE3OTUxZGE4OWZlMWI3OSAxMDA3NTUKLS0tIGEvVG9vbHMvZ3RrL2No ZWNrLWdkb20tc3ltYm9scworKysgYi9Ub29scy9ndGsvY2hlY2stZ2RvbS1zeW1ib2xzCkBAIC0y Miw4ICsyMiwxMiBAQCBpbXBvcnQgc3VicHJvY2VzcwogaW1wb3J0IHN5cwogaW1wb3J0IHRlbXBm aWxlCiAKLXN5cy5wYXRoLmluc2VydCgwLCBvcy5wYXRoLmpvaW4ob3MucGF0aC5kaXJuYW1lKF9f ZmlsZV9fKSwgIi4uL2poYnVpbGQiKSkKLWltcG9ydCBqaGJ1aWxkcmNfY29tbW9uIAorZGVmIHRv cF9sZXZlbF9wYXRoKCphcmdzKToKKyAgICBnbG9iYWwgdG9wX2xldmVsX2RpcgorICAgIGlmIG5v dCB0b3BfbGV2ZWxfZGlyOgorICAgICAgICB0b3BfbGV2ZWxfZGlyID0gb3MucGF0aC5qb2luKG9z LnBhdGguZGlybmFtZShfX2ZpbGVfXyksICcuLicsICcuLicpCisgICAgcmV0dXJuIG9zLnBhdGgu am9pbigqKHRvcF9sZXZlbF9kaXIsKSArIGFyZ3MpCisKIAogZGVmIHNob3VsZF91cGRhdGVfc3lt Ym9sc19maWxlKG5ldywgb2xkKToKICAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMob2xkKToKQEAg LTUyLDcgKzU2LDcgQEAgaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICAgICAgICAgICAg ICB0bXAud3JpdGUoZmlsZV9oYW5kbGUucmVhZCgpKQogICAgICAgICB0bXAuZmx1c2goKQogCi0g ICAgICAgIGdkb21fc291cmNlX3BhdGggPSBqaGJ1aWxkcmNfY29tbW9uLnRvcF9sZXZlbF9wYXRo KCdTb3VyY2UnLCAnV2ViQ29yZScsICdiaW5kaW5ncycpCisgICAgICAgIGdkb21fc291cmNlX3Bh dGggPSBjb21tb24udG9wX2xldmVsX3BhdGgoJ1NvdXJjZScsICdXZWJDb3JlJywgJ2JpbmRpbmdz JykKICAgICAgICAgYXBpX2JyZWFrX3Rlc3RfcGF0aCA9IG9zLnBhdGguam9pbihnZG9tX3NvdXJj ZV9wYXRoLCAnc2NyaXB0cycsICdnb2JqZWN0LXJ1bi1hcGktYnJlYWstdGVzdCcpCiAgICAgICAg IHN1YnByb2Nlc3MuY2FsbChbc3lzLmV4ZWN1dGFibGUsIGFwaV9icmVha190ZXN0X3BhdGgsIG9z LnBhdGguam9pbihnZG9tX3NvdXJjZV9wYXRoLCAnZ29iamVjdCcsICAnd2Via2l0ZG9tLnN5bWJv bHMnKSwgdG1wLm5hbWVdKQogCmRpZmYgLS1naXQgYS9Ub29scy9ndGsvY29tbW9uLnB5IGIvVG9v bHMvZ3RrL2NvbW1vbi5weQppbmRleCA2ZTUxYWY1OWI5NDY5ZDNmOWEwMDMxMTAzMmIwNTU3Yzlj NTYxZDBmLi43NTgzYTk2M2VmMTQ2NTUwOWNkM2QyZjQxZGI4NWE1ZjA0NzgyNzFhIDEwMDY0NAot LS0gYS9Ub29scy9ndGsvY29tbW9uLnB5CisrKyBiL1Rvb2xzL2d0ay9jb21tb24ucHkKQEAgLTIx LDkgKzIxLDYgQEAgaW1wb3J0IHNlbGVjdAogaW1wb3J0IHN1YnByb2Nlc3MKIGltcG9ydCBzeXMK IAotc3lzLnBhdGguaW5zZXJ0KDAsIG9zLnBhdGguam9pbihvcy5wYXRoLmRpcm5hbWUoX19maWxl X18pLCAiLi4vamhidWlsZCIpKQotaW1wb3J0IGpoYnVpbGRyY19jb21tb24KLQogYnVpbGRfZGly ID0gTm9uZQogbGlicmFyeV9idWlsZF9kaXIgPSBOb25lCiB0ZXN0c19saWJyYXJ5X2J1aWxkX2Rp ciA9IE5vbmUKQEAgLTMxLDYgKzI4LDEzIEBAIGlzX2NtYWtlID0gTm9uZQogYnVpbGRfdHlwZXMg PSAoJ1JlbGVhc2UnLCAnRGVidWcnKQogCiAKK2RlZiB0b3BfbGV2ZWxfcGF0aCgqYXJncyk6Cisg ICAgZ2xvYmFsIHRvcF9sZXZlbF9kaXIKKyAgICBpZiBub3QgdG9wX2xldmVsX2RpcjoKKyAgICAg ICAgdG9wX2xldmVsX2RpciA9IG9zLnBhdGguam9pbihvcy5wYXRoLmRpcm5hbWUoX19maWxlX18p LCAnLi4nLCAnLi4nKQorICAgIHJldHVybiBvcy5wYXRoLmpvaW4oKih0b3BfbGV2ZWxfZGlyLCkg KyBhcmdzKQorCisKIGRlZiBzZXRfYnVpbGRfdHlwZXMobmV3X2J1aWxkX3R5cGVzKToKICAgICBn bG9iYWwgYnVpbGRfdHlwZXMKICAgICBidWlsZF90eXBlcyA9IG5ld19idWlsZF90eXBlcwpAQCAt MTAwLDIwICsxMDQsMjAgQEAgZGVmIGdldF9idWlsZF9wYXRoKGZhdGFsPVRydWUpOgogCiAgICAg Z2xvYmFsIGJ1aWxkX3R5cGVzCiAgICAgZm9yIGJ1aWxkX3R5cGUgaW4gYnVpbGRfdHlwZXM6Ci0g ICAgICAgIGJ1aWxkX2RpciA9IGpoYnVpbGRyY19jb21tb24udG9wX2xldmVsX3BhdGgoJ1dlYktp dEJ1aWxkJywgYnVpbGRfdHlwZSkKKyAgICAgICAgYnVpbGRfZGlyID0gdG9wX2xldmVsX3BhdGgo J1dlYktpdEJ1aWxkJywgYnVpbGRfdHlwZSkKICAgICAgICAgaWYgaXNfdmFsaWRfYnVpbGRfZGly ZWN0b3J5KGJ1aWxkX2Rpcik6CiAgICAgICAgICAgICByZXR1cm4gYnVpbGRfZGlyCiAKICAgICAj IGRpc3RjaGVjayBidWlsZHMgaW4gYSBkaXJlY3RvcnkgbmFtZWQgX2J1aWxkIGluIHRoZSB0b3At bGV2ZWwgcGF0aC4KLSAgICBidWlsZF9kaXIgPSBqaGJ1aWxkcmNfY29tbW9uLnRvcF9sZXZlbF9w YXRoKCJfYnVpbGQiKQorICAgIGJ1aWxkX2RpciA9IHRvcF9sZXZlbF9wYXRoKCJfYnVpbGQiKQog ICAgIGlmIGlzX3ZhbGlkX2J1aWxkX2RpcmVjdG9yeShidWlsZF9kaXIpOgogICAgICAgICByZXR1 cm4gYnVpbGRfZGlyCiAKLSAgICBidWlsZF9kaXIgPSBqaGJ1aWxkcmNfY29tbW9uLnRvcF9sZXZl bF9wYXRoKCkKKyAgICBidWlsZF9kaXIgPSB0b3BfbGV2ZWxfcGF0aCgpCiAgICAgaWYgaXNfdmFs aWRfYnVpbGRfZGlyZWN0b3J5KGJ1aWxkX2Rpcik6CiAgICAgICAgIHJldHVybiBidWlsZF9kaXIK IAotICAgIGJ1aWxkX2RpciA9IGpoYnVpbGRyY19jb21tb24udG9wX2xldmVsX3BhdGgoIldlYktp dEJ1aWxkIikKKyAgICBidWlsZF9kaXIgPSB0b3BfbGV2ZWxfcGF0aCgiV2ViS2l0QnVpbGQiKQog ICAgIGlmIGlzX3ZhbGlkX2J1aWxkX2RpcmVjdG9yeShidWlsZF9kaXIpOgogICAgICAgICByZXR1 cm4gYnVpbGRfZGlyCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL2d0ay9maW5kLW1ha2UtZGlzdC1lcnJv cnMgYi9Ub29scy9ndGsvZmluZC1tYWtlLWRpc3QtZXJyb3JzCmluZGV4IGEwYzQxNTBjYWIzZjUw MmU2ZDI3ZGRiMThiNDI3ZWQ0NGY2ZThlYWMuLjg4MGM3ODBhNTEzNDg2YzRkZDA3OTc2NzAyMDFh ZDgwYTc5NDc2N2YgMTAwNzU1Ci0tLSBhL1Rvb2xzL2d0ay9maW5kLW1ha2UtZGlzdC1lcnJvcnMK KysrIGIvVG9vbHMvZ3RrL2ZpbmQtbWFrZS1kaXN0LWVycm9ycwpAQCAtMjAsOSArMjAsNiBAQCBp bXBvcnQgb3MKIGltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc3lzCiAKLXN5cy5wYXRoLmluc2Vy dCgwLCBvcy5wYXRoLmpvaW4ob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKSwgIi4uL2poYnVpbGQi KSkKLWltcG9ydCBqaGJ1aWxkcmNfY29tbW9uIAotCiBkZWYgaXNfc291cmNlX2ZpbGVfbGlzdGlu ZyhsaW5lKToKICAgICByZXR1cm4gbGluZS5zdHJpcCgpLnN0YXJ0c3dpdGgoJ1NvdXJjZScpCiAK QEAgLTg5LDcgKzg2LDcgQEAgZGVmIGdldF91bmxpc3RlZF9oZWFkZXJzKGxpc3RlZF9tYWtlZmls ZV9oZWFkZXJzKToKIGRlZiBnZXRfbWlzc2luZ19oZWFkZXJzKGxpc3RlZF9tYWtlZmlsZV9oZWFk ZXJzKToKICAgICBtaXNzaW5nID0gc2V0KCkKICAgICBmb3IgaGVhZGVyIGluIGxpc3RlZF9tYWtl ZmlsZV9oZWFkZXJzOgotICAgICAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoamhidWlsZHJjX2Nv bW1vbi50b3BfbGV2ZWxfcGF0aChoZWFkZXIpKToKKyAgICAgICAgaWYgbm90IG9zLnBhdGguZXhp c3RzKGNvbW1vbi50b3BfbGV2ZWxfcGF0aChoZWFkZXIpKToKICAgICAgICAgICAgIG1pc3Npbmcu YWRkKGhlYWRlcikKICAgICByZXR1cm4gbWlzc2luZwogCmRpZmYgLS1naXQgYS9Ub29scy9ndGsv Z2VuZXJhdGUtaW5zcGVjdG9yLWdyZXNvdXJjZS1tYW5pZmVzdC5weSBiL1Rvb2xzL2d0ay9nZW5l cmF0ZS1pbnNwZWN0b3ItZ3Jlc291cmNlLW1hbmlmZXN0LnB5CmluZGV4IDg1ODAzMzc4ZGU5MzA4 MzQzNWRlZDg3OWE5OTdlYzAxYWMyNzQ5MDUuLmFkZjRmNTI3MjJjOTcwMDUxM2FiY2ZiYmY4MDY5 MDkwZjFlYjAzYTcgMTAwNzU1Ci0tLSBhL1Rvb2xzL2d0ay9nZW5lcmF0ZS1pbnNwZWN0b3ItZ3Jl c291cmNlLW1hbmlmZXN0LnB5CisrKyBiL1Rvb2xzL2d0ay9nZW5lcmF0ZS1pbnNwZWN0b3ItZ3Jl c291cmNlLW1hbmlmZXN0LnB5CkBAIC0yMCwxMCArMjAsNyBAQCBpbXBvcnQgZ2xvYgogaW1wb3J0 IG9zCiBpbXBvcnQgc3lzCiAKLXN5cy5wYXRoLmluc2VydCgwLCBvcy5wYXRoLmpvaW4ob3MucGF0 aC5kaXJuYW1lKF9fZmlsZV9fKSwgIi4uL2poYnVpbGQiKSkKLWltcG9ydCBqaGJ1aWxkcmNfY29t bW9uCi0KLXJlc291cmNlc19wYXRoID0gamhidWlsZHJjX2NvbW1vbi50b3BfbGV2ZWxfcGF0aCgp ICsgIi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvIgorcmVzb3VyY2VzX3BhdGggPSBjb21tb24udG9w X2xldmVsX3BhdGgoKSArICIvU291cmNlL1dlYkluc3BlY3RvclVJLyIKIGluc3BlY3Rvcl9maWxl cyA9IFwKICAgICBnbG9iLmdsb2IocmVzb3VyY2VzX3BhdGggKyAnVXNlckludGVyZmFjZS8qLmh0 bWwnKSArIFwKICAgICBnbG9iLmdsb2IocmVzb3VyY2VzX3BhdGggKyAnVXNlckludGVyZmFjZS9C YXNlLyouanMnKSArIFwK 225124 2014-02-24 23:44:29 -0800 2014-02-24 23:53:24 -0800 Patch bug-129291-20140224234428.patch text/plain 6893 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NjMyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGExNGQ4ZGUzZjNmNGYzOThjMmE1MTQ0NzVlZmUxNmRj ZmUwZDBhZC4uZTYwMTVhN2U1Nzc2YjUzNjVkY2RhYTVhYmZiOTk5MWM3MDY4OGQ5NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1 IEBACiAyMDE0LTAyLTI0ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4K IAorICAgICAgICBbR1RLXSBSZWR1cGxpY2F0ZSBjb21tb24udG9wX2xldmVsX3BhdGggaW4gc2Ny aXB0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5 MjkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRHVw bGljYXRlIGNvbW1vbi50b3BfbGV2ZWxfcGF0aCBhbmQgYXZvaWQgcG9sbHV0aW5nIG1hbnkgc2Ny aXB0cyB3aXRoIGF3a3dhcmQgc3lzdGVtCisgICAgICAgIHBhdGggbWFuaXB1bGF0aW9uIGFuZCB3 ZWlyZCBkZXBlbmRlbmNpZXMgb24gdGhlIGpoYnVpbGQgaW5mcmFzdHJ1Y3R1cmUuCisKKyAgICAg ICAgKiBTY3JpcHRzL3J1bi1ndGstdGVzdHM6IFVzZSBjb21tb24gYWdhaW4uCisgICAgICAgIChU ZXN0UnVubmVyLl9zZXR1cF90ZXN0aW5nX2Vudmlyb25tZW50KTogRGl0dG8uCisgICAgICAgICog Z3RrL2NoZWNrLWdkb20tc3ltYm9sczogRGl0dG8uCisgICAgICAgICogZ3RrL2NvbW1vbi5weToK KyAgICAgICAgKHRvcF9sZXZlbF9wYXRoKTogUmUtYWRkIHRvcF9sZXZlbF9wYXRoLi4KKyAgICAg ICAgKGdldF9idWlsZF9wYXRoKTogVXNlIHRoZSBidWlsdGluIHRvcF9sZXZlbF9wYXRoIGFnYWlu LgorICAgICAgICAqIGd0ay9maW5kLW1ha2UtZGlzdC1lcnJvcnM6IFVzZSBjb21tb24gYWdhaW4u CisgICAgICAgIChnZXRfbWlzc2luZ19oZWFkZXJzKTogRGl0dG8uCisgICAgICAgICogZ3RrL2dl bmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3QucHk6IERpdHRvLgorCisyMDE0LTAy LTI0ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKwogICAgICAgICBb R1RLXSBnZW5lcmF0ZS1ndGtkb2Mgc2hvdWxkIG5vdCBnZW5lcmF0ZSBkb2N1bWVudGF0aW9uIGZv ciBzb3VyY2UgZmlsZXMgZm9yIHVuYnVpbHQgc291cmNlIGZpbGVzCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg0MTcKIApkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzCmlu ZGV4IDUwODg0NDdhNGVmMWM4ODMwMDY4MDBhNDgzNjIwNThiNzI3MDJiYWYuLmU5ODA4NjAzOWIy ZWExMGU0NjI1NTk0NDBjMzQ4YmVmYzQ4NjU3MzAgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv cnVuLWd0ay10ZXN0cworKysgYi9Ub29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMKQEAgLTMxLDkg KzMxLDYgQEAgc3lzLnBhdGguYXBwZW5kKG9zLnBhdGguam9pbih0b3BfbGV2ZWxfZGlyZWN0b3J5 LCAiVG9vbHMiLCAiZ3RrIikpCiBpbXBvcnQgY29tbW9uCiBpbXBvcnQgamhidWlsZHV0aWxzCiAK LXN5cy5wYXRoLmluc2VydCgwLCBvcy5wYXRoLmpvaW4ob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9f KSwgIi4uL2poYnVpbGQiKSkKLWltcG9ydCBqaGJ1aWxkcmNfY29tbW9uIAotCiBjbGFzcyBTa2lw cGVkVGVzdDoKICAgICBFTlRJUkVfU1VJVEUgPSBOb25lCiAKQEAgLTE5OCw3ICsxOTUsNyBAQCBj bGFzcyBUZXN0UnVubmVyOgogICAgIGRlZiBfc2V0dXBfdGVzdGluZ19lbnZpcm9ubWVudChzZWxm KToKICAgICAgICAgc2VsZi5fdGVzdF9lbnYgPSBvcy5lbnZpcm9uCiAgICAgICAgIHNlbGYuX3Rl c3RfZW52WydHU0VUVElOR1NfQkFDS0VORCddID0gJ21lbW9yeScKLSAgICAgICAgc2VsZi5fdGVz dF9lbnZbIlRFU1RfV0VCS0lUX0FQSV9XRUJLSVQyX1JFU09VUkNFU19QQVRIIl0gPSBqaGJ1aWxk cmNfY29tbW9uLnRvcF9sZXZlbF9wYXRoKCJUb29scyIsICJUZXN0V2ViS2l0QVBJIiwgIlRlc3Rz IiwgIldlYktpdDIiKQorICAgICAgICBzZWxmLl90ZXN0X2VudlsiVEVTVF9XRUJLSVRfQVBJX1dF QktJVDJfUkVTT1VSQ0VTX1BBVEgiXSA9IGNvbW1vbi50b3BfbGV2ZWxfcGF0aCgiVG9vbHMiLCAi VGVzdFdlYktpdEFQSSIsICJUZXN0cyIsICJXZWJLaXQyIikKICAgICAgICAgc2VsZi5fdGVzdF9l bnZbIlRFU1RfV0VCS0lUX0FQSV9XRUJLSVQyX0lOSkVDVEVEX0JVTkRMRV9QQVRIIl0gPSBjb21t b24udGVzdHNfbGlicmFyeV9idWlsZF9wYXRoKCkKICAgICAgICAgc2VsZi5fdGVzdF9lbnZbIldF QktJVF9FWEVDX1BBVEgiXSA9IHNlbGYuX3Byb2dyYW1zX3BhdGgKIApkaWZmIC0tZ2l0IGEvVG9v bHMvZ3RrL2NoZWNrLWdkb20tc3ltYm9scyBiL1Rvb2xzL2d0ay9jaGVjay1nZG9tLXN5bWJvbHMK aW5kZXggNTg4YjdlODNlNzI5MDc5YWE0MjI5ZGUxMDZlY2IzOTFiNTlmYmNhZS4uYmYzNWMyMTNk MGM1ZWM5MDMxZTEzOGJiZTA1ZWUyOTU1ZjljN2I4ZSAxMDA3NTUKLS0tIGEvVG9vbHMvZ3RrL2No ZWNrLWdkb20tc3ltYm9scworKysgYi9Ub29scy9ndGsvY2hlY2stZ2RvbS1zeW1ib2xzCkBAIC0y Miw5ICsyMiw2IEBAIGltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc3lzCiBpbXBvcnQgdGVtcGZp bGUKIAotc3lzLnBhdGguaW5zZXJ0KDAsIG9zLnBhdGguam9pbihvcy5wYXRoLmRpcm5hbWUoX19m aWxlX18pLCAiLi4vamhidWlsZCIpKQotaW1wb3J0IGpoYnVpbGRyY19jb21tb24gCi0KIGRlZiBz aG91bGRfdXBkYXRlX3N5bWJvbHNfZmlsZShuZXcsIG9sZCk6CiAgICAgaWYgbm90IG9zLnBhdGgu ZXhpc3RzKG9sZCk6CiAgICAgICAgIHJldHVybiBGYWxzZQpAQCAtNTIsNyArNDksNyBAQCBpZiBf X25hbWVfXyA9PSAnX19tYWluX18nOgogICAgICAgICAgICAgICAgIHRtcC53cml0ZShmaWxlX2hh bmRsZS5yZWFkKCkpCiAgICAgICAgIHRtcC5mbHVzaCgpCiAKLSAgICAgICAgZ2RvbV9zb3VyY2Vf cGF0aCA9IGpoYnVpbGRyY19jb21tb24udG9wX2xldmVsX3BhdGgoJ1NvdXJjZScsICdXZWJDb3Jl JywgJ2JpbmRpbmdzJykKKyAgICAgICAgZ2RvbV9zb3VyY2VfcGF0aCA9IGNvbW1vbi50b3BfbGV2 ZWxfcGF0aCgnU291cmNlJywgJ1dlYkNvcmUnLCAnYmluZGluZ3MnKQogICAgICAgICBhcGlfYnJl YWtfdGVzdF9wYXRoID0gb3MucGF0aC5qb2luKGdkb21fc291cmNlX3BhdGgsICdzY3JpcHRzJywg J2dvYmplY3QtcnVuLWFwaS1icmVhay10ZXN0JykKICAgICAgICAgc3VicHJvY2Vzcy5jYWxsKFtz eXMuZXhlY3V0YWJsZSwgYXBpX2JyZWFrX3Rlc3RfcGF0aCwgb3MucGF0aC5qb2luKGdkb21fc291 cmNlX3BhdGgsICdnb2JqZWN0JywgICd3ZWJraXRkb20uc3ltYm9scycpLCB0bXAubmFtZV0pCiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL2d0ay9jb21tb24ucHkgYi9Ub29scy9ndGsvY29tbW9uLnB5Cmlu ZGV4IDZlNTFhZjU5Yjk0NjlkM2Y5YTAwMzExMDMyYjA1NTdjOWM1NjFkMGYuLjc1ODNhOTYzZWYx NDY1NTA5Y2QzZDJmNDFkYjg1YTVmMDQ3ODI3MWEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2d0ay9jb21t b24ucHkKKysrIGIvVG9vbHMvZ3RrL2NvbW1vbi5weQpAQCAtMjEsOSArMjEsNiBAQCBpbXBvcnQg c2VsZWN0CiBpbXBvcnQgc3VicHJvY2VzcwogaW1wb3J0IHN5cwogCi1zeXMucGF0aC5pbnNlcnQo MCwgb3MucGF0aC5qb2luKG9zLnBhdGguZGlybmFtZShfX2ZpbGVfXyksICIuLi9qaGJ1aWxkIikp Ci1pbXBvcnQgamhidWlsZHJjX2NvbW1vbgotCiBidWlsZF9kaXIgPSBOb25lCiBsaWJyYXJ5X2J1 aWxkX2RpciA9IE5vbmUKIHRlc3RzX2xpYnJhcnlfYnVpbGRfZGlyID0gTm9uZQpAQCAtMzEsNiAr MjgsMTMgQEAgaXNfY21ha2UgPSBOb25lCiBidWlsZF90eXBlcyA9ICgnUmVsZWFzZScsICdEZWJ1 ZycpCiAKIAorZGVmIHRvcF9sZXZlbF9wYXRoKCphcmdzKToKKyAgICBnbG9iYWwgdG9wX2xldmVs X2RpcgorICAgIGlmIG5vdCB0b3BfbGV2ZWxfZGlyOgorICAgICAgICB0b3BfbGV2ZWxfZGlyID0g b3MucGF0aC5qb2luKG9zLnBhdGguZGlybmFtZShfX2ZpbGVfXyksICcuLicsICcuLicpCisgICAg cmV0dXJuIG9zLnBhdGguam9pbigqKHRvcF9sZXZlbF9kaXIsKSArIGFyZ3MpCisKKwogZGVmIHNl dF9idWlsZF90eXBlcyhuZXdfYnVpbGRfdHlwZXMpOgogICAgIGdsb2JhbCBidWlsZF90eXBlcwog ICAgIGJ1aWxkX3R5cGVzID0gbmV3X2J1aWxkX3R5cGVzCkBAIC0xMDAsMjAgKzEwNCwyMCBAQCBk ZWYgZ2V0X2J1aWxkX3BhdGgoZmF0YWw9VHJ1ZSk6CiAKICAgICBnbG9iYWwgYnVpbGRfdHlwZXMK ICAgICBmb3IgYnVpbGRfdHlwZSBpbiBidWlsZF90eXBlczoKLSAgICAgICAgYnVpbGRfZGlyID0g amhidWlsZHJjX2NvbW1vbi50b3BfbGV2ZWxfcGF0aCgnV2ViS2l0QnVpbGQnLCBidWlsZF90eXBl KQorICAgICAgICBidWlsZF9kaXIgPSB0b3BfbGV2ZWxfcGF0aCgnV2ViS2l0QnVpbGQnLCBidWls ZF90eXBlKQogICAgICAgICBpZiBpc192YWxpZF9idWlsZF9kaXJlY3RvcnkoYnVpbGRfZGlyKToK ICAgICAgICAgICAgIHJldHVybiBidWlsZF9kaXIKIAogICAgICMgZGlzdGNoZWNrIGJ1aWxkcyBp biBhIGRpcmVjdG9yeSBuYW1lZCBfYnVpbGQgaW4gdGhlIHRvcC1sZXZlbCBwYXRoLgotICAgIGJ1 aWxkX2RpciA9IGpoYnVpbGRyY19jb21tb24udG9wX2xldmVsX3BhdGgoIl9idWlsZCIpCisgICAg YnVpbGRfZGlyID0gdG9wX2xldmVsX3BhdGgoIl9idWlsZCIpCiAgICAgaWYgaXNfdmFsaWRfYnVp bGRfZGlyZWN0b3J5KGJ1aWxkX2Rpcik6CiAgICAgICAgIHJldHVybiBidWlsZF9kaXIKIAotICAg IGJ1aWxkX2RpciA9IGpoYnVpbGRyY19jb21tb24udG9wX2xldmVsX3BhdGgoKQorICAgIGJ1aWxk X2RpciA9IHRvcF9sZXZlbF9wYXRoKCkKICAgICBpZiBpc192YWxpZF9idWlsZF9kaXJlY3Rvcnko YnVpbGRfZGlyKToKICAgICAgICAgcmV0dXJuIGJ1aWxkX2RpcgogCi0gICAgYnVpbGRfZGlyID0g amhidWlsZHJjX2NvbW1vbi50b3BfbGV2ZWxfcGF0aCgiV2ViS2l0QnVpbGQiKQorICAgIGJ1aWxk X2RpciA9IHRvcF9sZXZlbF9wYXRoKCJXZWJLaXRCdWlsZCIpCiAgICAgaWYgaXNfdmFsaWRfYnVp bGRfZGlyZWN0b3J5KGJ1aWxkX2Rpcik6CiAgICAgICAgIHJldHVybiBidWlsZF9kaXIKIApkaWZm IC0tZ2l0IGEvVG9vbHMvZ3RrL2ZpbmQtbWFrZS1kaXN0LWVycm9ycyBiL1Rvb2xzL2d0ay9maW5k LW1ha2UtZGlzdC1lcnJvcnMKaW5kZXggYTBjNDE1MGNhYjNmNTAyZTZkMjdkZGIxOGI0MjdlZDQ0 ZjZlOGVhYy4uODgwYzc4MGE1MTM0ODZjNGRkMDc5NzY3MDIwMWFkODBhNzk0NzY3ZiAxMDA3NTUK LS0tIGEvVG9vbHMvZ3RrL2ZpbmQtbWFrZS1kaXN0LWVycm9ycworKysgYi9Ub29scy9ndGsvZmlu ZC1tYWtlLWRpc3QtZXJyb3JzCkBAIC0yMCw5ICsyMCw2IEBAIGltcG9ydCBvcwogaW1wb3J0IHN1 YnByb2Nlc3MKIGltcG9ydCBzeXMKIAotc3lzLnBhdGguaW5zZXJ0KDAsIG9zLnBhdGguam9pbihv cy5wYXRoLmRpcm5hbWUoX19maWxlX18pLCAiLi4vamhidWlsZCIpKQotaW1wb3J0IGpoYnVpbGRy Y19jb21tb24gCi0KIGRlZiBpc19zb3VyY2VfZmlsZV9saXN0aW5nKGxpbmUpOgogICAgIHJldHVy biBsaW5lLnN0cmlwKCkuc3RhcnRzd2l0aCgnU291cmNlJykKIApAQCAtODksNyArODYsNyBAQCBk ZWYgZ2V0X3VubGlzdGVkX2hlYWRlcnMobGlzdGVkX21ha2VmaWxlX2hlYWRlcnMpOgogZGVmIGdl dF9taXNzaW5nX2hlYWRlcnMobGlzdGVkX21ha2VmaWxlX2hlYWRlcnMpOgogICAgIG1pc3Npbmcg PSBzZXQoKQogICAgIGZvciBoZWFkZXIgaW4gbGlzdGVkX21ha2VmaWxlX2hlYWRlcnM6Ci0gICAg ICAgIGlmIG5vdCBvcy5wYXRoLmV4aXN0cyhqaGJ1aWxkcmNfY29tbW9uLnRvcF9sZXZlbF9wYXRo KGhlYWRlcikpOgorICAgICAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoY29tbW9uLnRvcF9sZXZl bF9wYXRoKGhlYWRlcikpOgogICAgICAgICAgICAgbWlzc2luZy5hZGQoaGVhZGVyKQogICAgIHJl dHVybiBtaXNzaW5nCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL2d0ay9nZW5lcmF0ZS1pbnNwZWN0b3It Z3Jlc291cmNlLW1hbmlmZXN0LnB5IGIvVG9vbHMvZ3RrL2dlbmVyYXRlLWluc3BlY3Rvci1ncmVz b3VyY2UtbWFuaWZlc3QucHkKaW5kZXggODU4MDMzNzhkZTkzMDgzNDM1ZGVkODc5YTk5N2VjMDFh YzI3NDkwNS4uYWRmNGY1MjcyMmM5NzAwNTEzYWJjZmJiZjgwNjkwOTBmMWViMDNhNyAxMDA3NTUK LS0tIGEvVG9vbHMvZ3RrL2dlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3QucHkK KysrIGIvVG9vbHMvZ3RrL2dlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3QucHkK QEAgLTIwLDEwICsyMCw3IEBAIGltcG9ydCBnbG9iCiBpbXBvcnQgb3MKIGltcG9ydCBzeXMKIAot c3lzLnBhdGguaW5zZXJ0KDAsIG9zLnBhdGguam9pbihvcy5wYXRoLmRpcm5hbWUoX19maWxlX18p LCAiLi4vamhidWlsZCIpKQotaW1wb3J0IGpoYnVpbGRyY19jb21tb24KLQotcmVzb3VyY2VzX3Bh dGggPSBqaGJ1aWxkcmNfY29tbW9uLnRvcF9sZXZlbF9wYXRoKCkgKyAiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS8iCityZXNvdXJjZXNfcGF0aCA9IGNvbW1vbi50b3BfbGV2ZWxfcGF0aCgpICsgIi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvIgogaW5zcGVjdG9yX2ZpbGVzID0gXAogICAgIGdsb2IuZ2xv YihyZXNvdXJjZXNfcGF0aCArICdVc2VySW50ZXJmYWNlLyouaHRtbCcpICsgXAogICAgIGdsb2Iu Z2xvYihyZXNvdXJjZXNfcGF0aCArICdVc2VySW50ZXJmYWNlL0Jhc2UvKi5qcycpICsgXAo=