44012 2010-08-14 11:42:57 -0700 [Qt] DumpRenderTree runs only one test from command mode 2011-03-19 07:15:55 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 maheshk maheshk abecsi hausmann kling laszlo.gombos ossy qi.2.zhang tonikitoo oldest_to_newest 264719 0 maheshk 2010-08-14 11:42:57 -0700 Layout testing for qtwebkit is executed by run-webkit-script One can also run .\DumpRenderTree with one test case as command mode arguments. But DumpRenderTree does not support passing more than one test case as arguments which is very handy in debugging test cases where DumpRenderTree passes when run individually but not in a group. (In case of geolocation layout testing running cases together gives different result) This bug is to allow DumpRenderTreeQt to allow passing of multiple test cases to execute. 264721 1 64422 maheshk 2010-08-14 12:04:38 -0700 Created attachment 64422 patch This patch implements supporting multiple test case as command line arguments. This fix could be extended to support folder (and nested folders) argument as well which will read all html files and run them one by one. Running DumpRenderTree from command mode with multiple cases helps to debug the failing cases which passes if run individually. Please review 269192 2 65405 maheshk 2010-08-25 06:01:50 -0700 Created attachment 65405 patch From previous patch, 1) Changed customMode to StandAloneMode as per Kenneth suggestion. 2) Added support for folder path (non-recursive) support to DRT. Any folder containing test files can be run directly with DRT. Ex: ./WebKitBuild/Debug/bin/DumpRenderTree ~/webkit/LayoutTests/fast/dom/Geolocation/ (will run all *.html files in sequence which helped in debugging DRT alone with qtcreator) 269287 3 kling 2010-08-25 09:37:00 -0700 Removing this from QtWebKit 2.1 blockers as it's clearly not release-critical. 269765 4 65405 kenneth 2010-08-26 01:06:11 -0700 Comment on attachment 65405 patch WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp:619 + QStringList onlyHtmls("*.html"); what about .xhtml etc? WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp:621 + for (int i = 0; i < m_standAloneModeTestList.size(); ++i) unsigned? 269777 5 65405 kenneth 2010-08-26 01:56:29 -0700 Comment on attachment 65405 patch r- due to only accepting .html tests 269785 6 65537 maheshk 2010-08-26 02:50:49 -0700 Created attachment 65537 patch incorporate changes as per comment #4 269786 7 65537 kenneth 2010-08-26 02:52:55 -0700 Comment on attachment 65537 patch Comments start with capital and ends with dot. 269792 8 abecsi 2010-08-26 03:19:28 -0700 Committed revision 66092. 269793 9 65537 abecsi 2010-08-26 03:19:50 -0700 Comment on attachment 65537 patch Clearing flags. 269804 10 maheshk 2010-08-26 04:06:09 -0700 Thank you Kenneth and Andras! 64422 2010-08-14 12:04:38 -0700 2010-08-25 06:01:50 -0700 patch 44012.patch text/plain 5833 maheshk SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDY1MzcwKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTAtMDgtMTUgIE1haGVzaCBLdWxrYXJuaSAg PG1haGVzaC5rdWxrYXJuaUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW1FUXSBEdW1wUmVuZGVyVHJlZSBydW5zIG9ubHkgb25lIHRl c3QgZnJvbSBjb21tYW5kIG1vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQ0MDEyCisKKyAgICAgICAgSW1wbGVtZW50cyBwYXJzaW5nIGFuZCBydW5u aW5nIG11bHRpcGxlIHRlc3QgY2FzZXMgZnJvbSBjb21tYW5kIGxpbmUgCisgICAgICAgIGFyZ3Vt ZW50cy4gTmV4dCBzdGVwIGNvdWxkIGJlIGV4dGVuZCB0aGUgc3VwcG9ydCBmb3IgZm9sZGVycy9y ZWN1cnNpdmUKKyAgICAgICAgZm9sZGVycyBhcyB3ZWxsLiAKKworICAgICAgICAqIER1bXBSZW5k ZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHVtcFJl bmRlclRyZWU6OkR1bXBSZW5kZXJUcmVlKToKKyAgICAgICAgKFdlYkNvcmU6OkR1bXBSZW5kZXJU cmVlOjpwcm9jZXNzQXJnc0xpbmUpOgorICAgICAgICAoV2ViQ29yZTo6RHVtcFJlbmRlclRyZWU6 OmxvYWROZXh0VGVzdEluQ3VzdG9tTW9kZSk6CisgICAgICAgIChXZWJDb3JlOjpEdW1wUmVuZGVy VHJlZTo6cHJvY2Vzc0xpbmUpOgorICAgICAgICAoV2ViQ29yZTo6RHVtcFJlbmRlclRyZWU6OmR1 bXApOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkR1bXBSZW5kZXJUcmVlOjpzZXRDdXN0b21Nb2RlKToKKyAgICAgICAg KFdlYkNvcmU6OkR1bXBSZW5kZXJUcmVlOjppc0N1c3RvbU1vZGUpOgorICAgICAgICAqIER1bXBS ZW5kZXJUcmVlL3F0L21haW4uY3BwOgorICAgICAgICAobWFpbik6CisKIDIwMTAtMDgtMTQgIEVy aWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuICBBbm90 aGVyIGZpeCB0byBzdXBwb3J0IHB5dGhvbiAyLjMuCkluZGV4OiBXZWJLaXRUb29scy9EdW1wUmVu ZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5oCShyZXZpc2lvbiA2NTM3MCkKKysr IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuaAkod29ya2lu ZyBjb3B5KQpAQCAtNzksOSArNzksNiBAQAogICAgIHZvaWQgc2V0VGV4dE91dHB1dEVuYWJsZWQo Ym9vbCBlbmFibGUpIHsgbV9lbmFibGVUZXh0T3V0cHV0ID0gZW5hYmxlOyB9CiAgICAgYm9vbCBp c1RleHRPdXRwdXRFbmFibGVkKCkgeyByZXR1cm4gbV9lbmFibGVUZXh0T3V0cHV0OyB9CiAKLSAg ICB2b2lkIHNldFNpbmdsZUZpbGVNb2RlKGJvb2wgZmxhZykgeyBtX3NpbmdsZUZpbGVNb2RlID0g ZmxhZzsgfQotICAgIGJvb2wgaXNTaW5nbGVGaWxlTW9kZSgpIHsgcmV0dXJuIG1fc2luZ2xlRmls ZU1vZGU7IH0KLQogICAgIHZvaWQgc2V0R3JhcGhpY3NCYXNlZChib29sIGZsYWcpIHsgbV9ncmFw aGljc0Jhc2VkID0gZmxhZzsgfQogICAgIGJvb2wgaXNHcmFwaGljc0Jhc2VkKCkgeyByZXR1cm4g bV9ncmFwaGljc0Jhc2VkOyB9CiAKQEAgLTEwNiw2ICsxMDMsNyBAQAogI2lmIGRlZmluZWQoUV9X U19YMTEpCiAgICAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZUZvbnRzKCk7CiAjZW5kaWYKKyAgICB2 b2lkIHByb2Nlc3NBcmdzTGluZShjb25zdCBRU3RyaW5nTGlzdCYpOwogCiBwdWJsaWMgUV9TTE9U UzoKICAgICB2b2lkIGluaXRKU09iamVjdHMoKTsKQEAgLTEyOCw4ICsxMjYsMTIgQEAKICAgICB2 b2lkIHNob3dQYWdlKCk7CiAgICAgdm9pZCBoaWRlUGFnZSgpOwogICAgIHZvaWQgZHJ5UnVuUHJp bnQoUVdlYkZyYW1lKik7CisgICAgdm9pZCBsb2FkTmV4dFRlc3RJbkN1c3RvbU1vZGUoKTsKIAog cHJpdmF0ZToKKyAgICB2b2lkIHNldEN1c3RvbU1vZGUoYm9vbCBmbGFnKSB7IG1fY3VzdG9tTW9k ZSA9IGZsYWc7IH0KKyAgICBib29sIGlzQ3VzdG9tTW9kZSgpIHsgcmV0dXJuIG1fY3VzdG9tTW9k ZTsgfQorCiAgICAgUVN0cmluZyBkdW1wRnJhbWVzQXNUZXh0KFFXZWJGcmFtZSogZnJhbWUpOwog ICAgIFFTdHJpbmcgZHVtcEJhY2tGb3J3YXJkTGlzdChRV2ViUGFnZSogcGFnZSk7CiAgICAgUVN0 cmluZyBkdW1wRnJhbWVTY3JvbGxQb3NpdGlvbihRV2ViRnJhbWUqIGZyYW1lKTsKQEAgLTEzNyw2 ICsxMzksNyBAQAogCiAgICAgYm9vbCBtX2R1bXBQaXhlbHM7CiAgICAgUVN0cmluZyBtX2V4cGVj dGVkSGFzaDsKKyAgICBRU3RyaW5nTGlzdCBtX2N1c3RvbU1vZGVUZXN0TGlzdDsKIAogICAgIFdl YlBhZ2UgKm1fcGFnZTsKICAgICBRV2lkZ2V0KiBtX21haW5WaWV3OwpAQCAtMTUwLDcgKzE1Myw3 IEBACiAKICAgICBRTGlzdDxRT2JqZWN0Kj4gd2luZG93czsKICAgICBib29sIG1fZW5hYmxlVGV4 dE91dHB1dDsKLSAgICBib29sIG1fc2luZ2xlRmlsZU1vZGU7CisgICAgYm9vbCBtX2N1c3RvbU1v ZGU7CiAgICAgYm9vbCBtX2dyYXBoaWNzQmFzZWQ7CiAgICAgUVN0cmluZyBtX3BlcnNpc3RlbnRT dG9yYWdlUGF0aDsKIH07CkluZGV4OiBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9tYWlu LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9tYWluLmNw cAkocmV2aXNpb24gNjUzNzApCisrKyBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9tYWlu LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTYxLDE1ICsxNjEsOCBAQAogICAgIGlmIChhcmdzLmNv bnRhaW5zKFFMYXRpbjFTdHJpbmcoIi0iKSkpIHsKICAgICAgICAgUU9iamVjdDo6Y29ubmVjdCgm ZHVtcGVyLCBTSUdOQUwocmVhZHkoKSksICZkdW1wZXIsIFNMT1QocmVhZExpbmUoKSksIFF0OjpR dWV1ZWRDb25uZWN0aW9uKTsKICAgICAgICAgUVRpbWVyOjpzaW5nbGVTaG90KDAsICZkdW1wZXIs IFNMT1QocmVhZExpbmUoKSkpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIGR1bXBlci5zZXRTaW5n bGVGaWxlTW9kZSh0cnVlKTsKLSAgICAgICAgZm9yIChpbnQgaSA9IDE7IGkgPCBhcmdzLnNpemUo KTsgKytpKSB7Ci0gICAgICAgICAgICBpZiAoIWFyZ3MuYXQoaSkuc3RhcnRzV2l0aCgnLScpKSB7 Ci0gICAgICAgICAgICAgICAgZHVtcGVyLnByb2Nlc3NMaW5lKGFyZ3MuYXQoaSkpOwotICAgICAg ICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgfQorICAgIH0g ZWxzZQorICAgICAgICBkdW1wZXIucHJvY2Vzc0FyZ3NMaW5lKGFyZ3MpOwogCiAgICAgcmV0dXJu IGFwcC5leGVjKCk7CiAKSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBS ZW5kZXJUcmVlUXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVl L3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwCShyZXZpc2lvbiA2NTM3MCkKKysrIFdlYktpdFRvb2xz L0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zOTEsNyArMzkxLDcgQEAKICAgICA6IG1fZHVtcFBpeGVscyhmYWxzZSkKICAgICAsIG1fc3Rk aW4oMCkKICAgICAsIG1fZW5hYmxlVGV4dE91dHB1dChmYWxzZSkKLSAgICAsIG1fc2luZ2xlRmls ZU1vZGUoZmFsc2UpCisgICAgLCBtX2N1c3RvbU1vZGUoZmFsc2UpCiAgICAgLCBtX2dyYXBoaWNz QmFzZWQoZmFsc2UpCiAgICAgLCBtX3BlcnNpc3RlbnRTdG9yYWdlUGF0aChRU3RyaW5nKGdldGVu digiRFVNUFJFTkRFUlRSRUVfVEVNUCIpKSkKIHsKQEAgLTYwNSw2ICs2MDUsMjkgQEAKICAgICBw cm9jZXNzTGluZShRU3RyaW5nOjpmcm9tTG9jYWw4Qml0KGxpbmUuY29uc3REYXRhKCksIGxpbmUu bGVuZ3RoKCkpKTsKIH0KIAordm9pZCBEdW1wUmVuZGVyVHJlZTo6cHJvY2Vzc0FyZ3NMaW5lKGNv bnN0IFFTdHJpbmdMaXN0ICZhcmdzKQoreworICAgIHNldEN1c3RvbU1vZGUodHJ1ZSk7CisKKyAg ICBmb3IgKGludCBpID0gMTsgaSA8IGFyZ3Muc2l6ZSgpOyArK2kpCisgICAgICAgIGlmICghYXJn cy5hdChpKS5zdGFydHNXaXRoKCctJykpCisgICAgICAgICAgICBtX2N1c3RvbU1vZGVUZXN0TGlz dC5hcHBlbmQoYXJnc1tpXSk7CisKKyAgICBwcm9jZXNzTGluZShtX2N1c3RvbU1vZGVUZXN0TGlz dC5maXJzdCgpKTsKKyAgICBtX2N1c3RvbU1vZGVUZXN0TGlzdC5yZW1vdmVGaXJzdCgpOworCisg ICAgY29ubmVjdCh0aGlzLCBTSUdOQUwocmVhZHkoKSksIHRoaXMsIFNMT1QobG9hZE5leHRUZXN0 SW5DdXN0b21Nb2RlKCkpKTsKK30KKwordm9pZCBEdW1wUmVuZGVyVHJlZTo6bG9hZE5leHRUZXN0 SW5DdXN0b21Nb2RlKCkKK3sKKyAgICBpZiAobV9jdXN0b21Nb2RlVGVzdExpc3QuaXNFbXB0eSgp KQorICAgICAgICBlbWl0IHF1aXQoKTsKKworICAgIHByb2Nlc3NMaW5lKG1fY3VzdG9tTW9kZVRl c3RMaXN0LmZpcnN0KCkpOworICAgIG1fY3VzdG9tTW9kZVRlc3RMaXN0LnJlbW92ZUZpcnN0KCk7 Cit9CisKIHZvaWQgRHVtcFJlbmRlclRyZWU6OnByb2Nlc3NMaW5lKGNvbnN0IFFTdHJpbmcgJmlu cHV0KQogewogICAgIFFTdHJpbmcgbGluZSA9IGlucHV0OwpAQCAtNjM2LDExICs2NTksNyBAQAog ICAgICAgICAgICAgICAgIGZpID0gUUZpbGVJbmZvKGN1cnJlbnREaXIsIGxpbmUucHJlcGVuZChR TGF0aW4xU3RyaW5nKCJMYXlvdXRUZXN0cy8iKSkpOwogCiAgICAgICAgICAgICBpZiAoIWZpLmV4 aXN0cygpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGlzU2luZ2xlRmlsZU1vZGUoKSkKLSAgICAg ICAgICAgICAgICAgICAgZW1pdCBxdWl0KCk7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAg ICAgICAgICAgICAgICBlbWl0IHJlYWR5KCk7Ci0KKyAgICAgICAgICAgICAgICBlbWl0IHJlYWR5 KCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogCkBAIC04MzQsNyAr ODUzLDcgQEAKIAogICAgIFFXZWJGcmFtZSAqbWFpbkZyYW1lID0gbV9wYWdlLT5tYWluRnJhbWUo KTsKIAotICAgIGlmIChpc1NpbmdsZUZpbGVNb2RlKCkpIHsKKyAgICBpZiAoaXNDdXN0b21Nb2Rl KCkpIHsKICAgICAgICAgUVN0cmluZyBtYXJrdXAgPSBtYWluRnJhbWUtPnRvSHRtbCgpOwogICAg ICAgICBmcHJpbnRmKHN0ZG91dCwgIlNvdXJjZTpcblxuJXNcbiIsIG1hcmt1cC50b1V0ZjgoKS5j b25zdERhdGEoKSk7CiAgICAgfQpAQCAtOTIyLDEwICs5NDEsNyBAQAogICAgIGZmbHVzaChzdGRv dXQpOwogICAgIGZmbHVzaChzdGRlcnIpOwogCi0gICAgaWYgKGlzU2luZ2xlRmlsZU1vZGUoKSkK LSAgICAgICAgZW1pdCBxdWl0KCk7Ci0gICAgZWxzZQotICAgICAgICBlbWl0IHJlYWR5KCk7Cisg ICAgIGVtaXQgcmVhZHkoKTsKIH0KIAogdm9pZCBEdW1wUmVuZGVyVHJlZTo6dGl0bGVDaGFuZ2Vk KGNvbnN0IFFTdHJpbmcgJnMpCg== 65405 2010-08-25 06:01:50 -0700 2010-08-26 02:50:49 -0700 patch 44012.patch text/plain 6887 maheshk ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2ODdmZjY5Li45YjA5MmRlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTAtMDgt MjUgIE1haGVzaCBLdWxrYXJuaSAgPG1haGVzaC5rdWxrYXJuaUBub2tpYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1FUXSBEdW1wUmVuZGVy VHJlZSBydW5zIG9ubHkgb25lIHRlc3QgZnJvbSBjb21tYW5kIG1vZGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0MDEyCisKKyAgICAgICAgRW5hYmxl cyBzdXBwb3J0IHRvIHJ1biBtdWx0aXBsZSB0ZXN0IGZpbGVzIGFuZCBzaW5nbGUKKyAgICAgICAg Zm9sZGVyIGNvbnRhaW5pbmcgaHRtbCBmaWxlcyBpbiBzdGFuZCBhbG9uZSBtb2RlLiAKKworICAg ICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RHVtcFJlbmRlclRyZWU6OkR1bXBSZW5kZXJUcmVlKToKKyAgICAgICAgKFdlYkNv cmU6OkR1bXBSZW5kZXJUcmVlOjpwcm9jZXNzQXJnc0xpbmUpOgorICAgICAgICAoV2ViQ29yZTo6 RHVtcFJlbmRlclRyZWU6OmxvYWROZXh0VGVzdEluU3RhbmRBbG9uZU1vZGUpOgorICAgICAgICAo V2ViQ29yZTo6RHVtcFJlbmRlclRyZWU6OnByb2Nlc3NMaW5lKToKKyAgICAgICAgKFdlYkNvcmU6 OkR1bXBSZW5kZXJUcmVlOjpkdW1wKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9EdW1w UmVuZGVyVHJlZVF0Lmg6CisgICAgICAgIChXZWJDb3JlOjpEdW1wUmVuZGVyVHJlZTo6c2V0U3Rh bmRBbG9uZU1vZGUpOgorICAgICAgICAoV2ViQ29yZTo6RHVtcFJlbmRlclRyZWU6OmlzU3RhbmRB bG9uZU1vZGUpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L21haW4uY3BwOgorICAgICAg ICAobWFpbik6CisKIDIwMTAtMDgtMTggIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5jcHAgYi9XZWJLaXRUb29scy9EdW1w UmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcAppbmRleCA0YTU3ZDFkLi5hOTFlM2E5 IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJl ZVF0LmNwcAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJl ZVF0LmNwcApAQCAtMzkxLDcgKzM5MSw3IEBAIER1bXBSZW5kZXJUcmVlOjpEdW1wUmVuZGVyVHJl ZSgpCiAgICAgOiBtX2R1bXBQaXhlbHMoZmFsc2UpCiAgICAgLCBtX3N0ZGluKDApCiAgICAgLCBt X2VuYWJsZVRleHRPdXRwdXQoZmFsc2UpCi0gICAgLCBtX3NpbmdsZUZpbGVNb2RlKGZhbHNlKQor ICAgICwgbV9zdGFuZEFsb25lTW9kZShmYWxzZSkKICAgICAsIG1fZ3JhcGhpY3NCYXNlZChmYWxz ZSkKICAgICAsIG1fcGVyc2lzdGVudFN0b3JhZ2VQYXRoKFFTdHJpbmcoZ2V0ZW52KCJEVU1QUkVO REVSVFJFRV9URU1QIikpKQogewpAQCAtNjA1LDYgKzYwNSwzOCBAQCB2b2lkIER1bXBSZW5kZXJU cmVlOjpyZWFkTGluZSgpCiAgICAgcHJvY2Vzc0xpbmUoUVN0cmluZzo6ZnJvbUxvY2FsOEJpdChs aW5lLmNvbnN0RGF0YSgpLCBsaW5lLmxlbmd0aCgpKSk7CiB9CiAKK3ZvaWQgRHVtcFJlbmRlclRy ZWU6OnByb2Nlc3NBcmdzTGluZShjb25zdCBRU3RyaW5nTGlzdCAmYXJncykKK3sKKyAgICBzZXRT dGFuZEFsb25lTW9kZSh0cnVlKTsKKworICAgIGZvciAoaW50IGkgPSAxOyBpIDwgYXJncy5zaXpl KCk7ICsraSkKKyAgICAgICAgaWYgKCFhcmdzLmF0KGkpLnN0YXJ0c1dpdGgoJy0nKSkKKyAgICAg ICAgICAgIG1fc3RhbmRBbG9uZU1vZGVUZXN0TGlzdC5hcHBlbmQoYXJnc1tpXSk7CisKKyAgICBR RmlsZUluZm8gZmlyc3RFbnRyeShtX3N0YW5kQWxvbmVNb2RlVGVzdExpc3QuZmlyc3QoKSk7Cisg ICAgaWYgKGZpcnN0RW50cnkuaXNEaXIoKSkgeworICAgICAgICBRRGlyIGZvbGRlckVudHJ5KG1f c3RhbmRBbG9uZU1vZGVUZXN0TGlzdC5maXJzdCgpKTsKKyAgICAgICAgUVN0cmluZ0xpc3Qgb25s eUh0bWxzKCIqLmh0bWwiKTsKKyAgICAgICAgbV9zdGFuZEFsb25lTW9kZVRlc3RMaXN0ID0gZm9s ZGVyRW50cnkuZW50cnlMaXN0KG9ubHlIdG1scywgUURpcjo6RmlsZXMpOworICAgICAgICBmb3Ig KGludCBpID0gMDsgaSA8IG1fc3RhbmRBbG9uZU1vZGVUZXN0TGlzdC5zaXplKCk7ICsraSkKKyAg ICAgICAgICAgIG1fc3RhbmRBbG9uZU1vZGVUZXN0TGlzdFtpXSA9IGZvbGRlckVudHJ5LmFic29s dXRlRmlsZVBhdGgobV9zdGFuZEFsb25lTW9kZVRlc3RMaXN0W2ldKTsKKyAgICB9CisKKyAgICBw cm9jZXNzTGluZShtX3N0YW5kQWxvbmVNb2RlVGVzdExpc3QuZmlyc3QoKSk7CisgICAgbV9zdGFu ZEFsb25lTW9kZVRlc3RMaXN0LnJlbW92ZUZpcnN0KCk7CisKKyAgICBjb25uZWN0KHRoaXMsIFNJ R05BTChyZWFkeSgpKSwgdGhpcywgU0xPVChsb2FkTmV4dFRlc3RJblN0YW5kQWxvbmVNb2RlKCkp KTsKK30KKwordm9pZCBEdW1wUmVuZGVyVHJlZTo6bG9hZE5leHRUZXN0SW5TdGFuZEFsb25lTW9k ZSgpCit7CisgICAgaWYgKG1fc3RhbmRBbG9uZU1vZGVUZXN0TGlzdC5pc0VtcHR5KCkpCisgICAg ICAgIGVtaXQgcXVpdCgpOworCisgICAgcHJvY2Vzc0xpbmUobV9zdGFuZEFsb25lTW9kZVRlc3RM aXN0LmZpcnN0KCkpOworICAgIG1fc3RhbmRBbG9uZU1vZGVUZXN0TGlzdC5yZW1vdmVGaXJzdCgp OworfQorCiB2b2lkIER1bXBSZW5kZXJUcmVlOjpwcm9jZXNzTGluZShjb25zdCBRU3RyaW5nICZp bnB1dCkKIHsKICAgICBRU3RyaW5nIGxpbmUgPSBpbnB1dDsKQEAgLTYzNiwxMSArNjY4LDcgQEAg dm9pZCBEdW1wUmVuZGVyVHJlZTo6cHJvY2Vzc0xpbmUoY29uc3QgUVN0cmluZyAmaW5wdXQpCiAg ICAgICAgICAgICAgICAgZmkgPSBRRmlsZUluZm8oY3VycmVudERpciwgbGluZS5wcmVwZW5kKFFM YXRpbjFTdHJpbmcoIkxheW91dFRlc3RzLyIpKSk7CiAKICAgICAgICAgICAgIGlmICghZmkuZXhp c3RzKCkpIHsKLSAgICAgICAgICAgICAgICBpZiAoaXNTaW5nbGVGaWxlTW9kZSgpKQotICAgICAg ICAgICAgICAgICAgICBlbWl0IHF1aXQoKTsKLSAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAg ICAgICAgICAgICAgIGVtaXQgcmVhZHkoKTsKLQorICAgICAgICAgICAgICAgIGVtaXQgcmVhZHko KTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKQEAgLTgzNCw3ICs4 NjIsNyBAQCB2b2lkIER1bXBSZW5kZXJUcmVlOjpkdW1wKCkKIAogICAgIFFXZWJGcmFtZSAqbWFp bkZyYW1lID0gbV9wYWdlLT5tYWluRnJhbWUoKTsKIAotICAgIGlmIChpc1NpbmdsZUZpbGVNb2Rl KCkpIHsKKyAgICBpZiAoaXNTdGFuZEFsb25lTW9kZSgpKSB7CiAgICAgICAgIFFTdHJpbmcgbWFy a3VwID0gbWFpbkZyYW1lLT50b0h0bWwoKTsKICAgICAgICAgZnByaW50ZihzdGRvdXQsICJTb3Vy Y2U6XG5cbiVzXG4iLCBtYXJrdXAudG9VdGY4KCkuY29uc3REYXRhKCkpOwogICAgIH0KQEAgLTky MiwxMCArOTUwLDcgQEAgdm9pZCBEdW1wUmVuZGVyVHJlZTo6ZHVtcCgpCiAgICAgZmZsdXNoKHN0 ZG91dCk7CiAgICAgZmZsdXNoKHN0ZGVycik7CiAKLSAgICBpZiAoaXNTaW5nbGVGaWxlTW9kZSgp KQotICAgICAgICBlbWl0IHF1aXQoKTsKLSAgICBlbHNlCi0gICAgICAgIGVtaXQgcmVhZHkoKTsK KyAgICAgZW1pdCByZWFkeSgpOwogfQogCiB2b2lkIER1bXBSZW5kZXJUcmVlOjp0aXRsZUNoYW5n ZWQoY29uc3QgUVN0cmluZyAmcykKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJU cmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuaCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0 L0R1bXBSZW5kZXJUcmVlUXQuaAppbmRleCBkZTBjNmM1Li41NGFhNDg0IDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmgKKysrIGIvV2Vi S2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5oCkBAIC03OSw5ICs3 OSw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFRleHRPdXRwdXRFbmFibGVkKGJvb2wgZW5hYmxl KSB7IG1fZW5hYmxlVGV4dE91dHB1dCA9IGVuYWJsZTsgfQogICAgIGJvb2wgaXNUZXh0T3V0cHV0 RW5hYmxlZCgpIHsgcmV0dXJuIG1fZW5hYmxlVGV4dE91dHB1dDsgfQogCi0gICAgdm9pZCBzZXRT aW5nbGVGaWxlTW9kZShib29sIGZsYWcpIHsgbV9zaW5nbGVGaWxlTW9kZSA9IGZsYWc7IH0KLSAg ICBib29sIGlzU2luZ2xlRmlsZU1vZGUoKSB7IHJldHVybiBtX3NpbmdsZUZpbGVNb2RlOyB9Ci0K ICAgICB2b2lkIHNldEdyYXBoaWNzQmFzZWQoYm9vbCBmbGFnKSB7IG1fZ3JhcGhpY3NCYXNlZCA9 IGZsYWc7IH0KICAgICBib29sIGlzR3JhcGhpY3NCYXNlZCgpIHsgcmV0dXJuIG1fZ3JhcGhpY3NC YXNlZDsgfQogCkBAIC0xMDYsNiArMTAzLDcgQEAgcHVibGljOgogI2lmIGRlZmluZWQoUV9XU19Y MTEpCiAgICAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZUZvbnRzKCk7CiAjZW5kaWYKKyAgICB2b2lk IHByb2Nlc3NBcmdzTGluZShjb25zdCBRU3RyaW5nTGlzdCYpOwogCiBwdWJsaWMgUV9TTE9UUzoK ICAgICB2b2lkIGluaXRKU09iamVjdHMoKTsKQEAgLTEyOCw4ICsxMjYsMTIgQEAgcHJpdmF0ZSBR X1NMT1RTOgogICAgIHZvaWQgc2hvd1BhZ2UoKTsKICAgICB2b2lkIGhpZGVQYWdlKCk7CiAgICAg dm9pZCBkcnlSdW5QcmludChRV2ViRnJhbWUqKTsKKyAgICB2b2lkIGxvYWROZXh0VGVzdEluU3Rh bmRBbG9uZU1vZGUoKTsKIAogcHJpdmF0ZToKKyAgICB2b2lkIHNldFN0YW5kQWxvbmVNb2RlKGJv b2wgZmxhZykgeyBtX3N0YW5kQWxvbmVNb2RlID0gZmxhZzsgfQorICAgIGJvb2wgaXNTdGFuZEFs b25lTW9kZSgpIHsgcmV0dXJuIG1fc3RhbmRBbG9uZU1vZGU7IH0KKwogICAgIFFTdHJpbmcgZHVt cEZyYW1lc0FzVGV4dChRV2ViRnJhbWUqIGZyYW1lKTsKICAgICBRU3RyaW5nIGR1bXBCYWNrRm9y d2FyZExpc3QoUVdlYlBhZ2UqIHBhZ2UpOwogICAgIFFTdHJpbmcgZHVtcEZyYW1lU2Nyb2xsUG9z aXRpb24oUVdlYkZyYW1lKiBmcmFtZSk7CkBAIC0xMzcsNiArMTM5LDcgQEAgcHJpdmF0ZToKIAog ICAgIGJvb2wgbV9kdW1wUGl4ZWxzOwogICAgIFFTdHJpbmcgbV9leHBlY3RlZEhhc2g7CisgICAg UVN0cmluZ0xpc3QgbV9zdGFuZEFsb25lTW9kZVRlc3RMaXN0OwogCiAgICAgV2ViUGFnZSAqbV9w YWdlOwogICAgIFFXaWRnZXQqIG1fbWFpblZpZXc7CkBAIC0xNTAsNyArMTUzLDcgQEAgcHJpdmF0 ZToKIAogICAgIFFMaXN0PFFPYmplY3QqPiB3aW5kb3dzOwogICAgIGJvb2wgbV9lbmFibGVUZXh0 T3V0cHV0OwotICAgIGJvb2wgbV9zaW5nbGVGaWxlTW9kZTsKKyAgICBib29sIG1fc3RhbmRBbG9u ZU1vZGU7CiAgICAgYm9vbCBtX2dyYXBoaWNzQmFzZWQ7CiAgICAgUVN0cmluZyBtX3BlcnNpc3Rl bnRTdG9yYWdlUGF0aDsKIH07CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9xdC9tYWluLmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L21haW4uY3BwCmlu ZGV4IDdkMWMwOGMuLjI1YWJiN2MgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJU cmVlL3F0L21haW4uY3BwCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L21haW4u Y3BwCkBAIC0xNDMsNyArMTQzLDggQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkK IAogICAgIFFTdHJpbmdMaXN0IGFyZ3MgPSBhcHAuYXJndW1lbnRzKCk7CiAgICAgaWYgKGFyZ3Mu Y291bnQoKSA8IDIpIHsKLSAgICAgICAgcURlYnVnKCkgPDwgIlVzYWdlOiBEdW1wUmVuZGVyVHJl ZSBbLXZ8LS1waXhlbC10ZXN0c10gZmlsZW5hbWUiOworICAgICAgICBxRGVidWcoKSA8PCAiVXNh Z2U6IER1bXBSZW5kZXJUcmVlIFstdnwtLXBpeGVsLXRlc3RzXSBmaWxlbmFtZSBbZmlsZW5hbWUy Li5uXSI7CisgICAgICAgIHFEZWJ1ZygpIDw8ICJPciBmb2xkZXIgY29udGFpbmluZyBodG1sIGZp bGVzOiBEdW1wUmVuZGVyVHJlZSBbLXZ8LS1waXhlbC10ZXN0c10gZGlycGF0aCI7CiAgICAgICAg IGV4aXQoMCk7CiAgICAgfQogCkBAIC0xNjEsMTUgKzE2Miw4IEBAIGludCBtYWluKGludCBhcmdj LCBjaGFyKiBhcmd2W10pCiAgICAgaWYgKGFyZ3MuY29udGFpbnMoUUxhdGluMVN0cmluZygiLSIp KSkgewogICAgICAgICBRT2JqZWN0Ojpjb25uZWN0KCZkdW1wZXIsIFNJR05BTChyZWFkeSgpKSwg JmR1bXBlciwgU0xPVChyZWFkTGluZSgpKSwgUXQ6OlF1ZXVlZENvbm5lY3Rpb24pOwogICAgICAg ICBRVGltZXI6OnNpbmdsZVNob3QoMCwgJmR1bXBlciwgU0xPVChyZWFkTGluZSgpKSk7Ci0gICAg fSBlbHNlIHsKLSAgICAgICAgZHVtcGVyLnNldFNpbmdsZUZpbGVNb2RlKHRydWUpOwotICAgICAg ICBmb3IgKGludCBpID0gMTsgaSA8IGFyZ3Muc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgICAgIGlm ICghYXJncy5hdChpKS5zdGFydHNXaXRoKCctJykpIHsKLSAgICAgICAgICAgICAgICBkdW1wZXIu cHJvY2Vzc0xpbmUoYXJncy5hdChpKSk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg ICAgICB9Ci0gICAgICAgIH0KLSAgICB9CisgICAgfSBlbHNlCisgICAgICAgIGR1bXBlci5wcm9j ZXNzQXJnc0xpbmUoYXJncyk7CiAKICAgICByZXR1cm4gYXBwLmV4ZWMoKTsKIAo= 65537 2010-08-26 02:50:49 -0700 2010-08-26 03:19:50 -0700 patch 44012.patch text/plain 7115 maheshk ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2ODdmZjY5Li45YjA5MmRlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTAtMDgt MjUgIE1haGVzaCBLdWxrYXJuaSAgPG1haGVzaC5rdWxrYXJuaUBub2tpYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1FUXSBEdW1wUmVuZGVy VHJlZSBydW5zIG9ubHkgb25lIHRlc3QgZnJvbSBjb21tYW5kIG1vZGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0MDEyCisKKyAgICAgICAgRW5hYmxl cyBzdXBwb3J0IHRvIHJ1biBtdWx0aXBsZSB0ZXN0IGZpbGVzIGFuZCBzaW5nbGUKKyAgICAgICAg Zm9sZGVyIGNvbnRhaW5pbmcgaHRtbCBmaWxlcyBpbiBzdGFuZCBhbG9uZSBtb2RlLiAKKworICAg ICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RHVtcFJlbmRlclRyZWU6OkR1bXBSZW5kZXJUcmVlKToKKyAgICAgICAgKFdlYkNv cmU6OkR1bXBSZW5kZXJUcmVlOjpwcm9jZXNzQXJnc0xpbmUpOgorICAgICAgICAoV2ViQ29yZTo6 RHVtcFJlbmRlclRyZWU6OmxvYWROZXh0VGVzdEluU3RhbmRBbG9uZU1vZGUpOgorICAgICAgICAo V2ViQ29yZTo6RHVtcFJlbmRlclRyZWU6OnByb2Nlc3NMaW5lKToKKyAgICAgICAgKFdlYkNvcmU6 OkR1bXBSZW5kZXJUcmVlOjpkdW1wKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9EdW1w UmVuZGVyVHJlZVF0Lmg6CisgICAgICAgIChXZWJDb3JlOjpEdW1wUmVuZGVyVHJlZTo6c2V0U3Rh bmRBbG9uZU1vZGUpOgorICAgICAgICAoV2ViQ29yZTo6RHVtcFJlbmRlclRyZWU6OmlzU3RhbmRB bG9uZU1vZGUpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L21haW4uY3BwOgorICAgICAg ICAobWFpbik6CisKIDIwMTAtMDgtMTggIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5jcHAgYi9XZWJLaXRUb29scy9EdW1w UmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcAppbmRleCA0YTU3ZDFkLi45MmUxNTA2 IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJl ZVF0LmNwcAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJl ZVF0LmNwcApAQCAtMzkxLDcgKzM5MSw3IEBAIER1bXBSZW5kZXJUcmVlOjpEdW1wUmVuZGVyVHJl ZSgpCiAgICAgOiBtX2R1bXBQaXhlbHMoZmFsc2UpCiAgICAgLCBtX3N0ZGluKDApCiAgICAgLCBt X2VuYWJsZVRleHRPdXRwdXQoZmFsc2UpCi0gICAgLCBtX3NpbmdsZUZpbGVNb2RlKGZhbHNlKQor ICAgICwgbV9zdGFuZEFsb25lTW9kZShmYWxzZSkKICAgICAsIG1fZ3JhcGhpY3NCYXNlZChmYWxz ZSkKICAgICAsIG1fcGVyc2lzdGVudFN0b3JhZ2VQYXRoKFFTdHJpbmcoZ2V0ZW52KCJEVU1QUkVO REVSVFJFRV9URU1QIikpKQogewpAQCAtNjA1LDYgKzYwNSw0MCBAQCB2b2lkIER1bXBSZW5kZXJU cmVlOjpyZWFkTGluZSgpCiAgICAgcHJvY2Vzc0xpbmUoUVN0cmluZzo6ZnJvbUxvY2FsOEJpdChs aW5lLmNvbnN0RGF0YSgpLCBsaW5lLmxlbmd0aCgpKSk7CiB9CiAKK3ZvaWQgRHVtcFJlbmRlclRy ZWU6OnByb2Nlc3NBcmdzTGluZShjb25zdCBRU3RyaW5nTGlzdCAmYXJncykKK3sKKyAgICBzZXRT dGFuZEFsb25lTW9kZSh0cnVlKTsKKworICAgIGZvciAoaW50IGkgPSAxOyBpIDwgYXJncy5zaXpl KCk7ICsraSkKKyAgICAgICAgaWYgKCFhcmdzLmF0KGkpLnN0YXJ0c1dpdGgoJy0nKSkKKyAgICAg ICAgICAgIG1fc3RhbmRBbG9uZU1vZGVUZXN0TGlzdC5hcHBlbmQoYXJnc1tpXSk7CisKKyAgICBR RmlsZUluZm8gZmlyc3RFbnRyeShtX3N0YW5kQWxvbmVNb2RlVGVzdExpc3QuZmlyc3QoKSk7Cisg ICAgaWYgKGZpcnN0RW50cnkuaXNEaXIoKSkgeworICAgICAgICBRRGlyIGZvbGRlckVudHJ5KG1f c3RhbmRBbG9uZU1vZGVUZXN0TGlzdC5maXJzdCgpKTsKKyAgICAgICAgUVN0cmluZ0xpc3Qgc3Vw cG9ydGVkRXh0OworICAgICAgICAvLyBjaGVjayBmb3IgYWxsIHN1cHBvcnRlZCBleHRlbnNpb25z IChmcm9tIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3Rlc3Rf ZmlsZXMucHkpCisgICAgICAgIHN1cHBvcnRlZEV4dCA8PCAiKi5odG1sIiA8PCAiKi5zaHRtbCIg PDwgIioueG1sIiA8PCAiKi54aHRtbCIgPDwgIioueGh0bWxtcCIgPDwgIioucGwiIDw8ICIqLnBo cCIgPDwgIiouc3ZnIjsKKyAgICAgICAgbV9zdGFuZEFsb25lTW9kZVRlc3RMaXN0ID0gZm9sZGVy RW50cnkuZW50cnlMaXN0KHN1cHBvcnRlZEV4dCwgUURpcjo6RmlsZXMpOworICAgICAgICBmb3Ig KGludCBpID0gMDsgaSA8IG1fc3RhbmRBbG9uZU1vZGVUZXN0TGlzdC5zaXplKCk7ICsraSkKKyAg ICAgICAgICAgIG1fc3RhbmRBbG9uZU1vZGVUZXN0TGlzdFtpXSA9IGZvbGRlckVudHJ5LmFic29s dXRlRmlsZVBhdGgobV9zdGFuZEFsb25lTW9kZVRlc3RMaXN0W2ldKTsKKyAgICB9CisKKyAgICBw cm9jZXNzTGluZShtX3N0YW5kQWxvbmVNb2RlVGVzdExpc3QuZmlyc3QoKSk7CisgICAgbV9zdGFu ZEFsb25lTW9kZVRlc3RMaXN0LnJlbW92ZUZpcnN0KCk7CisKKyAgICBjb25uZWN0KHRoaXMsIFNJ R05BTChyZWFkeSgpKSwgdGhpcywgU0xPVChsb2FkTmV4dFRlc3RJblN0YW5kQWxvbmVNb2RlKCkp KTsKK30KKwordm9pZCBEdW1wUmVuZGVyVHJlZTo6bG9hZE5leHRUZXN0SW5TdGFuZEFsb25lTW9k ZSgpCit7CisgICAgaWYgKG1fc3RhbmRBbG9uZU1vZGVUZXN0TGlzdC5pc0VtcHR5KCkpCisgICAg ICAgIGVtaXQgcXVpdCgpOworCisgICAgcHJvY2Vzc0xpbmUobV9zdGFuZEFsb25lTW9kZVRlc3RM aXN0LmZpcnN0KCkpOworICAgIG1fc3RhbmRBbG9uZU1vZGVUZXN0TGlzdC5yZW1vdmVGaXJzdCgp OworfQorCiB2b2lkIER1bXBSZW5kZXJUcmVlOjpwcm9jZXNzTGluZShjb25zdCBRU3RyaW5nICZp bnB1dCkKIHsKICAgICBRU3RyaW5nIGxpbmUgPSBpbnB1dDsKQEAgLTYzNiwxMSArNjcwLDcgQEAg dm9pZCBEdW1wUmVuZGVyVHJlZTo6cHJvY2Vzc0xpbmUoY29uc3QgUVN0cmluZyAmaW5wdXQpCiAg ICAgICAgICAgICAgICAgZmkgPSBRRmlsZUluZm8oY3VycmVudERpciwgbGluZS5wcmVwZW5kKFFM YXRpbjFTdHJpbmcoIkxheW91dFRlc3RzLyIpKSk7CiAKICAgICAgICAgICAgIGlmICghZmkuZXhp c3RzKCkpIHsKLSAgICAgICAgICAgICAgICBpZiAoaXNTaW5nbGVGaWxlTW9kZSgpKQotICAgICAg ICAgICAgICAgICAgICBlbWl0IHF1aXQoKTsKLSAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAg ICAgICAgICAgICAgIGVtaXQgcmVhZHkoKTsKLQorICAgICAgICAgICAgICAgIGVtaXQgcmVhZHko KTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKQEAgLTgzNCw3ICs4 NjQsNyBAQCB2b2lkIER1bXBSZW5kZXJUcmVlOjpkdW1wKCkKIAogICAgIFFXZWJGcmFtZSAqbWFp bkZyYW1lID0gbV9wYWdlLT5tYWluRnJhbWUoKTsKIAotICAgIGlmIChpc1NpbmdsZUZpbGVNb2Rl KCkpIHsKKyAgICBpZiAoaXNTdGFuZEFsb25lTW9kZSgpKSB7CiAgICAgICAgIFFTdHJpbmcgbWFy a3VwID0gbWFpbkZyYW1lLT50b0h0bWwoKTsKICAgICAgICAgZnByaW50ZihzdGRvdXQsICJTb3Vy Y2U6XG5cbiVzXG4iLCBtYXJrdXAudG9VdGY4KCkuY29uc3REYXRhKCkpOwogICAgIH0KQEAgLTky MiwxMCArOTUyLDcgQEAgdm9pZCBEdW1wUmVuZGVyVHJlZTo6ZHVtcCgpCiAgICAgZmZsdXNoKHN0 ZG91dCk7CiAgICAgZmZsdXNoKHN0ZGVycik7CiAKLSAgICBpZiAoaXNTaW5nbGVGaWxlTW9kZSgp KQotICAgICAgICBlbWl0IHF1aXQoKTsKLSAgICBlbHNlCi0gICAgICAgIGVtaXQgcmVhZHkoKTsK KyAgICAgZW1pdCByZWFkeSgpOwogfQogCiB2b2lkIER1bXBSZW5kZXJUcmVlOjp0aXRsZUNoYW5n ZWQoY29uc3QgUVN0cmluZyAmcykKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJU cmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuaCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0 L0R1bXBSZW5kZXJUcmVlUXQuaAppbmRleCBkZTBjNmM1Li41NGFhNDg0IDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmgKKysrIGIvV2Vi S2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5oCkBAIC03OSw5ICs3 OSw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFRleHRPdXRwdXRFbmFibGVkKGJvb2wgZW5hYmxl KSB7IG1fZW5hYmxlVGV4dE91dHB1dCA9IGVuYWJsZTsgfQogICAgIGJvb2wgaXNUZXh0T3V0cHV0 RW5hYmxlZCgpIHsgcmV0dXJuIG1fZW5hYmxlVGV4dE91dHB1dDsgfQogCi0gICAgdm9pZCBzZXRT aW5nbGVGaWxlTW9kZShib29sIGZsYWcpIHsgbV9zaW5nbGVGaWxlTW9kZSA9IGZsYWc7IH0KLSAg ICBib29sIGlzU2luZ2xlRmlsZU1vZGUoKSB7IHJldHVybiBtX3NpbmdsZUZpbGVNb2RlOyB9Ci0K ICAgICB2b2lkIHNldEdyYXBoaWNzQmFzZWQoYm9vbCBmbGFnKSB7IG1fZ3JhcGhpY3NCYXNlZCA9 IGZsYWc7IH0KICAgICBib29sIGlzR3JhcGhpY3NCYXNlZCgpIHsgcmV0dXJuIG1fZ3JhcGhpY3NC YXNlZDsgfQogCkBAIC0xMDYsNiArMTAzLDcgQEAgcHVibGljOgogI2lmIGRlZmluZWQoUV9XU19Y MTEpCiAgICAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZUZvbnRzKCk7CiAjZW5kaWYKKyAgICB2b2lk IHByb2Nlc3NBcmdzTGluZShjb25zdCBRU3RyaW5nTGlzdCYpOwogCiBwdWJsaWMgUV9TTE9UUzoK ICAgICB2b2lkIGluaXRKU09iamVjdHMoKTsKQEAgLTEyOCw4ICsxMjYsMTIgQEAgcHJpdmF0ZSBR X1NMT1RTOgogICAgIHZvaWQgc2hvd1BhZ2UoKTsKICAgICB2b2lkIGhpZGVQYWdlKCk7CiAgICAg dm9pZCBkcnlSdW5QcmludChRV2ViRnJhbWUqKTsKKyAgICB2b2lkIGxvYWROZXh0VGVzdEluU3Rh bmRBbG9uZU1vZGUoKTsKIAogcHJpdmF0ZToKKyAgICB2b2lkIHNldFN0YW5kQWxvbmVNb2RlKGJv b2wgZmxhZykgeyBtX3N0YW5kQWxvbmVNb2RlID0gZmxhZzsgfQorICAgIGJvb2wgaXNTdGFuZEFs b25lTW9kZSgpIHsgcmV0dXJuIG1fc3RhbmRBbG9uZU1vZGU7IH0KKwogICAgIFFTdHJpbmcgZHVt cEZyYW1lc0FzVGV4dChRV2ViRnJhbWUqIGZyYW1lKTsKICAgICBRU3RyaW5nIGR1bXBCYWNrRm9y d2FyZExpc3QoUVdlYlBhZ2UqIHBhZ2UpOwogICAgIFFTdHJpbmcgZHVtcEZyYW1lU2Nyb2xsUG9z aXRpb24oUVdlYkZyYW1lKiBmcmFtZSk7CkBAIC0xMzcsNiArMTM5LDcgQEAgcHJpdmF0ZToKIAog ICAgIGJvb2wgbV9kdW1wUGl4ZWxzOwogICAgIFFTdHJpbmcgbV9leHBlY3RlZEhhc2g7CisgICAg UVN0cmluZ0xpc3QgbV9zdGFuZEFsb25lTW9kZVRlc3RMaXN0OwogCiAgICAgV2ViUGFnZSAqbV9w YWdlOwogICAgIFFXaWRnZXQqIG1fbWFpblZpZXc7CkBAIC0xNTAsNyArMTUzLDcgQEAgcHJpdmF0 ZToKIAogICAgIFFMaXN0PFFPYmplY3QqPiB3aW5kb3dzOwogICAgIGJvb2wgbV9lbmFibGVUZXh0 T3V0cHV0OwotICAgIGJvb2wgbV9zaW5nbGVGaWxlTW9kZTsKKyAgICBib29sIG1fc3RhbmRBbG9u ZU1vZGU7CiAgICAgYm9vbCBtX2dyYXBoaWNzQmFzZWQ7CiAgICAgUVN0cmluZyBtX3BlcnNpc3Rl bnRTdG9yYWdlUGF0aDsKIH07CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9xdC9tYWluLmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L21haW4uY3BwCmlu ZGV4IDdkMWMwOGMuLjgzNDlkNzMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJU cmVlL3F0L21haW4uY3BwCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L21haW4u Y3BwCkBAIC0xNDMsNyArMTQzLDggQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkK IAogICAgIFFTdHJpbmdMaXN0IGFyZ3MgPSBhcHAuYXJndW1lbnRzKCk7CiAgICAgaWYgKGFyZ3Mu Y291bnQoKSA8IDIpIHsKLSAgICAgICAgcURlYnVnKCkgPDwgIlVzYWdlOiBEdW1wUmVuZGVyVHJl ZSBbLXZ8LS1waXhlbC10ZXN0c10gZmlsZW5hbWUiOworICAgICAgICBxRGVidWcoKSA8PCAiVXNh Z2U6IER1bXBSZW5kZXJUcmVlIFstdnwtLXBpeGVsLXRlc3RzXSBmaWxlbmFtZSBbZmlsZW5hbWUy Li5uXSI7CisgICAgICAgIHFEZWJ1ZygpIDw8ICJPciBmb2xkZXIgY29udGFpbmluZyB0ZXN0IGZp bGVzOiBEdW1wUmVuZGVyVHJlZSBbLXZ8LS1waXhlbC10ZXN0c10gZGlycGF0aCI7CiAgICAgICAg IGV4aXQoMCk7CiAgICAgfQogCkBAIC0xNjEsMTUgKzE2Miw4IEBAIGludCBtYWluKGludCBhcmdj LCBjaGFyKiBhcmd2W10pCiAgICAgaWYgKGFyZ3MuY29udGFpbnMoUUxhdGluMVN0cmluZygiLSIp KSkgewogICAgICAgICBRT2JqZWN0Ojpjb25uZWN0KCZkdW1wZXIsIFNJR05BTChyZWFkeSgpKSwg JmR1bXBlciwgU0xPVChyZWFkTGluZSgpKSwgUXQ6OlF1ZXVlZENvbm5lY3Rpb24pOwogICAgICAg ICBRVGltZXI6OnNpbmdsZVNob3QoMCwgJmR1bXBlciwgU0xPVChyZWFkTGluZSgpKSk7Ci0gICAg fSBlbHNlIHsKLSAgICAgICAgZHVtcGVyLnNldFNpbmdsZUZpbGVNb2RlKHRydWUpOwotICAgICAg ICBmb3IgKGludCBpID0gMTsgaSA8IGFyZ3Muc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgICAgIGlm ICghYXJncy5hdChpKS5zdGFydHNXaXRoKCctJykpIHsKLSAgICAgICAgICAgICAgICBkdW1wZXIu cHJvY2Vzc0xpbmUoYXJncy5hdChpKSk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg ICAgICB9Ci0gICAgICAgIH0KLSAgICB9CisgICAgfSBlbHNlCisgICAgICAgIGR1bXBlci5wcm9j ZXNzQXJnc0xpbmUoYXJncyk7CiAKICAgICByZXR1cm4gYXBwLmV4ZWMoKTsKIAo=