73619 2011-12-01 21:39:21 -0800 Move run-bindings-tests implementation to webkitpy/bindings/main.py 2011-12-02 01:31:27 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken abarth eric ojan webkit.review.bot oldest_to_newest 513469 0 haraken 2011-12-01 21:39:21 -0800 As run-bindings-tests has been growing, we can move its implementation to webkitpy/bindings/main.py to integrate with the rest of webkitpy. 513478 1 117563 haraken 2011-12-01 22:07:34 -0800 Created attachment 117563 Patch 513614 2 117563 webkit.review.bot 2011-12-02 01:31:22 -0800 Comment on attachment 117563 Patch Clearing flags on attachment: 117563 Committed r101767: <http://trac.webkit.org/changeset/101767> 513615 3 webkit.review.bot 2011-12-02 01:31:27 -0800 All reviewed patches have been landed. Closing bug. 117563 2011-12-01 22:07:34 -0800 2011-12-02 01:31:22 -0800 Patch bug-73619-20111202150733.patch text/plain 15052 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNzQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzVjMDVkNjg2YTIxYjBmZGZlNjFkODM5OWQ3NjFhMTFl NTAzODRkZi4uM2JjZDdmNjZiOWI3NzY2ODY2ZjFkODJlMWY1NzQ4NzMyMjFkODM2NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDExLTEyLTAxICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBNb3ZlIHJ1bi1iaW5kaW5ncy10ZXN0cyBpbXBsZW1lbnRhdGlvbiB0byB3ZWJraXRw eS9iaW5kaW5ncy9tYWluLnB5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03MzYxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFzIHJ1bi1iaW5kaW5ncy10ZXN0cyBoYXMgYmVlbiBncm93aW5nLCB0aGlzIHBh dGNoIGp1c3QgbW92ZXMgaXRzIGltcGxlbWVudGF0aW9uCisgICAgICAgIHRvIHdlYmtpdHB5L2Jp bmRpbmdzL21haW4ucHkgdG8gaW50ZWdyYXRlIHdpdGggdGhlIHJlc3Qgb2Ygd2Via2l0cHkuCisK KyAgICAgICAgTm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogU2NyaXB0cy9ydW4t YmluZGluZ3MtdGVzdHM6CisgICAgICAgIChtYWluKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2JpbmRpbmdzL19faW5pdF9fLnB5OiBBZGRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2JpbmRpbmdzL21haW4ucHk6IEFkZGVkLgorICAgICAgICAoQmluZGluZ3NUZXN0cy5fX2lu aXRfXyk6CisgICAgICAgIChCaW5kaW5nc1Rlc3RzLmdlbmVyYXRlX2Zyb21faWRsKToKKyAgICAg ICAgKEJpbmRpbmdzVGVzdHMuZ2VuZXJhdGVfc3VwcGxlbWVudGFsX2RlcGVuZGVuY3kpOgorICAg ICAgICAoQmluZGluZ3NUZXN0cy5kZXRlY3RfY2hhbmdlcyk6CisgICAgICAgIChCaW5kaW5nc1Rl c3RzLnJ1bl90ZXN0cyk6CisKIDIwMTEtMTItMDEgIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21p dW0ub3JnPgogCiAgICAgICAgIEV4cGxpY2l0bHkgcGFzcyB0b2xlcmFuY2U9MCB0byBwb3J0LmRp ZmZfaW1hZ2UgaW4gY2FzZSBvZiBSZWZUZXN0TWlzbWF0Y2ggZmFpbHVyZS4KZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvcnVuLWJpbmRpbmdzLXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4tYmlu ZGluZ3MtdGVzdHMKaW5kZXggMTc0N2ViNTQ4ZDk1NWJiNzEzNGM2ZjNhMjgyNjI3MDI5ZGY2ZDg1 YS4uMjM2ZDUwZWFlNjRkNWVkOWYzZTRlM2MwMmVjODM5Mzc3N2YzZTE2ZCAxMDA3NTUKLS0tIGEv VG9vbHMvU2NyaXB0cy9ydW4tYmluZGluZ3MtdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4t YmluZGluZ3MtdGVzdHMKQEAgLTIzLDExOCArMjMsMTIgQEAKICMgT0YgVEhJUyBTT0ZUV0FSRSwg RVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICMKIAot IyBUaGlzIHNjcmlwdCBnZW5lcmF0ZXMgaCBhbmQgY3BwIGZpbGUgZm9yIFRlc3RPYmouaWRsIHVz aW5nIHRoZSBWOCBjb2RlCi0jIGdlbmVyYXRvci4gUGxlYXNlIGV4ZWN1dGUgdGhlIHNjcmlwdCB3 aGVuZXZlciBjaGFuZ2VzIGFyZSBtYWRlIHRvCi0jIENvZGVHZW5lcmF0b3JWOC5wbSwgYW5kIHN1 Ym1pdCB0aGUgY2hhbmdlcyBpbiBWOFRlc3RPYmouaC9jcHAgaW4gdGhlIHNhbWUKKyMgVGhpcyBz Y3JpcHQgZ2VuZXJhdGVzIGggYW5kIGNwcCBmaWxlIGZvciBUZXN0T2JqLmlkbCB1c2luZyBjb2Rl CisjIGdlbmVyYXRvcnMuIFBsZWFzZSBleGVjdXRlIHRoZSBzY3JpcHQgd2hlbmV2ZXIgY2hhbmdl cyBhcmUgbWFkZSB0bworIyBDb2RlR2VuZXJhdG9yWFhYWC5wbSwgYW5kIHN1Ym1pdCB0aGUgY2hh bmdlcyBpbiBYWFhYVGVzdE9iai5oL2NwcCBpbiB0aGUgc2FtZQogIyBwYXRjaC4gVGhpcyBtYWtl cyBpdCBlYXNpZXIgdG8gdHJhY2sgYW5kIHJldmlldyBjaGFuZ2VzIGluIGdlbmVyYXRlZCBjb2Rl LgotIyBUbyBleGVjdXRlLCBpbnZva2U6ICdweXRob24gcnVuX3Rlc3RzLnB5JwogCi1pbXBvcnQg b3MKLWltcG9ydCBvcy5wYXRoCi1pbXBvcnQgc2h1dGlsCi1pbXBvcnQgc3VicHJvY2VzcwogaW1w b3J0IHN5cwotaW1wb3J0IHRlbXBmaWxlCi1mcm9tIHdlYmtpdHB5LmNvbW1vbi5jaGVja291dC5z Y20uZGV0ZWN0aW9uIGltcG9ydCBkZXRlY3Rfc2NtX3N5c3RlbQotCi0KLWRlZiBnZW5lcmF0ZV9m cm9tX2lkbChnZW5lcmF0b3IsIGlkbF9maWxlLCBvdXRwdXRfZGlyZWN0b3J5LCBzdXBwbGVtZW50 YWxfZGVwZW5kZW5jeV9maWxlKToKLSAgICBjbWQgPSBbJ3BlcmwnLCAnLXcnLAotICAgICAgICAg ICAnLUlXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMnLAotICAgICAgICAgICAnV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBsJywKLSAgICAgICAgICAgIyBpZGwgaW5j bHVkZSBkaXJlY3RvcmllcyAocGF0aCByZWxhdGl2ZSB0byBnZW5lcmF0ZS1iaW5kaW5ncy5wbCkK LSAgICAgICAgICAgJy0taW5jbHVkZScsICcuJywKLSAgICAgICAgICAgJy0tZGVmaW5lcycsICdU RVNUSU5HXyVzJyAlIGdlbmVyYXRvciwKLSAgICAgICAgICAgJy0tZ2VuZXJhdG9yJywgZ2VuZXJh dG9yLAotICAgICAgICAgICAnLS1vdXRwdXREaXInLCBvdXRwdXRfZGlyZWN0b3J5LAotICAgICAg ICAgICAnLS1zdXBwbGVtZW50YWxEZXBlbmRlbmN5RmlsZScsIHN1cHBsZW1lbnRhbF9kZXBlbmRl bmN5X2ZpbGUsCi0gICAgICAgICAgIGlkbF9maWxlXQotCi0gICAgcHJvY2VzcyA9IHN1YnByb2Nl c3MuUG9wZW4oY21kLCBzdGRvdXQgPSBzdWJwcm9jZXNzLlBJUEUsIHN0ZGVyciA9IHN1YnByb2Nl c3MuU1RET1VUKQotICAgIGV4aXRfY29kZSA9IHByb2Nlc3Mud2FpdCgpCi0gICAgb3V0cHV0ID0g cHJvY2Vzcy5jb21tdW5pY2F0ZSgpWzBdCi0gICAgaWYgb3V0cHV0OgotICAgICAgICBwcmludCBv dXRwdXQKLSAgICByZXR1cm4gZXhpdF9jb2RlCi0KLQotZGVmIGdlbmVyYXRlX3N1cHBsZW1lbnRh bF9kZXBlbmRlbmN5KGlucHV0X2RpcmVjdG9yeSwgc3VwcGxlbWVudGFsX2RlcGVuZGVuY3lfZmls ZSk6Ci0gICAgaWRsX2ZpbGVzX2xpc3QgPSB0ZW1wZmlsZS5ta3N0ZW1wKCkKLSAgICBmb3IgaW5w dXRfZmlsZSBpbiBvcy5saXN0ZGlyKGlucHV0X2RpcmVjdG9yeSk6Ci0gICAgICAgIChuYW1lLCBl eHRlbnNpb24pID0gb3MucGF0aC5zcGxpdGV4dChpbnB1dF9maWxlKQotICAgICAgICBpZiBleHRl bnNpb24gIT0gJy5pZGwnOgotICAgICAgICAgICAgY29udGludWUKLSAgICAgICAgb3Mud3JpdGUo aWRsX2ZpbGVzX2xpc3RbMF0sIG9zLnBhdGguam9pbihpbnB1dF9kaXJlY3RvcnksIGlucHV0X2Zp bGUpICsgIlxuIikKLSAgICBvcy5jbG9zZShpZGxfZmlsZXNfbGlzdFswXSkKLQotICAgIGNtZCA9 IFsncGVybCcsICctdycsCi0gICAgICAgICAgICctSVdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cycs Ci0gICAgICAgICAgICdXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvcmVzb2x2ZS1zdXBwbGVtZW50 YWwucGwnLAotICAgICAgICAgICAnLS1pZGxGaWxlc0xpc3QnLCBpZGxfZmlsZXNfbGlzdFsxXSwK LSAgICAgICAgICAgJy0tZGVmaW5lcycsICcnLAotICAgICAgICAgICAnLS1zdXBwbGVtZW50YWxE ZXBlbmRlbmN5RmlsZScsIHN1cHBsZW1lbnRhbF9kZXBlbmRlbmN5X2ZpbGVdCi0gICAgcHJvY2Vz cyA9IHN1YnByb2Nlc3MuUG9wZW4oY21kLCBzdGRvdXQgPSBzdWJwcm9jZXNzLlBJUEUsIHN0ZGVy ciA9IHN1YnByb2Nlc3MuU1RET1VUKQotICAgIGV4aXRfY29kZSA9IHByb2Nlc3Mud2FpdCgpCi0g ICAgb3V0cHV0ID0gcHJvY2Vzcy5jb21tdW5pY2F0ZSgpWzBdCi0gICAgaWYgb3V0cHV0OgotICAg ICAgICBwcmludCBvdXRwdXQKLQotICAgIG9zLnJlbW92ZShpZGxfZmlsZXNfbGlzdFsxXSkKLSAg ICByZXR1cm4gZXhpdF9jb2RlCi0KLQotZGVmIGRldGVjdF9jaGFuZ2VzKGdlbmVyYXRvciwgd29y a19kaXJlY3RvcnksIHJlZmVyZW5jZV9kaXJlY3RvcnkpOgotICAgIGNoYW5nZXNfZm91bmQgPSBG YWxzZQotICAgIGZvciBvdXRwdXRfZmlsZSBpbiBvcy5saXN0ZGlyKHdvcmtfZGlyZWN0b3J5KToK LSAgICAgICAgY21kID0gWydkaWZmJywKLSAgICAgICAgICAgICAgICctdScsCi0gICAgICAgICAg ICAgICAnLU4nLAotICAgICAgICAgICAgICAgb3MucGF0aC5qb2luKHJlZmVyZW5jZV9kaXJlY3Rv cnksIG91dHB1dF9maWxlKSwKLSAgICAgICAgICAgICAgIG9zLnBhdGguam9pbih3b3JrX2RpcmVj dG9yeSwgb3V0cHV0X2ZpbGUpXQotCi0gICAgICAgIHByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVu KGNtZCwgc3Rkb3V0ID0gc3VicHJvY2Vzcy5QSVBFLCBzdGRlcnIgPSBzdWJwcm9jZXNzLlNURE9V VCkKLSAgICAgICAgcHJvY2Vzcy53YWl0KCkKLSAgICAgICAgb3V0cHV0ID0gcHJvY2Vzcy5jb21t dW5pY2F0ZSgpWzBdCi0gICAgICAgIGlmIG91dHB1dDoKLSAgICAgICAgICAgIHByaW50ICdGQUlM OiAoJXMpICVzJyAlIChnZW5lcmF0b3IsIG91dHB1dF9maWxlKQotICAgICAgICAgICAgcHJpbnQg b3V0cHV0Ci0gICAgICAgICAgICBjaGFuZ2VzX2ZvdW5kID0gVHJ1ZQotICAgICAgICBlbHNlOgot ICAgICAgICAgICAgcHJpbnQgJ1BBU1M6ICglcykgJXMnICUgKGdlbmVyYXRvciwgb3V0cHV0X2Zp bGUpCi0KLSAgICByZXR1cm4gY2hhbmdlc19mb3VuZAotCi0KLWRlZiBydW5fdGVzdHMoZ2VuZXJh dG9yLCBpbnB1dF9kaXJlY3RvcnksIHJlZmVyZW5jZV9kaXJlY3RvcnksIHJlc2V0X3Jlc3VsdHMs IHN1cHBsZW1lbnRhbF9kZXBlbmRlbmN5X2ZpbGUpOgotICAgIHdvcmtfZGlyZWN0b3J5ID0gcmVm ZXJlbmNlX2RpcmVjdG9yeQotCi0gICAgcGFzc2VkID0gVHJ1ZQotICAgIGZvciBpbnB1dF9maWxl IGluIG9zLmxpc3RkaXIoaW5wdXRfZGlyZWN0b3J5KToKLSAgICAgICAgKG5hbWUsIGV4dGVuc2lv bikgPSBvcy5wYXRoLnNwbGl0ZXh0KGlucHV0X2ZpbGUpCi0gICAgICAgIGlmIGV4dGVuc2lvbiAh PSAnLmlkbCc6Ci0gICAgICAgICAgICBjb250aW51ZQotICAgICAgICAjIEdlbmVyYXRlIG91dHB1 dCBpbnRvIHRoZSB3b3JrIGRpcmVjdG9yeSAoZWl0aGVyIHRoZSBnaXZlbiBvbmUgb3IgYQotICAg ICAgICAjIHRlbXAgb25lIGlmIG5vdCByZXNldF9yZXN1bHRzIGlzIHBlcmZvcm1lZCkKLSAgICAg ICAgaWYgbm90IHJlc2V0X3Jlc3VsdHM6Ci0gICAgICAgICAgICB3b3JrX2RpcmVjdG9yeSA9IHRl bXBmaWxlLm1rZHRlbXAoKQotCi0gICAgICAgIGlmIGdlbmVyYXRlX2Zyb21faWRsKGdlbmVyYXRv ciwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3MucGF0aC5qb2luKGlucHV0X2RpcmVj dG9yeSwgaW5wdXRfZmlsZSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdvcmtfZGly ZWN0b3J5LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdXBwbGVtZW50YWxfZGVwZW5k ZW5jeV9maWxlKToKLSAgICAgICAgICAgIHBhc3NlZCA9IEZhbHNlCi0KLSAgICAgICAgaWYgcmVz ZXRfcmVzdWx0czoKLSAgICAgICAgICAgIHByaW50ICJSZXNldCByZXN1bHRzOiAoJXMpICVzIiAl IChnZW5lcmF0b3IsIGlucHV0X2ZpbGUpCi0gICAgICAgICAgICBjb250aW51ZQotCi0gICAgICAg ICMgRGV0ZWN0IGNoYW5nZXMKLSAgICAgICAgaWYgZGV0ZWN0X2NoYW5nZXMoZ2VuZXJhdG9yLCB3 b3JrX2RpcmVjdG9yeSwgcmVmZXJlbmNlX2RpcmVjdG9yeSk6Ci0gICAgICAgICAgICBwYXNzZWQg PSBGYWxzZQotICAgICAgICBzaHV0aWwucm10cmVlKHdvcmtfZGlyZWN0b3J5KQotCi0gICAgcmV0 dXJuIHBhc3NlZAotCiAKIGRlZiBtYWluKGFyZ3YpOgogICAgICIiIlJ1bnMgV2ViQ29yZSBiaW5k aW5ncyBjb2RlIGdlbmVyYXRvcnMgb24gdGVzdCBJREwgZmlsZXMgYW5kIGNvbXBhcmVzCkBAIC0x NDYsMTEgKzQwLDYgQEAgZGVmIG1haW4oYXJndik6CiAgICAgIiIiCiAgICAgcmVzZXRfcmVzdWx0 cyA9ICItLXJlc2V0LXJlc3VsdHMiIGluIGFyZ3YKIAotICAgIGN1cnJlbnRfc2NtID0gZGV0ZWN0 X3NjbV9zeXN0ZW0ob3MuY3VyZGlyKQotICAgIG9zLmNoZGlyKG9zLnBhdGguam9pbihjdXJyZW50 X3NjbS5jaGVja291dF9yb290LCAnU291cmNlJykpCi0KLSAgICBhbGxfdGVzdHNfcGFzc2VkID0g VHJ1ZQotCiAgICAgZ2VuZXJhdG9ycyA9IFsKICAgICAgICAgJ0pTJywKICAgICAgICAgJ1Y4JywK QEAgLTE1OSwyNyArNDgsOSBAQCBkZWYgbWFpbihhcmd2KToKICAgICAgICAgJ0NQUCcKICAgICBd CiAKLSAgICBpbnB1dF9kaXJlY3RvcnkgPSBvcy5wYXRoLmpvaW4oJ1dlYkNvcmUnLCAnYmluZGlu Z3MnLCAnc2NyaXB0cycsICd0ZXN0JykKLSAgICBzdXBwbGVtZW50YWxfZGVwZW5kZW5jeV9maWxl ID0gdGVtcGZpbGUubWtzdGVtcCgpWzFdCi0gICAgaWYgZ2VuZXJhdGVfc3VwcGxlbWVudGFsX2Rl cGVuZGVuY3koaW5wdXRfZGlyZWN0b3J5LCBzdXBwbGVtZW50YWxfZGVwZW5kZW5jeV9maWxlKToK LSAgICAgICAgcHJpbnQgJ0ZhaWxlZCB0byBnZW5lcmF0ZSBhIHN1cHBsZW1lbnRhbCBkZXBlbmRl bmN5IGZpbGUuJwotICAgICAgICBvcy5yZW1vdmUoc3VwcGxlbWVudGFsX2RlcGVuZGVuY3lfZmls ZSkKLSAgICAgICAgcmV0dXJuIC0xCi0KLSAgICBmb3IgZ2VuZXJhdG9yIGluIGdlbmVyYXRvcnM6 Ci0gICAgICAgIGlucHV0X2RpcmVjdG9yeSA9IG9zLnBhdGguam9pbignV2ViQ29yZScsICdiaW5k aW5ncycsICdzY3JpcHRzJywgJ3Rlc3QnKQotICAgICAgICByZWZlcmVuY2VfZGlyZWN0b3J5ID0g b3MucGF0aC5qb2luKCdXZWJDb3JlJywgJ2JpbmRpbmdzJywgJ3NjcmlwdHMnLCAndGVzdCcsIGdl bmVyYXRvcikKLSAgICAgICAgaWYgbm90IHJ1bl90ZXN0cyhnZW5lcmF0b3IsIGlucHV0X2RpcmVj dG9yeSwgcmVmZXJlbmNlX2RpcmVjdG9yeSwgcmVzZXRfcmVzdWx0cywgc3VwcGxlbWVudGFsX2Rl cGVuZGVuY3lfZmlsZSk6Ci0gICAgICAgICAgICBhbGxfdGVzdHNfcGFzc2VkID0gRmFsc2UKKyAg ICBmcm9tIHdlYmtpdHB5LmJpbmRpbmdzLm1haW4gaW1wb3J0IEJpbmRpbmdzVGVzdHMKIAotICAg IG9zLnJlbW92ZShzdXBwbGVtZW50YWxfZGVwZW5kZW5jeV9maWxlKQotICAgIHByaW50ICcnCi0g ICAgaWYgYWxsX3Rlc3RzX3Bhc3NlZDoKLSAgICAgICAgcHJpbnQgJ0FsbCB0ZXN0cyBQQVNTIScK LSAgICAgICAgcmV0dXJuIDAKLSAgICBlbHNlOgotICAgICAgICBwcmludCAnU29tZSB0ZXN0cyBG QUlMISAoVG8gdXBkYXRlIHRoZSByZWZlcmVuY2UgZmlsZXMsIGV4ZWN1dGUgInJ1bi1iaW5kaW5n cy10ZXN0cyAtLXJlc2V0LXJlc3VsdHMiKScKLSAgICAgICAgcmV0dXJuIC0xCisgICAgQmluZGlu Z3NUZXN0cyhyZXNldF9yZXN1bHRzLCBnZW5lcmF0b3JzKS5tYWluKCkKIAogCiBpZiBfX25hbWVf XyA9PSAnX19tYWluX18nOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iaW5k aW5ncy9fX2luaXRfXy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmluZGluZ3MvX19pbml0 X18ucHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uZWY2NWJlZTViYjc3ZTk2ZWJjN2NkOWM0NzY0MDY5MGZiZGE4YWMx OQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmluZGluZ3MvX19p bml0X18ucHkKQEAgLTAsMCArMSBAQAorIyBSZXF1aXJlZCBmb3IgUHl0aG9uIHRvIHNlYXJjaCB0 aGlzIGRpcmVjdG9yeSBmb3IgbW9kdWxlIGZpbGVzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2JpbmRpbmdzL21haW4ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JpbmRp bmdzL21haW4ucHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZGU4ZTZkYWY1MWZiNzZlNTc2MTg0NzI1ODk5MDQ2ZDdi NzhhNzYxOQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmluZGlu Z3MvbWFpbi5weQpAQCAtMCwwICsxLDE2MSBAQAorIyEvdXNyL2Jpbi9weXRob24KKyMgQ29weXJp Z2h0IChDKSAyMDExIEdvb2dsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgorIworIyBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZv bGxvd2luZyBjb25kaXRpb25zCisjIGFyZSBtZXQ6CisjIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBz b3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAgIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMg Mi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92 ZSBjb3B5cmlnaHQKKyMgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl IGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorIyAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorIworIyBUSElT IFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIENPTVBVVEVSLCBJTkMuIGBgQVMgSVMnJyBB TkQgQU5ZCisjIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBO T1QgTElNSVRFRCBUTywgVEhFCisjIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJ VFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorIyBQVVJQT1NFIEFSRSBESVNDTEFJTUVE LiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgQ09NUFVURVIsIElOQy4gT1IKKyMgQ09OVFJJQlVU T1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJ QUwsCisjIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywKKyMgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisjIFBST0ZJVFM7IE9SIEJVU0lORVNTIElO VEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKKyMgT0YgTElBQklM SVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJ TkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQg T0YgVEhFIFVTRQorIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorIworCitpbXBvcnQgb3MKK2ltcG9ydCBvcy5wYXRo CitpbXBvcnQgc2h1dGlsCitpbXBvcnQgc3VicHJvY2VzcworaW1wb3J0IHN5cworaW1wb3J0IHRl bXBmaWxlCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5jaGVja291dC5zY20uZGV0ZWN0aW9uIGltcG9y dCBkZXRlY3Rfc2NtX3N5c3RlbQorCisKK2NsYXNzIEJpbmRpbmdzVGVzdHM6CisKKyAgICBkZWYg X19pbml0X18oc2VsZiwgcmVzZXRfcmVzdWx0cywgZ2VuZXJhdG9ycyk6CisgICAgICAgIHNlbGYu cmVzZXRfcmVzdWx0cyA9IHJlc2V0X3Jlc3VsdHMKKyAgICAgICAgc2VsZi5nZW5lcmF0b3JzID0g Z2VuZXJhdG9ycworCisgICAgZGVmIGdlbmVyYXRlX2Zyb21faWRsKHNlbGYsIGdlbmVyYXRvciwg aWRsX2ZpbGUsIG91dHB1dF9kaXJlY3RvcnksIHN1cHBsZW1lbnRhbF9kZXBlbmRlbmN5X2ZpbGUp OgorICAgICAgICBjbWQgPSBbJ3BlcmwnLCAnLXcnLAorICAgICAgICAgICAgICAgJy1JV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzJywKKyAgICAgICAgICAgICAgICdXZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvZ2VuZXJhdGUtYmluZGluZ3MucGwnLAorICAgICAgICAgICAgICAgIyBpZGwgaW5jbHVk ZSBkaXJlY3RvcmllcyAocGF0aCByZWxhdGl2ZSB0byBnZW5lcmF0ZS1iaW5kaW5ncy5wbCkKKyAg ICAgICAgICAgICAgICctLWluY2x1ZGUnLCAnLicsCisgICAgICAgICAgICAgICAnLS1kZWZpbmVz JywgJ1RFU1RJTkdfJXMnICUgZ2VuZXJhdG9yLAorICAgICAgICAgICAgICAgJy0tZ2VuZXJhdG9y JywgZ2VuZXJhdG9yLAorICAgICAgICAgICAgICAgJy0tb3V0cHV0RGlyJywgb3V0cHV0X2RpcmVj dG9yeSwKKyAgICAgICAgICAgICAgICctLXN1cHBsZW1lbnRhbERlcGVuZGVuY3lGaWxlJywgc3Vw cGxlbWVudGFsX2RlcGVuZGVuY3lfZmlsZSwKKyAgICAgICAgICAgICAgIGlkbF9maWxlXQorCisg ICAgICAgIHByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKGNtZCwgc3Rkb3V0PXN1YnByb2Nlc3Mu UElQRSwgc3RkZXJyPXN1YnByb2Nlc3MuU1RET1VUKQorICAgICAgICBleGl0X2NvZGUgPSBwcm9j ZXNzLndhaXQoKQorICAgICAgICBvdXRwdXQgPSBwcm9jZXNzLmNvbW11bmljYXRlKClbMF0KKyAg ICAgICAgaWYgb3V0cHV0OgorICAgICAgICAgICAgcHJpbnQgb3V0cHV0CisgICAgICAgIHJldHVy biBleGl0X2NvZGUKKworICAgIGRlZiBnZW5lcmF0ZV9zdXBwbGVtZW50YWxfZGVwZW5kZW5jeShz ZWxmLCBpbnB1dF9kaXJlY3RvcnksIHN1cHBsZW1lbnRhbF9kZXBlbmRlbmN5X2ZpbGUpOgorICAg ICAgICBpZGxfZmlsZXNfbGlzdCA9IHRlbXBmaWxlLm1rc3RlbXAoKQorICAgICAgICBmb3IgaW5w dXRfZmlsZSBpbiBvcy5saXN0ZGlyKGlucHV0X2RpcmVjdG9yeSk6CisgICAgICAgICAgICAobmFt ZSwgZXh0ZW5zaW9uKSA9IG9zLnBhdGguc3BsaXRleHQoaW5wdXRfZmlsZSkKKyAgICAgICAgICAg IGlmIGV4dGVuc2lvbiAhPSAnLmlkbCc6CisgICAgICAgICAgICAgICAgY29udGludWUKKyAgICAg ICAgICAgIG9zLndyaXRlKGlkbF9maWxlc19saXN0WzBdLCBvcy5wYXRoLmpvaW4oaW5wdXRfZGly ZWN0b3J5LCBpbnB1dF9maWxlKSArICJcbiIpCisgICAgICAgIG9zLmNsb3NlKGlkbF9maWxlc19s aXN0WzBdKQorCisgICAgICAgIGNtZCA9IFsncGVybCcsICctdycsCisgICAgICAgICAgICAgICAn LUlXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMnLAorICAgICAgICAgICAgICAgJ1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9yZXNvbHZlLXN1cHBsZW1lbnRhbC5wbCcsCisgICAgICAgICAgICAgICAn LS1pZGxGaWxlc0xpc3QnLCBpZGxfZmlsZXNfbGlzdFsxXSwKKyAgICAgICAgICAgICAgICctLWRl ZmluZXMnLCAnJywKKyAgICAgICAgICAgICAgICctLXN1cHBsZW1lbnRhbERlcGVuZGVuY3lGaWxl Jywgc3VwcGxlbWVudGFsX2RlcGVuZGVuY3lfZmlsZV0KKyAgICAgICAgcHJvY2VzcyA9IHN1YnBy b2Nlc3MuUG9wZW4oY21kLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLCBzdGRlcnI9c3VicHJvY2Vz cy5TVERPVVQpCisgICAgICAgIGV4aXRfY29kZSA9IHByb2Nlc3Mud2FpdCgpCisgICAgICAgIG91 dHB1dCA9IHByb2Nlc3MuY29tbXVuaWNhdGUoKVswXQorICAgICAgICBpZiBvdXRwdXQ6CisgICAg ICAgICAgICBwcmludCBvdXRwdXQKKworICAgICAgICBvcy5yZW1vdmUoaWRsX2ZpbGVzX2xpc3Rb MV0pCisgICAgICAgIHJldHVybiBleGl0X2NvZGUKKworICAgIGRlZiBkZXRlY3RfY2hhbmdlcyhz ZWxmLCBnZW5lcmF0b3IsIHdvcmtfZGlyZWN0b3J5LCByZWZlcmVuY2VfZGlyZWN0b3J5KToKKyAg ICAgICAgY2hhbmdlc19mb3VuZCA9IEZhbHNlCisgICAgICAgIGZvciBvdXRwdXRfZmlsZSBpbiBv cy5saXN0ZGlyKHdvcmtfZGlyZWN0b3J5KToKKyAgICAgICAgICAgIGNtZCA9IFsnZGlmZicsCisg ICAgICAgICAgICAgICAgICAgJy11JywKKyAgICAgICAgICAgICAgICAgICAnLU4nLAorICAgICAg ICAgICAgICAgICAgIG9zLnBhdGguam9pbihyZWZlcmVuY2VfZGlyZWN0b3J5LCBvdXRwdXRfZmls ZSksCisgICAgICAgICAgICAgICAgICAgb3MucGF0aC5qb2luKHdvcmtfZGlyZWN0b3J5LCBvdXRw dXRfZmlsZSldCisKKyAgICAgICAgICAgIHByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKGNtZCwg c3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwgc3RkZXJyPXN1YnByb2Nlc3MuU1RET1VUKQorICAgICAg ICAgICAgcHJvY2Vzcy53YWl0KCkKKyAgICAgICAgICAgIG91dHB1dCA9IHByb2Nlc3MuY29tbXVu aWNhdGUoKVswXQorICAgICAgICAgICAgaWYgb3V0cHV0OgorICAgICAgICAgICAgICAgIHByaW50 ICdGQUlMOiAoJXMpICVzJyAlIChnZW5lcmF0b3IsIG91dHB1dF9maWxlKQorICAgICAgICAgICAg ICAgIHByaW50IG91dHB1dAorICAgICAgICAgICAgICAgIGNoYW5nZXNfZm91bmQgPSBUcnVlCisg ICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIHByaW50ICdQQVNTOiAoJXMpICVzJyAl IChnZW5lcmF0b3IsIG91dHB1dF9maWxlKQorCisgICAgICAgIHJldHVybiBjaGFuZ2VzX2ZvdW5k CisKKyAgICBkZWYgcnVuX3Rlc3RzKHNlbGYsIGdlbmVyYXRvciwgaW5wdXRfZGlyZWN0b3J5LCBy ZWZlcmVuY2VfZGlyZWN0b3J5LCBzdXBwbGVtZW50YWxfZGVwZW5kZW5jeV9maWxlKToKKyAgICAg ICAgd29ya19kaXJlY3RvcnkgPSByZWZlcmVuY2VfZGlyZWN0b3J5CisKKyAgICAgICAgcGFzc2Vk ID0gVHJ1ZQorICAgICAgICBmb3IgaW5wdXRfZmlsZSBpbiBvcy5saXN0ZGlyKGlucHV0X2RpcmVj dG9yeSk6CisgICAgICAgICAgICAobmFtZSwgZXh0ZW5zaW9uKSA9IG9zLnBhdGguc3BsaXRleHQo aW5wdXRfZmlsZSkKKyAgICAgICAgICAgIGlmIGV4dGVuc2lvbiAhPSAnLmlkbCc6CisgICAgICAg ICAgICAgICAgY29udGludWUKKyAgICAgICAgICAgICMgR2VuZXJhdGUgb3V0cHV0IGludG8gdGhl IHdvcmsgZGlyZWN0b3J5IChlaXRoZXIgdGhlIGdpdmVuIG9uZSBvciBhCisgICAgICAgICAgICAj IHRlbXAgb25lIGlmIG5vdCByZXNldF9yZXN1bHRzIGlzIHBlcmZvcm1lZCkKKyAgICAgICAgICAg IGlmIG5vdCBzZWxmLnJlc2V0X3Jlc3VsdHM6CisgICAgICAgICAgICAgICAgd29ya19kaXJlY3Rv cnkgPSB0ZW1wZmlsZS5ta2R0ZW1wKCkKKworICAgICAgICAgICAgaWYgc2VsZi5nZW5lcmF0ZV9m cm9tX2lkbChnZW5lcmF0b3IsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG9zLnBhdGguam9pbihpbnB1dF9kaXJlY3RvcnksIGlucHV0X2ZpbGUpLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB3b3JrX2RpcmVjdG9yeSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc3VwcGxlbWVudGFsX2RlcGVuZGVuY3lfZmlsZSk6Cisg ICAgICAgICAgICAgICAgcGFzc2VkID0gRmFsc2UKKworICAgICAgICAgICAgaWYgc2VsZi5yZXNl dF9yZXN1bHRzOgorICAgICAgICAgICAgICAgIHByaW50ICJSZXNldCByZXN1bHRzOiAoJXMpICVz IiAlIChnZW5lcmF0b3IsIGlucHV0X2ZpbGUpCisgICAgICAgICAgICAgICAgY29udGludWUKKwor ICAgICAgICAgICAgIyBEZXRlY3QgY2hhbmdlcworICAgICAgICAgICAgaWYgc2VsZi5kZXRlY3Rf Y2hhbmdlcyhnZW5lcmF0b3IsIHdvcmtfZGlyZWN0b3J5LCByZWZlcmVuY2VfZGlyZWN0b3J5KToK KyAgICAgICAgICAgICAgICBwYXNzZWQgPSBGYWxzZQorICAgICAgICAgICAgc2h1dGlsLnJtdHJl ZSh3b3JrX2RpcmVjdG9yeSkKKworICAgICAgICByZXR1cm4gcGFzc2VkCisKKyAgICBkZWYgbWFp bihzZWxmKToKKyAgICAgICAgY3VycmVudF9zY20gPSBkZXRlY3Rfc2NtX3N5c3RlbShvcy5jdXJk aXIpCisgICAgICAgIG9zLmNoZGlyKG9zLnBhdGguam9pbihjdXJyZW50X3NjbS5jaGVja291dF9y b290LCAnU291cmNlJykpCisKKyAgICAgICAgYWxsX3Rlc3RzX3Bhc3NlZCA9IFRydWUKKworICAg ICAgICBpbnB1dF9kaXJlY3RvcnkgPSBvcy5wYXRoLmpvaW4oJ1dlYkNvcmUnLCAnYmluZGluZ3Mn LCAnc2NyaXB0cycsICd0ZXN0JykKKyAgICAgICAgc3VwcGxlbWVudGFsX2RlcGVuZGVuY3lfZmls ZSA9IHRlbXBmaWxlLm1rc3RlbXAoKVsxXQorICAgICAgICBpZiBzZWxmLmdlbmVyYXRlX3N1cHBs ZW1lbnRhbF9kZXBlbmRlbmN5KGlucHV0X2RpcmVjdG9yeSwgc3VwcGxlbWVudGFsX2RlcGVuZGVu Y3lfZmlsZSk6CisgICAgICAgICAgICBwcmludCAnRmFpbGVkIHRvIGdlbmVyYXRlIGEgc3VwcGxl bWVudGFsIGRlcGVuZGVuY3kgZmlsZS4nCisgICAgICAgICAgICBvcy5yZW1vdmUoc3VwcGxlbWVu dGFsX2RlcGVuZGVuY3lfZmlsZSkKKyAgICAgICAgICAgIHJldHVybiAtMQorCisgICAgICAgIGZv ciBnZW5lcmF0b3IgaW4gc2VsZi5nZW5lcmF0b3JzOgorICAgICAgICAgICAgaW5wdXRfZGlyZWN0 b3J5ID0gb3MucGF0aC5qb2luKCdXZWJDb3JlJywgJ2JpbmRpbmdzJywgJ3NjcmlwdHMnLCAndGVz dCcpCisgICAgICAgICAgICByZWZlcmVuY2VfZGlyZWN0b3J5ID0gb3MucGF0aC5qb2luKCdXZWJD b3JlJywgJ2JpbmRpbmdzJywgJ3NjcmlwdHMnLCAndGVzdCcsIGdlbmVyYXRvcikKKyAgICAgICAg ICAgIGlmIG5vdCBzZWxmLnJ1bl90ZXN0cyhnZW5lcmF0b3IsIGlucHV0X2RpcmVjdG9yeSwgcmVm ZXJlbmNlX2RpcmVjdG9yeSwgc3VwcGxlbWVudGFsX2RlcGVuZGVuY3lfZmlsZSk6CisgICAgICAg ICAgICAgICAgYWxsX3Rlc3RzX3Bhc3NlZCA9IEZhbHNlCisKKyAgICAgICAgb3MucmVtb3ZlKHN1 cHBsZW1lbnRhbF9kZXBlbmRlbmN5X2ZpbGUpCisgICAgICAgIHByaW50ICcnCisgICAgICAgIGlm IGFsbF90ZXN0c19wYXNzZWQ6CisgICAgICAgICAgICBwcmludCAnQWxsIHRlc3RzIFBBU1MhJwor ICAgICAgICAgICAgcmV0dXJuIDAKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHByaW50ICdT b21lIHRlc3RzIEZBSUwhIChUbyB1cGRhdGUgdGhlIHJlZmVyZW5jZSBmaWxlcywgZXhlY3V0ZSAi cnVuLWJpbmRpbmdzLXRlc3RzIC0tcmVzZXQtcmVzdWx0cyIpJworICAgICAgICAgICAgcmV0dXJu IC0xCg==