27625 2009-07-23 14:09:11 -0700 cpplint crash when there is a duplicate header followed by another header. 2009-07-24 09:30:51 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 kenneth levin levin manyoso oldest_to_newest 134248 0 kenneth 2009-07-23 14:09:11 -0700 python WebKitTools/Scripts/modules/cpplint.py WebKit/qt/WebCoreSupport/*cpp in current tot 46283, crashes: Backtrace: ... Done processing WebKit/qt/WebCoreSupport/EditCommandQt.cpp WebKit/qt/WebCoreSupport/EditorClientQt.cpp:37: Alphabetical sorting problem. [build/include_order] [4] WebKit/qt/WebCoreSupport/EditorClientQt.cpp:48: "Page.h" already included at WebKit/qt/WebCoreSupport/EditorClientQt.cpp:47 [build/include] [4] Traceback (most recent call last): File "WebKitTools/Scripts/modules/cpplint.py", line 3024, in <module> main() File "WebKitTools/Scripts/modules/cpplint.py", line 3018, in main process_file(filename) File "WebKitTools/Scripts/modules/cpplint.py", line 2878, in process_file process_file_data(filename, file_extension, lines, error) File "WebKitTools/Scripts/modules/cpplint.py", line 2819, in process_file_data include_state, function_state, class_state, error) File "WebKitTools/Scripts/modules/cpplint.py", line 2786, in process_line error) File "WebKitTools/Scripts/modules/cpplint.py", line 2285, in check_language check_include_line(filename, clean_lines, line_number, include_state, error) File "WebKitTools/Scripts/modules/cpplint.py", line 2234, in check_include_line previous_header_type = include_state.header_types[previous_line_number] KeyError: 48 134490 1 33421 levin 2009-07-24 03:12:23 -0700 Created attachment 33421 Proposed fix. 134515 2 kenneth 2009-07-24 05:14:14 -0700 Oh, you beat me to it :-) The patch looks fine, and I find the code clearer now. 134583 3 levin 2009-07-24 09:30:51 -0700 Committed as http://trac.webkit.org/changeset/46357 33421 2009-07-24 03:12:23 -0700 2009-07-24 05:44:35 -0700 Proposed fix. bug27625.txt text/plain 10817 levin ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlMTdmZmE1Li5hNjNmM2JiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMDct MjQgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNwcGxpbnQgY3Jhc2ggd2hlbiB0aGVyZSBp cyBhIGR1cGxpY2F0ZSBoZWFkZXIgZm9sbG93ZWQgYnkgYW5vdGhlciBoZWFkZXIuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzYyNQorCisgICAgICAg ICogU2NyaXB0cy9tb2R1bGVzL2NwcGxpbnQucHk6IEVuc3VyZSB0aGF0IGluY2x1ZGVfc3RhdGUu aGVhZGVyX3R5cGVzIGlzIHVwZGF0ZWQgZXZlbgorICAgICAgICAgIHRoZXJlIGlzIGEgZHVwbGlj YXRlIGhlYWRlciwgd2hpY2ggcmVzdWx0ZWQgaW4gc29tZSBjb2RlIHJlYXJyYW5nZW1lbnQuICBB bHNvLAorICAgICAgICAgIGNoYW5nZWQgc29tZSBpZidzIGluIHRoaXMgZnVuY3Rpb24gdG8gcmV0 dXJuIGVhcmx5LiAgVGhpcyBhdm9pZHMgaGF2aW5nIG5lYXJseSB0aGUKKyAgICAgICAgICB3aG9s ZSBmdW5jdGlvbiBjb250ZW50IGJlaW5nIGluZGVudGVkLgorICAgICAgICAqIFNjcmlwdHMvbW9k dWxlcy9jcHBsaW50X3VuaXR0ZXN0LnB5OiBBZGRlZCBhIHRlc3Qgd2hpY2ggd291bGQgaGF2ZSBl eHBvc2VkIHRoZSBjcmFzaC4KKwogMjAwOS0wNy0yMyAgRWxpIEZpZGxlciAgPGVsaS5maWRsZXJA dG9yY2htb2JpbGUuY29tPgogCiAgICAgICAgICBSZXZpZXdlZCBieSBBZGFtIFRyZWF0LgpkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NwcGxpbnQucHkgYi9XZWJLaXRU b29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludC5weQppbmRleCBlNDRiMmFiLi4yMDMxMzc3IDEw MDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludC5weQorKysgYi9X ZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludC5weQpAQCAtMjE4Niw3NyArMjE4Niw4 MCBAQCBkZWYgY2hlY2tfaW5jbHVkZV9saW5lKGZpbGVuYW1lLCBjbGVhbl9saW5lcywgbGluZV9u dW1iZXIsIGluY2x1ZGVfc3RhdGUsIGVycm9yKQogCiAgICAgbGluZSA9IGNsZWFuX2xpbmVzLmxp bmVzW2xpbmVfbnVtYmVyXQogCi0gICAgIyB3ZSBzaG91bGRuJ3QgaW5jbHVkZSBhIGZpbGUgbW9y ZSB0aGFuIG9uY2UuIGFjdHVhbGx5LCB0aGVyZSBhcmUgYQotICAgICMgaGFuZGZ1bCBvZiBpbnN0 YW5jZXMgd2hlcmUgZG9pbmcgc28gaXMgb2theSwgYnV0IGluIGdlbmVyYWwgaXQncwotICAgICMg bm90LgogICAgIG1hdGNoZWQgPSBfUkVfUEFUVEVSTl9JTkNMVURFLnNlYXJjaChsaW5lKQotICAg IGlmIG1hdGNoZWQ6Ci0gICAgICAgIGluY2x1ZGUgPSBtYXRjaGVkLmdyb3VwKDIpCi0gICAgICAg IGlzX3N5c3RlbSA9IChtYXRjaGVkLmdyb3VwKDEpID09ICc8JykKLSAgICAgICAgaWYgaW5jbHVk ZSBpbiBpbmNsdWRlX3N0YXRlOgotICAgICAgICAgICAgZXJyb3IoZmlsZW5hbWUsIGxpbmVfbnVt YmVyLCAnYnVpbGQvaW5jbHVkZScsIDQsCi0gICAgICAgICAgICAgICAgICAnIiVzIiBhbHJlYWR5 IGluY2x1ZGVkIGF0ICVzOiVzJyAlCi0gICAgICAgICAgICAgICAgICAoaW5jbHVkZSwgZmlsZW5h bWUsIGluY2x1ZGVfc3RhdGVbaW5jbHVkZV0pKQorICAgIGlmIG5vdCBtYXRjaGVkOgorICAgICAg ICByZXR1cm4KKworICAgIGluY2x1ZGUgPSBtYXRjaGVkLmdyb3VwKDIpCisgICAgaXNfc3lzdGVt ID0gKG1hdGNoZWQuZ3JvdXAoMSkgPT0gJzwnKQorCisgICAgIyBMb29rIGZvciBhbnkgb2YgdGhl IHN0cmVhbSBjbGFzc2VzIHRoYXQgYXJlIHBhcnQgb2Ygc3RhbmRhcmQgQysrLgorICAgIGlmIG1h dGNoKHInKGZ8aW5kfGlvfGl8b3xwYXJzZXxwZnxzdGRpb3xzdHJ8KT9zdHJlYW0kJywgaW5jbHVk ZSk6CisgICAgICAgICMgTWFueSB1bml0IHRlc3RzIHVzZSBjb3V0LCBzbyB3ZSBleGVtcHQgdGhl bS4KKyAgICAgICAgaWYgbm90IF9pc190ZXN0X2ZpbGVuYW1lKGZpbGVuYW1lKToKKyAgICAgICAg ICAgIGVycm9yKGZpbGVuYW1lLCBsaW5lX251bWJlciwgJ3JlYWRhYmlsaXR5L3N0cmVhbXMnLCAz LAorICAgICAgICAgICAgICAgICAgJ1N0cmVhbXMgYXJlIGhpZ2hseSBkaXNjb3VyYWdlZC4nKQor CisgICAgIyBMb29rIGZvciBzcGVjaWZpYyBpbmNsdWRlcyB0byBmaXguCisgICAgaWYgaW5jbHVk ZS5zdGFydHN3aXRoKCd3dGYvJykgYW5kIG5vdCBpc19zeXN0ZW06CisgICAgICAgIGVycm9yKGZp bGVuYW1lLCBsaW5lX251bWJlciwgJ2J1aWxkL2luY2x1ZGUnLCA0LAorICAgICAgICAgICAgICAn d3RmIGluY2x1ZGVzIHNob3VsZCBiZSA8d3RmL2ZpbGUuaD4gaW5zdGVhZCBvZiAid3RmL2ZpbGUu aCIuJykKKworICAgIGR1cGxpY2F0ZV9oZWFkZXIgPSBpbmNsdWRlIGluIGluY2x1ZGVfc3RhdGUK KyAgICBpZiBkdXBsaWNhdGVfaGVhZGVyOgorICAgICAgICBlcnJvcihmaWxlbmFtZSwgbGluZV9u dW1iZXIsICdidWlsZC9pbmNsdWRlJywgNCwKKyAgICAgICAgICAgICAgJyIlcyIgYWxyZWFkeSBp bmNsdWRlZCBhdCAlczolcycgJQorICAgICAgICAgICAgICAoaW5jbHVkZSwgZmlsZW5hbWUsIGlu Y2x1ZGVfc3RhdGVbaW5jbHVkZV0pKQorICAgIGVsc2U6CisgICAgICAgIGluY2x1ZGVfc3RhdGVb aW5jbHVkZV0gPSBsaW5lX251bWJlcgorCisgICAgaGVhZGVyX3R5cGUgPSBfY2xhc3NpZnlfaW5j bHVkZShmaWxlbmFtZSwgaW5jbHVkZSwgaXNfc3lzdGVtLCBpbmNsdWRlX3N0YXRlKQorICAgIGlu Y2x1ZGVfc3RhdGUuaGVhZGVyX3R5cGVzW2xpbmVfbnVtYmVyXSA9IGhlYWRlcl90eXBlCisKKyAg ICAjIE9ubHkgcHJvY2VlZCBpZiB0aGlzIGlzbid0IGEgZHVwbGljYXRlIGhlYWRlci4KKyAgICBp ZiBkdXBsaWNhdGVfaGVhZGVyOgorICAgICAgICByZXR1cm4KKworICAgICMgV2Ugd2FudCB0byBl bnN1cmUgdGhhdCBoZWFkZXJzIGFwcGVhciBpbiB0aGUgcmlnaHQgb3JkZXI6CisgICAgIyAxKSBm b3IgaW1wbGVtZW50YXRpb24gZmlsZXM6IGNvbmZpZy5oLCBwcmltYXJ5IGhlYWRlciwgYmxhbmsg bGluZSwgYWxwaGFiZXRpY2FsbHkgc29ydGVkCisgICAgIyAyKSBmb3IgaGVhZGVyIGZpbGVzOiBh bHBoYWJldGljYWxseSBzb3J0ZWQKKyAgICAjIFRoZSBpbmNsdWRlX3N0YXRlIG9iamVjdCBrZWVw cyB0cmFjayBvZiB0aGUgbGFzdCB0eXBlIHNlZW4KKyAgICAjIGFuZCBjb21wbGFpbnMgaWYgdGhl IGhlYWRlciB0eXBlcyBhcmUgb3V0IG9mIG9yZGVyIG9yIG1pc3NpbmcuCisgICAgZXJyb3JfbWVz c2FnZSA9IGluY2x1ZGVfc3RhdGUuY2hlY2tfbmV4dF9pbmNsdWRlX29yZGVyKGhlYWRlcl90eXBl LCBmaWxlbmFtZS5lbmRzd2l0aCgnLmgnKSkKKworICAgICMgQ2hlY2sgdG8gbWFrZSBzdXJlIHdl IGhhdmUgYSBibGFuayBsaW5lIGFmdGVyIHByaW1hcnkgaGVhZGVyLgorICAgIGlmIG5vdCBlcnJv cl9tZXNzYWdlIGFuZCBoZWFkZXJfdHlwZSA9PSBfUFJJTUFSWV9IRUFERVI6CisgICAgICAgICBu ZXh0X2xpbmUgPSBjbGVhbl9saW5lcy5yYXdfbGluZXNbbGluZV9udW1iZXIgKyAxXQorICAgICAg ICAgaWYgbm90IGlzX2JsYW5rX2xpbmUobmV4dF9saW5lKToKKyAgICAgICAgICAgIGVycm9yKGZp bGVuYW1lLCBsaW5lX251bWJlciwgJ2J1aWxkL2luY2x1ZGVfb3JkZXInLCA0LAorICAgICAgICAg ICAgICAgICAgJ1lvdSBzaG91bGQgYWRkIGEgYmxhbmsgbGluZSBhZnRlciBpbXBsZW1lbnRhdGlv biBmaWxlXCdzIG93biBoZWFkZXIuJykKKworICAgICMgQ2hlY2sgdG8gbWFrZSBzdXJlIGFsbCBo ZWFkZXJzIGJlc2lkZXMgY29uZmlnLmggYW5kIHRoZSBwcmltYXJ5IGhlYWRlciBhcmUKKyAgICAj IGFscGhhYmV0aWNhbGx5IHNvcnRlZC4KKyAgICBpZiBub3QgZXJyb3JfbWVzc2FnZSBhbmQgaGVh ZGVyX3R5cGUgPT0gX09USEVSX0hFQURFUjoKKyAgICAgICAgIHByZXZpb3VzX2xpbmVfbnVtYmVy ID0gbGluZV9udW1iZXIgLSAxOworICAgICAgICAgcHJldmlvdXNfbGluZSA9IGNsZWFuX2xpbmVz LmxpbmVzW3ByZXZpb3VzX2xpbmVfbnVtYmVyXQorICAgICAgICAgcHJldmlvdXNfbWF0Y2ggPSBf UkVfUEFUVEVSTl9JTkNMVURFLnNlYXJjaChwcmV2aW91c19saW5lKQorICAgICAgICAgd2hpbGUg KG5vdCBwcmV2aW91c19tYXRjaCBhbmQgcHJldmlvdXNfbGluZV9udW1iZXIgPiAwCisgICAgICAg ICAgICAgICAgYW5kIG5vdCBzZWFyY2gocidcQSgjaWZ8I2lmZGVmfCNpZm5kZWZ8I2Vsc2V8I2Vs aWZ8I2VuZGlmKScsIHByZXZpb3VzX2xpbmUpKToKKyAgICAgICAgICAgIHByZXZpb3VzX2xpbmVf bnVtYmVyIC09IDE7CisgICAgICAgICAgICBwcmV2aW91c19saW5lID0gY2xlYW5fbGluZXMubGlu ZXNbcHJldmlvdXNfbGluZV9udW1iZXJdCisgICAgICAgICAgICBwcmV2aW91c19tYXRjaCA9IF9S RV9QQVRURVJOX0lOQ0xVREUuc2VhcmNoKHByZXZpb3VzX2xpbmUpCisgICAgICAgICBpZiBwcmV2 aW91c19tYXRjaDoKKyAgICAgICAgICAgIHByZXZpb3VzX2hlYWRlcl90eXBlID0gaW5jbHVkZV9z dGF0ZS5oZWFkZXJfdHlwZXNbcHJldmlvdXNfbGluZV9udW1iZXJdCisgICAgICAgICAgICBpZiBw cmV2aW91c19oZWFkZXJfdHlwZSA9PSBfT1RIRVJfSEVBREVSIGFuZCBwcmV2aW91c19saW5lLnN0 cmlwKCkgPiBsaW5lLnN0cmlwKCk6CisgICAgICAgICAgICAgICAgZXJyb3IoZmlsZW5hbWUsIGxp bmVfbnVtYmVyLCAnYnVpbGQvaW5jbHVkZV9vcmRlcicsIDQsCisgICAgICAgICAgICAgICAgICAg ICAgJ0FscGhhYmV0aWNhbCBzb3J0aW5nIHByb2JsZW0uJykKKworICAgIGlmIGVycm9yX21lc3Nh Z2U6CisgICAgICAgIGlmIGZpbGVuYW1lLmVuZHN3aXRoKCcuaCcpOgorICAgICAgICAgICAgZXJy b3IoZmlsZW5hbWUsIGxpbmVfbnVtYmVyLCAnYnVpbGQvaW5jbHVkZV9vcmRlcicsIDQsCisgICAg ICAgICAgICAgICAgICAnJXMgU2hvdWxkIGJlOiBhbHBoYWJldGljYWxseSBzb3J0ZWQuJyAlCisg ICAgICAgICAgICAgICAgICBlcnJvcl9tZXNzYWdlKQogICAgICAgICBlbHNlOgotICAgICAgICAg ICAgaW5jbHVkZV9zdGF0ZVtpbmNsdWRlXSA9IGxpbmVfbnVtYmVyCi0KLSAgICAgICAgICAgICMg V2Ugd2FudCB0byBlbnN1cmUgdGhhdCBoZWFkZXJzIGFwcGVhciBpbiB0aGUgcmlnaHQgb3JkZXI6 Ci0gICAgICAgICAgICAjIDEpIGZvciBpbXBsZW1lbnRhdGlvbiBmaWxlczogY29uZmlnLmgsIHBy aW1hcnkgaGVhZGVyLCBibGFuayBsaW5lLCBhbHBoYWJldGljYWxseSBzb3J0ZWQKLSAgICAgICAg ICAgICMgMikgZm9yIGhlYWRlciBmaWxlczogYWxwaGFiZXRpY2FsbHkgc29ydGVkCi0gICAgICAg ICAgICAjCi0gICAgICAgICAgICAjIFdlIGNsYXNzaWZ5IGVhY2ggaW5jbHVkZSBzdGF0ZW1lbnQg YXMgb25lIG9mIDQgdHlwZXMKLSAgICAgICAgICAgICMgdXNpbmcgYSBudW1iZXIgb2YgdGVjaG5p cXVlcy4gVGhlIGluY2x1ZGVfc3RhdGUgb2JqZWN0IGtlZXBzCi0gICAgICAgICAgICAjIHRyYWNr IG9mIHRoZSBoaWdoZXN0IHR5cGUgc2VlbiwgYW5kIGNvbXBsYWlucyBpZiB3ZSBzZWUgYQotICAg ICAgICAgICAgIyBsb3dlciB0eXBlIGFmdGVyIHRoYXQuCi0gICAgICAgICAgICBoZWFkZXJfdHlw ZSA9IF9jbGFzc2lmeV9pbmNsdWRlKGZpbGVuYW1lLCBpbmNsdWRlLCBpc19zeXN0ZW0sIGluY2x1 ZGVfc3RhdGUpCi0gICAgICAgICAgICBlcnJvcl9tZXNzYWdlID0gaW5jbHVkZV9zdGF0ZS5jaGVj a19uZXh0X2luY2x1ZGVfb3JkZXIoaGVhZGVyX3R5cGUsIGZpbGVuYW1lLmVuZHN3aXRoKCcuaCcp KQotICAgICAgICAgICAgaW5jbHVkZV9zdGF0ZS5oZWFkZXJfdHlwZXNbbGluZV9udW1iZXJdID0g aGVhZGVyX3R5cGUKLQotICAgICAgICAgICAgIyBDaGVjayB0byBtYWtlIHN1cmUgd2UgaGF2ZSBh IGJsYW5rIGxpbmUgYWZ0ZXIgcHJpbWFyeSBoZWFkZXIuCi0gICAgICAgICAgICBpZiBub3QgZXJy b3JfbWVzc2FnZSBhbmQgaGVhZGVyX3R5cGUgPT0gX1BSSU1BUllfSEVBREVSOgotICAgICAgICAg ICAgICAgICBuZXh0X2xpbmUgPSBjbGVhbl9saW5lcy5yYXdfbGluZXNbbGluZV9udW1iZXIgKyAx XQotICAgICAgICAgICAgICAgICBpZiBub3QgaXNfYmxhbmtfbGluZShuZXh0X2xpbmUpOgotICAg ICAgICAgICAgICAgICAgICBlcnJvcihmaWxlbmFtZSwgbGluZV9udW1iZXIsICdidWlsZC9pbmNs dWRlX29yZGVyJywgNCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgJ1lvdSBzaG91bGQgYWRk IGEgYmxhbmsgbGluZSBhZnRlciBpbXBsZW1lbnRhdGlvbiBmaWxlXCdzIG93biBoZWFkZXIuJykK LQotICAgICAgICAgICAgIyBDaGVjayB0byBtYWtlIHN1cmUgYWxsIGhlYWRlcnMgYmVzaWRlcyBj b25maWcuaCBhbmQgdGhlIHByaW1hcnkgaGVhZGVyIGFyZQotICAgICAgICAgICAgIyBhbHBoYWJl dGljYWxseSBzb3J0ZWQuCi0gICAgICAgICAgICBpZiBub3QgZXJyb3JfbWVzc2FnZSBhbmQgaGVh ZGVyX3R5cGUgPT0gX09USEVSX0hFQURFUjoKLSAgICAgICAgICAgICAgICAgcHJldmlvdXNfbGlu ZV9udW1iZXIgPSBsaW5lX251bWJlciAtIDE7Ci0gICAgICAgICAgICAgICAgIHByZXZpb3VzX2xp bmUgPSBjbGVhbl9saW5lcy5saW5lc1twcmV2aW91c19saW5lX251bWJlcl0KLSAgICAgICAgICAg ICAgICAgcHJldmlvdXNfbWF0Y2ggPSBfUkVfUEFUVEVSTl9JTkNMVURFLnNlYXJjaChwcmV2aW91 c19saW5lKQotICAgICAgICAgICAgICAgICB3aGlsZSAobm90IHByZXZpb3VzX21hdGNoIGFuZCBw cmV2aW91c19saW5lX251bWJlciA+IDAKLSAgICAgICAgICAgICAgICAgICAgICAgIGFuZCBub3Qg c2VhcmNoKHInXEEoI2lmfCNpZmRlZnwjaWZuZGVmfCNlbHNlfCNlbGlmfCNlbmRpZiknLCBwcmV2 aW91c19saW5lKSk6Ci0gICAgICAgICAgICAgICAgICAgIHByZXZpb3VzX2xpbmVfbnVtYmVyIC09 IDE7Ci0gICAgICAgICAgICAgICAgICAgIHByZXZpb3VzX2xpbmUgPSBjbGVhbl9saW5lcy5saW5l c1twcmV2aW91c19saW5lX251bWJlcl0KLSAgICAgICAgICAgICAgICAgICAgcHJldmlvdXNfbWF0 Y2ggPSBfUkVfUEFUVEVSTl9JTkNMVURFLnNlYXJjaChwcmV2aW91c19saW5lKQotICAgICAgICAg ICAgICAgICBpZiBwcmV2aW91c19tYXRjaDoKLSAgICAgICAgICAgICAgICAgICAgcHJldmlvdXNf aGVhZGVyX3R5cGUgPSBpbmNsdWRlX3N0YXRlLmhlYWRlcl90eXBlc1twcmV2aW91c19saW5lX251 bWJlcl0KLSAgICAgICAgICAgICAgICAgICAgaWYgcHJldmlvdXNfaGVhZGVyX3R5cGUgPT0gX09U SEVSX0hFQURFUiBhbmQgcHJldmlvdXNfbGluZS5zdHJpcCgpID4gbGluZS5zdHJpcCgpOgotICAg ICAgICAgICAgICAgICAgICAgICAgZXJyb3IoZmlsZW5hbWUsIGxpbmVfbnVtYmVyLCAnYnVpbGQv aW5jbHVkZV9vcmRlcicsIDQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnQWxwaGFi ZXRpY2FsIHNvcnRpbmcgcHJvYmxlbS4nKQotCi0gICAgICAgICAgICBpZiBlcnJvcl9tZXNzYWdl OgotICAgICAgICAgICAgICAgIGlmIGZpbGVuYW1lLmVuZHN3aXRoKCcuaCcpOgotICAgICAgICAg ICAgICAgICAgICBlcnJvcihmaWxlbmFtZSwgbGluZV9udW1iZXIsICdidWlsZC9pbmNsdWRlX29y ZGVyJywgNCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgJyVzIFNob3VsZCBiZTogYWxwaGFi ZXRpY2FsbHkgc29ydGVkLicgJQotICAgICAgICAgICAgICAgICAgICAgICAgICBlcnJvcl9tZXNz YWdlKQotICAgICAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgICAgIGVycm9yKGZp bGVuYW1lLCBsaW5lX251bWJlciwgJ2J1aWxkL2luY2x1ZGVfb3JkZXInLCA0LAotICAgICAgICAg ICAgICAgICAgICAgICAgICAnJXMgU2hvdWxkIGJlOiBjb25maWcuaCwgcHJpbWFyeSBoZWFkZXIs IGJsYW5rIGxpbmUsIGFuZCB0aGVuIGFscGhhYmV0aWNhbGx5IHNvcnRlZC4nICUKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgZXJyb3JfbWVzc2FnZSkKLQotICAgICAgICAjIExvb2sgZm9yIGFu eSBvZiB0aGUgc3RyZWFtIGNsYXNzZXMgdGhhdCBhcmUgcGFydCBvZiBzdGFuZGFyZCBDKysuCi0g ICAgICAgIGlmIG1hdGNoKHInKGZ8aW5kfGlvfGl8b3xwYXJzZXxwZnxzdGRpb3xzdHJ8KT9zdHJl YW0kJywgaW5jbHVkZSk6Ci0gICAgICAgICAgICAjIE1hbnkgdW5pdCB0ZXN0cyB1c2UgY291dCwg c28gd2UgZXhlbXB0IHRoZW0uCi0gICAgICAgICAgICBpZiBub3QgX2lzX3Rlc3RfZmlsZW5hbWUo ZmlsZW5hbWUpOgotICAgICAgICAgICAgICAgIGVycm9yKGZpbGVuYW1lLCBsaW5lX251bWJlciwg J3JlYWRhYmlsaXR5L3N0cmVhbXMnLCAzLAotICAgICAgICAgICAgICAgICAgICAgICdTdHJlYW1z IGFyZSBoaWdobHkgZGlzY291cmFnZWQuJykKLQotICAgICAgICAjIExvb2sgZm9yIHNwZWNpZmlj IGluY2x1ZGVzIHRvIGZpeC4KLSAgICAgICAgaWYgaW5jbHVkZS5zdGFydHN3aXRoKCd3dGYvJykg YW5kIG5vdCBpc19zeXN0ZW06Ci0gICAgICAgICAgICBlcnJvcihmaWxlbmFtZSwgbGluZV9udW1i ZXIsICdidWlsZC9pbmNsdWRlJywgNCwKLSAgICAgICAgICAgICAgICAgICd3dGYgaW5jbHVkZXMg c2hvdWxkIGJlIDx3dGYvZmlsZS5oPiBpbnN0ZWFkIG9mICJ3dGYvZmlsZS5oIi4nKQorICAgICAg ICAgICAgZXJyb3IoZmlsZW5hbWUsIGxpbmVfbnVtYmVyLCAnYnVpbGQvaW5jbHVkZV9vcmRlcics IDQsCisgICAgICAgICAgICAgICAgICAnJXMgU2hvdWxkIGJlOiBjb25maWcuaCwgcHJpbWFyeSBo ZWFkZXIsIGJsYW5rIGxpbmUsIGFuZCB0aGVuIGFscGhhYmV0aWNhbGx5IHNvcnRlZC4nICUKKyAg ICAgICAgICAgICAgICAgIGVycm9yX21lc3NhZ2UpCiAKIAogZGVmIGNoZWNrX2xhbmd1YWdlKGZp bGVuYW1lLCBjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGZpbGVfZXh0ZW5zaW9uLCBpbmNsdWRl X3N0YXRlLApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NwcGxpbnRf dW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludF91bml0dGVz dC5weQppbmRleCA0YmE4ZWQyLi5iNGU0MGFmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3Jp cHRzL21vZHVsZXMvY3BwbGludF91bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRz L21vZHVsZXMvY3BwbGludF91bml0dGVzdC5weQpAQCAtMjA5MSw3ICsyMDkxLDcgQEAgY2xhc3Mg T3JkZXJPZkluY2x1ZGVzVGVzdChDcHBsaW50VGVzdEJhc2UpOgogICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKCdGb3VuZCBoZWFkZXIgdGhpcyBmaWxlIGltcGxlbWVudHMgYWZ0ZXIgb3RoZXIgaGVh ZGVyLicsCiAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5pbmNsdWRlX3N0YXRlLmNoZWNr X25leHRfaW5jbHVkZV9vcmRlcihjcHBsaW50Ll9QUklNQVJZX0hFQURFUiwgRmFsc2UpKQogCi0g ICAgZGVmIHRlc3RfY2hlY2tfYWxwYWJldGljYWxfaW5jbHVkZV9vcmRlcihzZWxmKToKKyAgICBk ZWYgdGVzdF9jaGVja19hbHBoYWJldGljYWxfaW5jbHVkZV9vcmRlcihzZWxmKToKICAgICAgICAg c2VsZi5hc3NlcnRfbGFuZ3VhZ2VfcnVsZXNfY2hlY2soJ2Zvby5oJywKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJyNpbmNsdWRlICJhLmgiXG4nCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcjaW5jbHVkZSAiYy5oIlxuJwpAQCAtMjE3 Niw2ICsyMTc2LDE1IEBAIGNsYXNzIE9yZGVyT2ZJbmNsdWRlc1Rlc3QoQ3BwbGludFRlc3RCYXNl KToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJyNpbmNsdWRlICJh LmgiXG4nLCAjIFNob3VsZCBzdGlsbCBmbGFnIHRoaXMuCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICdBbHBoYWJldGljYWwgc29ydGluZyBwcm9ibGVtLiAgW2J1aWxk L2luY2x1ZGVfb3JkZXJdIFs0XScpCiAKKyAgICAgICAgIyBDaGVjayB0aGF0IGFmdGVyIGFuIGFs cmVhZHkgaW5jbHVkZWQgZXJyb3IsIHRoZSBzb3J0aW5nIHJ1bGVzIHN0aWxsIHdvcmsuCisgICAg ICAgIHNlbGYuYXNzZXJ0X2xhbmd1YWdlX3J1bGVzX2NoZWNrKCdmb28uY3BwJywKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJyNpbmNsdWRlICJjb25maWcuaCJcbicK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJyNpbmNsdWRlICJmb28u aCJcbicKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ1xuJworICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnI2luY2x1ZGUgImZvby5oIlxu JworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnI2luY2x1ZGUgImcu aCJcbicsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICciZm9vLmgi IGFscmVhZHkgaW5jbHVkZWQgYXQgZm9vLmNwcDoxICBbYnVpbGQvaW5jbHVkZV0gWzRdJykKKwog ICAgIGRlZiB0ZXN0X2NoZWNrX3d0Zl9pbmNsdWRlcyhzZWxmKToKICAgICAgICAgc2VsZi5hc3Nl cnRfbGFuZ3VhZ2VfcnVsZXNfY2hlY2soJ2Zvby5jcHAnLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAnI2luY2x1ZGUgImNvbmZpZy5oIlxuJwo=