31534 2009-11-16 01:44:14 -0800 WorkQueue is the only place that should know about special exit codes 2009-11-16 03:04:31 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 31535 1 eric webkit-unassigned abarth oldest_to_newest 163893 0 eric 2009-11-16 01:44:14 -0800 WorkQueue is the only place that should know about special exit codes When a child process handles an error but still needs to exit early, we use a special error code. This lets the child process no exit(0) (normal exit) which would be mildly confusing. Lets move this special handling all into one file (workqueue.py) so that the logic and comments are all in one place. 163894 1 43278 eric 2009-11-16 01:45:51 -0800 Created attachment 43278 Patch 163895 2 43278 abarth 2009-11-16 01:47:31 -0800 Comment on attachment 43278 Patch cls.handled_error_code and unit test! 163907 3 43284 eric 2009-11-16 02:29:47 -0800 Created attachment 43284 Patch 163910 4 43284 abarth 2009-11-16 02:36:39 -0800 Comment on attachment 43284 Patch Excellent! 163918 5 43284 eric 2009-11-16 03:04:24 -0800 Comment on attachment 43284 Patch Clearing flags on attachment: 43284 Committed r51024: <http://trac.webkit.org/changeset/51024> 163919 6 eric 2009-11-16 03:04:31 -0800 All reviewed patches have been landed. Closing bug. 43278 2009-11-16 01:45:51 -0800 2009-11-16 02:29:37 -0800 Patch bug-31534-20091116014549.patch text/plain 3735 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmZTk0Yzc5Li4yNTk3NTg4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMTEt MTYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdvcmtRdWV1ZSBpcyB0aGUgb25seSBwbGFjZSB0 aGF0IHNob3VsZCBrbm93IGFib3V0IHNwZWNpYWwgZXhpdCBjb2RlcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE1MzQKKworICAgICAgICBNb3ZlIExh bmRQYXRjaGVzRnJvbUJ1Z3MuaGFuZGxlZF9lcnJvciB0byBXb3JrUXVldWUuZXhpdF9hZnRlcl9o YW5kbGVkX2Vycm9yCisKKyAgICAgICAgKiBTY3JpcHRzL2J1Z3ppbGxhLXRvb2w6CisgICAgICAg ICogU2NyaXB0cy9tb2R1bGVzL3dvcmtxdWV1ZS5weToKKwogMjAwOS0xMS0xNiAgQWRhbSBCYXJ0 aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVs LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sCmluZGV4IDM0ZjNjOTcuLmJkMGMyMzkgMTAwNzU1 Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKQEAgLTM3NiwxMSArMzc2LDYgQEAgY2xhc3MgTGFuZFBh dGNoZXNGcm9tQnVncyhDb21tYW5kKToKICAgICAgICAgb3B0aW9ucyArPSBXZWJLaXRMYW5kaW5n U2NyaXB0cy5sYW5kX29wdGlvbnMoKQogICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNlbGYsICdM YW5kcyBhbGwgcGF0Y2hlcyBvbiBhIGJ1ZyBvcHRpb25hbGx5IHRlc3RpbmcgdGhlbSBmaXJzdCcs ICdCVUdJRCcsIG9wdGlvbnM9b3B0aW9ucykKIAotICAgIEBzdGF0aWNtZXRob2QKLSAgICBkZWYg aGFuZGxlZF9lcnJvcihlcnJvcik6Ci0gICAgICAgIGxvZyhlcnJvcikKLSAgICAgICAgZXhpdCgy KSAjIEV4aXQgMiBpbnN0ZWQgb2YgMSB0byBpbmRpY2F0ZSB0byB0aGUgY29tbWl0LXF1ZXVlIHRv IGluZGljYXRlIHdlIGhhbmRsZWQgdGhlIGVycm9yLCBhbmQgdGhhdCB0aGUgcXVldWUgc2hvdWxk IGtlZXAgbG9vcGluZy4KLQogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBfY2xvc2VfYnVnX2lm X25vX2FjdGl2ZV9wYXRjaGVzKGNscywgcGF0Y2gsIG9wdGlvbiwgdG9vbCk6CiAgICAgICAgICMg VGhpcyBzaG91bGQgY2hlY2sgdG8gbWFrZSBzdXJlIHRoZXJlIGFyZSBubyByPyBvciByKyBwYXRj aGVzIG9uIHRoZSBidWcgYmVmb3JlIGNsb3NpbmcuCkBAIC00MDksMTEgKzQwNCwxMSBAQCBjbGFz cyBMYW5kUGF0Y2hlc0Zyb21CdWdzKENvbW1hbmQpOgogICAgICAgICBleGNlcHQgQ2hlY2tvdXRO ZWVkc1VwZGF0ZSwgZToKICAgICAgICAgICAgIGxvZygiQ29tbWl0IGZhaWxlZCBiZWNhdXNlIHRo ZSBjaGVja291dCBpcyBvdXQgb2YgZGF0ZS4gIFBsZWFzZSB1cGRhdGUgYW5kIHRyeSBhZ2Fpbi4i KQogICAgICAgICAgICAgbG9nKCJZb3UgY2FuIHBhc3MgLS1uby1idWlsZCB0byBza2lwIGJ1aWxk aW5nL3Rlc3RpbmcgYWZ0ZXIgdXBkYXRlIGlmIHlvdSBiZWxpZXZlIHRoZSBuZXcgY29tbWl0cyBk aWQgbm90IGFmZmVjdCB0aGUgcmVzdWx0cy4iKQotICAgICAgICAgICAgY2xzLmhhbmRsZWRfZXJy b3IoZSkKKyAgICAgICAgICAgIFdvcmtRdWV1ZS5leGl0X2FmdGVyX2hhbmRsZWRfZXJyb3IoZSkK ICAgICAgICAgZXhjZXB0IFNjcmlwdEVycm9yLCBlOgogICAgICAgICAgICAgIyBNYXJrIHRoZSBw YXRjaCBhcyBjb21taXQtcXVldWUtIGFuZCBjb21tZW50IGluIHRoZSBidWcuCiAgICAgICAgICAg ICB0b29sLmJ1Z3MucmVqZWN0X3BhdGNoX2Zyb21fY29tbWl0X3F1ZXVlKHBhdGNoWydpZCddLCBl Lm1lc3NhZ2Vfd2l0aF9vdXRwdXQoKSkKLSAgICAgICAgICAgIGNscy5oYW5kbGVkX2Vycm9yKGUp CisgICAgICAgICAgICBXb3JrUXVldWUuZXhpdF9hZnRlcl9oYW5kbGVkX2Vycm9yKGUpCiAKICAg ICBAc3RhdGljbWV0aG9kCiAgICAgZGVmIF9mZXRjaF9saXN0X29mX3BhdGNoZXNfdG9fbGFuZChv cHRpb25zLCBhcmdzLCB0b29sKToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9k dWxlcy93b3JrcXVldWUucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvd29ya3F1ZXVl LnB5CmluZGV4IDFiMTU0Y2IuLjk3MWY4YzggMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1Njcmlw dHMvbW9kdWxlcy93b3JrcXVldWUucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVz L3dvcmtxdWV1ZS5weQpAQCAtNzUsNiArNzUsMTMgQEAgY2xhc3MgV29ya1F1ZXVlOgogICAgIGxv Z19kYXRlX2Zvcm1hdCA9ICIlWS0lbS0lZCAlSDolTTolUyIKICAgICBzbGVlcF9kdXJhdGlvbl90 ZXh0ID0gIjUgbWlucyIKICAgICBzZWNvbmRzX3RvX3NsZWVwID0gMzAwCisgICAgaGFuZGxlZF9l cnJvcl9jb2RlID0gMgorCisgICAgIyBDaGlsZCBwcm9jZXNzZXMgZXhpdCB3aXRoIGEgc3BlY2lh bCBjb2RlIHRvIHRoZSBwYXJlbnQgcXVldWUgcHJvY2VzcyBjYW4gZGV0ZWN0IHRoZSBlcnJvciB3 YXMgaGFuZGxlZC4KKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgZXhpdF9hZnRlcl9oYW5kbGVk X2Vycm9yKGNscywgZXJyb3IpOgorICAgICAgICBsb2coZXJyb3IpCisgICAgICAgIGV4aXQoaGFu ZGxlZF9lcnJvcl9jb2RlKQogCiAgICAgZGVmIHJ1bihzZWxmKToKICAgICAgICAgc2VsZi5fYmVn aW5fbG9nZ2luZygpCkBAIC0xMDIsOSArMTA5LDkgQEAgY2xhc3MgV29ya1F1ZXVlOgogICAgICAg ICAgICAgdHJ5OgogICAgICAgICAgICAgICAgIHNlbGYuX2RlbGVnYXRlLnByb2Nlc3Nfd29ya19p dGVtKHdvcmtfaXRlbSkKICAgICAgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKLSAgICAg ICAgICAgICAgICAjIGV4aXQoMikgaXMgYSBzcGVjaWFsIGV4aXQgY29kZSB3ZSB1c2UgdG8gaW5k aWNhdGUgdGhhdCB0aGUgZXJyb3Igd2FzIGFscmVhZHkKLSAgICAgICAgICAgICAgICAjIGhhbmRs ZWQgYnkgYW5kIHdlIHNob3VsZCBrZWVwIGxvb3BpbmcgYW55d2F5LgotICAgICAgICAgICAgICAg IGlmIGUuZXhpdF9jb2RlID09IDI6CisgICAgICAgICAgICAgICAgIyBVc2UgYSBzcGVjaWFsIGV4 aXQgY29kZSB0byBpbmRpY2F0ZSB0aGF0IHRoZSBlcnJvciB3YXMgYWxyZWFkeQorICAgICAgICAg ICAgICAgICMgaGFuZGxlZCBpbiB0aGUgY2hpbGQgcHJvY2VzcyBhbmQgd2Ugc2hvdWxkIGp1c3Qg a2VlcCBsb29waW5nLgorICAgICAgICAgICAgICAgIGlmIGUuZXhpdF9jb2RlID09IGhhbmRsZWRf ZXJyb3JfY29kZToKICAgICAgICAgICAgICAgICAgICAgY29udGludWUKICAgICAgICAgICAgICAg ICBtZXNzYWdlID0gIlVuZXhwZWN0ZWQgZmFpbHVyZSB3aGVuIGxhbmRpbmcgcGF0Y2ghICBQbGVh c2UgZmlsZSBhIGJ1ZyBhZ2FpbnN0IGJ1Z3ppbGxhLXRvb2wuXG4lcyIgJSBlLm1lc3NhZ2Vfd2l0 aF9vdXRwdXQoKQogICAgICAgICAgICAgICAgIHNlbGYuX2RlbGVnYXRlLmhhbmRsZV91bmV4cGVj dGVkX2Vycm9yKHdvcmtfaXRlbSwgbWVzc2FnZSkK 43284 2009-11-16 02:29:47 -0800 2009-11-16 03:04:24 -0800 Patch bug-31534-20091116022946.patch text/plain 9323 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2MDEwNWU1Li40ZThhYTA0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjEgQEAKIAogICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBXb3JrUXVldWUgaXMgdGhl IG9ubHkgcGxhY2UgdGhhdCBzaG91bGQga25vdyBhYm91dCBzcGVjaWFsIGV4aXQgY29kZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxNTM0CisKKyAg ICAgICAgTW92ZSBMYW5kUGF0Y2hlc0Zyb21CdWdzLmhhbmRsZWRfZXJyb3IgdG8gV29ya1F1ZXVl LmV4aXRfYWZ0ZXJfaGFuZGxlZF9lcnJvcgorICAgICAgICBhbmQgYWRkIHRlc3RzIGZvciBoYW5k bGluZyBleGl0IGNvZGVzLgorICAgICAgICBJIGFsc28gY2xlYW5lZCB1cCB3b3JrcXVldWVfdW5p dHRlc3QucHkgbW9yZS4KKworICAgICAgICAqIFNjcmlwdHMvYnVnemlsbGEtdG9vbDoKKyAgICAg ICAgKiBTY3JpcHRzL21vZHVsZXMvd29ya3F1ZXVlLnB5OgorICAgICAgICAqIFNjcmlwdHMvbW9k dWxlcy93b3JrcXVldWVfdW5pdHRlc3QucHk6CisKKzIwMDktMTEtMTYgIEVyaWMgU2VpZGVsICA8 ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CiAgICAgICAgIFJlLWZhY3RvciB3b3JrcXVldWVfdW5pdHRlc3QgdG8gYWxsb3cgZm9yIG1vcmUg dGhhbiBvbmUgdGVzdC4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTMxNTM1CiAKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEt dG9vbCBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAppbmRleCAzNGYzYzk3Li5i ZDBjMjM5IDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sCkBAIC0zNzYsMTEgKzM3Niw2IEBA IGNsYXNzIExhbmRQYXRjaGVzRnJvbUJ1Z3MoQ29tbWFuZCk6CiAgICAgICAgIG9wdGlvbnMgKz0g V2ViS2l0TGFuZGluZ1NjcmlwdHMubGFuZF9vcHRpb25zKCkKICAgICAgICAgQ29tbWFuZC5fX2lu aXRfXyhzZWxmLCAnTGFuZHMgYWxsIHBhdGNoZXMgb24gYSBidWcgb3B0aW9uYWxseSB0ZXN0aW5n IHRoZW0gZmlyc3QnLCAnQlVHSUQnLCBvcHRpb25zPW9wdGlvbnMpCiAKLSAgICBAc3RhdGljbWV0 aG9kCi0gICAgZGVmIGhhbmRsZWRfZXJyb3IoZXJyb3IpOgotICAgICAgICBsb2coZXJyb3IpCi0g ICAgICAgIGV4aXQoMikgIyBFeGl0IDIgaW5zdGVkIG9mIDEgdG8gaW5kaWNhdGUgdG8gdGhlIGNv bW1pdC1xdWV1ZSB0byBpbmRpY2F0ZSB3ZSBoYW5kbGVkIHRoZSBlcnJvciwgYW5kIHRoYXQgdGhl IHF1ZXVlIHNob3VsZCBrZWVwIGxvb3BpbmcuCi0KICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYg X2Nsb3NlX2J1Z19pZl9ub19hY3RpdmVfcGF0Y2hlcyhjbHMsIHBhdGNoLCBvcHRpb24sIHRvb2wp OgogICAgICAgICAjIFRoaXMgc2hvdWxkIGNoZWNrIHRvIG1ha2Ugc3VyZSB0aGVyZSBhcmUgbm8g cj8gb3IgcisgcGF0Y2hlcyBvbiB0aGUgYnVnIGJlZm9yZSBjbG9zaW5nLgpAQCAtNDA5LDExICs0 MDQsMTEgQEAgY2xhc3MgTGFuZFBhdGNoZXNGcm9tQnVncyhDb21tYW5kKToKICAgICAgICAgZXhj ZXB0IENoZWNrb3V0TmVlZHNVcGRhdGUsIGU6CiAgICAgICAgICAgICBsb2coIkNvbW1pdCBmYWls ZWQgYmVjYXVzZSB0aGUgY2hlY2tvdXQgaXMgb3V0IG9mIGRhdGUuICBQbGVhc2UgdXBkYXRlIGFu ZCB0cnkgYWdhaW4uIikKICAgICAgICAgICAgIGxvZygiWW91IGNhbiBwYXNzIC0tbm8tYnVpbGQg dG8gc2tpcCBidWlsZGluZy90ZXN0aW5nIGFmdGVyIHVwZGF0ZSBpZiB5b3UgYmVsaWV2ZSB0aGUg bmV3IGNvbW1pdHMgZGlkIG5vdCBhZmZlY3QgdGhlIHJlc3VsdHMuIikKLSAgICAgICAgICAgIGNs cy5oYW5kbGVkX2Vycm9yKGUpCisgICAgICAgICAgICBXb3JrUXVldWUuZXhpdF9hZnRlcl9oYW5k bGVkX2Vycm9yKGUpCiAgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKICAgICAgICAgICAg ICMgTWFyayB0aGUgcGF0Y2ggYXMgY29tbWl0LXF1ZXVlLSBhbmQgY29tbWVudCBpbiB0aGUgYnVn LgogICAgICAgICAgICAgdG9vbC5idWdzLnJlamVjdF9wYXRjaF9mcm9tX2NvbW1pdF9xdWV1ZShw YXRjaFsnaWQnXSwgZS5tZXNzYWdlX3dpdGhfb3V0cHV0KCkpCi0gICAgICAgICAgICBjbHMuaGFu ZGxlZF9lcnJvcihlKQorICAgICAgICAgICAgV29ya1F1ZXVlLmV4aXRfYWZ0ZXJfaGFuZGxlZF9l cnJvcihlKQogCiAgICAgQHN0YXRpY21ldGhvZAogICAgIGRlZiBfZmV0Y2hfbGlzdF9vZl9wYXRj aGVzX3RvX2xhbmQob3B0aW9ucywgYXJncywgdG9vbCk6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL21vZHVsZXMvd29ya3F1ZXVlLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1 bGVzL3dvcmtxdWV1ZS5weQppbmRleCAxYjE1NGNiLi41Njk4ZjA1IDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9TY3JpcHRzL21vZHVsZXMvd29ya3F1ZXVlLnB5CisrKyBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvbW9kdWxlcy93b3JrcXVldWUucHkKQEAgLTc1LDYgKzc1LDEzIEBAIGNsYXNzIFdvcmtR dWV1ZToKICAgICBsb2dfZGF0ZV9mb3JtYXQgPSAiJVktJW0tJWQgJUg6JU06JVMiCiAgICAgc2xl ZXBfZHVyYXRpb25fdGV4dCA9ICI1IG1pbnMiCiAgICAgc2Vjb25kc190b19zbGVlcCA9IDMwMAor ICAgIGhhbmRsZWRfZXJyb3JfY29kZSA9IDIKKworICAgICMgQ2hpbGQgcHJvY2Vzc2VzIGV4aXQg d2l0aCBhIHNwZWNpYWwgY29kZSB0byB0aGUgcGFyZW50IHF1ZXVlIHByb2Nlc3MgY2FuIGRldGVj dCB0aGUgZXJyb3Igd2FzIGhhbmRsZWQuCisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIGV4aXRf YWZ0ZXJfaGFuZGxlZF9lcnJvcihjbHMsIGVycm9yKToKKyAgICAgICAgbG9nKGVycm9yKQorICAg ICAgICBleGl0KGNscy5oYW5kbGVkX2Vycm9yX2NvZGUpCiAKICAgICBkZWYgcnVuKHNlbGYpOgog ICAgICAgICBzZWxmLl9iZWdpbl9sb2dnaW5nKCkKQEAgLTEwMiw5ICsxMDksOSBAQCBjbGFzcyBX b3JrUXVldWU6CiAgICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICAgc2VsZi5fZGVsZWdh dGUucHJvY2Vzc193b3JrX2l0ZW0od29ya19pdGVtKQogICAgICAgICAgICAgZXhjZXB0IFNjcmlw dEVycm9yLCBlOgotICAgICAgICAgICAgICAgICMgZXhpdCgyKSBpcyBhIHNwZWNpYWwgZXhpdCBj b2RlIHdlIHVzZSB0byBpbmRpY2F0ZSB0aGF0IHRoZSBlcnJvciB3YXMgYWxyZWFkeQotICAgICAg ICAgICAgICAgICMgaGFuZGxlZCBieSBhbmQgd2Ugc2hvdWxkIGtlZXAgbG9vcGluZyBhbnl3YXku Ci0gICAgICAgICAgICAgICAgaWYgZS5leGl0X2NvZGUgPT0gMjoKKyAgICAgICAgICAgICAgICAj IFVzZSBhIHNwZWNpYWwgZXhpdCBjb2RlIHRvIGluZGljYXRlIHRoYXQgdGhlIGVycm9yIHdhcyBh bHJlYWR5CisgICAgICAgICAgICAgICAgIyBoYW5kbGVkIGluIHRoZSBjaGlsZCBwcm9jZXNzIGFu ZCB3ZSBzaG91bGQganVzdCBrZWVwIGxvb3BpbmcuCisgICAgICAgICAgICAgICAgaWYgZS5leGl0 X2NvZGUgPT0gc2VsZi5oYW5kbGVkX2Vycm9yX2NvZGU6CiAgICAgICAgICAgICAgICAgICAgIGNv bnRpbnVlCiAgICAgICAgICAgICAgICAgbWVzc2FnZSA9ICJVbmV4cGVjdGVkIGZhaWx1cmUgd2hl biBsYW5kaW5nIHBhdGNoISAgUGxlYXNlIGZpbGUgYSBidWcgYWdhaW5zdCBidWd6aWxsYS10b29s LlxuJXMiICUgZS5tZXNzYWdlX3dpdGhfb3V0cHV0KCkKICAgICAgICAgICAgICAgICBzZWxmLl9k ZWxlZ2F0ZS5oYW5kbGVfdW5leHBlY3RlZF9lcnJvcih3b3JrX2l0ZW0sIG1lc3NhZ2UpCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvd29ya3F1ZXVlX3VuaXR0ZXN0LnB5 IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3dvcmtxdWV1ZV91bml0dGVzdC5weQppbmRl eCBlZDdkMGIyLi5lZmFkZGJmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVs ZXMvd29ya3F1ZXVlX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxl cy93b3JrcXVldWVfdW5pdHRlc3QucHkKQEAgLTMyLDcxICszMiwxMDQgQEAgaW1wb3J0IHNodXRp bAogaW1wb3J0IHRlbXBmaWxlCiBpbXBvcnQgdW5pdHRlc3QKIAorZnJvbSBtb2R1bGVzLnNjbSBp bXBvcnQgU2NyaXB0RXJyb3IKIGZyb20gbW9kdWxlcy53b3JrcXVldWUgaW1wb3J0IFdvcmtRdWV1 ZSwgV29ya1F1ZXVlRGVsZWdhdGUKIAogY2xhc3MgTG9nZ2luZ0RlbGVnYXRlKFdvcmtRdWV1ZURl bGVnYXRlKToKICAgICBkZWYgX19pbml0X18oc2VsZiwgdGVzdCk6Ci0gICAgICAgIHNlbGYudGVz dCA9IHRlc3QKLSAgICAgICAgc2VsZi5jYWxsYmFja3MgPSBbXQotICAgICAgICBzZWxmLnJ1bl9i ZWZvcmUgPSBGYWxzZQorICAgICAgICBzZWxmLl90ZXN0ID0gdGVzdAorICAgICAgICBzZWxmLl9j YWxsYmFja3MgPSBbXQorICAgICAgICBzZWxmLl9ydW5fYmVmb3JlID0gRmFsc2UKKworICAgIGV4 cGVjdGVkX2NhbGxiYWNrcyA9IFsKKyAgICAgICAgJ3F1ZXVlX2xvZ19wYXRoJywKKyAgICAgICAg J3N0YXR1c19ob3N0JywKKyAgICAgICAgJ2JlZ2luX3dvcmtfcXVldWUnLAorICAgICAgICAnc2hv dWxkX2NvbnRpbnVlX3dvcmtfcXVldWUnLAorICAgICAgICAnbmV4dF93b3JrX2l0ZW0nLAorICAg ICAgICAnc2hvdWxkX3Byb2NlZWRfd2l0aF93b3JrX2l0ZW0nLAorICAgICAgICAnd29ya19sb2dz X2RpcmVjdG9yeScsCisgICAgICAgICdwcm9jZXNzX3dvcmtfaXRlbScsCisgICAgICAgICdzaG91 bGRfY29udGludWVfd29ya19xdWV1ZScKKyAgICBdCisKKyAgICBkZWYgcmVjb3JkKHNlbGYsIG1l dGhvZF9uYW1lKToKKyAgICAgICAgc2VsZi5fY2FsbGJhY2tzLmFwcGVuZChtZXRob2RfbmFtZSkK IAogICAgIGRlZiBxdWV1ZV9sb2dfcGF0aChzZWxmKToKLSAgICAgICAgc2VsZi5jYWxsYmFja3Mu YXBwZW5kKCJxdWV1ZV9sb2dfcGF0aCIpCi0gICAgICAgIHJldHVybiBvcy5wYXRoLmpvaW4oc2Vs Zi50ZXN0LnRlbXBfZGlyLCAicXVldWVfbG9nX3BhdGgiKQorICAgICAgICBzZWxmLnJlY29yZCgi cXVldWVfbG9nX3BhdGgiKQorICAgICAgICByZXR1cm4gb3MucGF0aC5qb2luKHNlbGYuX3Rlc3Qu dGVtcF9kaXIsICJxdWV1ZV9sb2dfcGF0aCIpCiAKICAgICBkZWYgd29ya19sb2dzX2RpcmVjdG9y eShzZWxmKToKLSAgICAgICAgc2VsZi5jYWxsYmFja3MuYXBwZW5kKCJ3b3JrX2xvZ3NfZGlyZWN0 b3J5IikKLSAgICAgICAgcmV0dXJuIG9zLnBhdGguam9pbihzZWxmLnRlc3QudGVtcF9kaXIsICJ3 b3JrX2xvZ19wYXRoIikKKyAgICAgICAgc2VsZi5yZWNvcmQoIndvcmtfbG9nc19kaXJlY3Rvcnki KQorICAgICAgICByZXR1cm4gb3MucGF0aC5qb2luKHNlbGYuX3Rlc3QudGVtcF9kaXIsICJ3b3Jr X2xvZ19wYXRoIikKIAogICAgIGRlZiBzdGF0dXNfaG9zdChzZWxmKToKLSAgICAgICAgc2VsZi5j YWxsYmFja3MuYXBwZW5kKCJzdGF0dXNfaG9zdCIpCisgICAgICAgIHNlbGYucmVjb3JkKCJzdGF0 dXNfaG9zdCIpCiAgICAgICAgIHJldHVybiBOb25lCiAKICAgICBkZWYgYmVnaW5fd29ya19xdWV1 ZShzZWxmKToKLSAgICAgICAgc2VsZi5jYWxsYmFja3MuYXBwZW5kKCJiZWdpbl93b3JrX3F1ZXVl IikKKyAgICAgICAgc2VsZi5yZWNvcmQoImJlZ2luX3dvcmtfcXVldWUiKQogCiAgICAgZGVmIHNo b3VsZF9jb250aW51ZV93b3JrX3F1ZXVlKHNlbGYpOgotICAgICAgICBzZWxmLmNhbGxiYWNrcy5h cHBlbmQoInNob3VsZF9jb250aW51ZV93b3JrX3F1ZXVlIikKLSAgICAgICAgaWYgbm90IHNlbGYu cnVuX2JlZm9yZToKLSAgICAgICAgICAgIHNlbGYucnVuX2JlZm9yZSA9IFRydWUKKyAgICAgICAg c2VsZi5yZWNvcmQoInNob3VsZF9jb250aW51ZV93b3JrX3F1ZXVlIikKKyAgICAgICAgaWYgbm90 IHNlbGYuX3J1bl9iZWZvcmU6CisgICAgICAgICAgICBzZWxmLl9ydW5fYmVmb3JlID0gVHJ1ZQog ICAgICAgICAgICAgcmV0dXJuIFRydWUKICAgICAgICAgcmV0dXJuIEZhbHNlCiAKICAgICBkZWYg bmV4dF93b3JrX2l0ZW0oc2VsZik6Ci0gICAgICAgIHNlbGYuY2FsbGJhY2tzLmFwcGVuZCgibmV4 dF93b3JrX2l0ZW0iKQorICAgICAgICBzZWxmLnJlY29yZCgibmV4dF93b3JrX2l0ZW0iKQogICAg ICAgICByZXR1cm4gIndvcmtfaXRlbSIKIAogICAgIGRlZiBzaG91bGRfcHJvY2VlZF93aXRoX3dv cmtfaXRlbShzZWxmLCB3b3JrX2l0ZW0pOgotICAgICAgICBzZWxmLmNhbGxiYWNrcy5hcHBlbmQo InNob3VsZF9wcm9jZWVkX3dpdGhfd29ya19pdGVtIikKLSAgICAgICAgc2VsZi50ZXN0LmFzc2Vy dEVxdWFscyh3b3JrX2l0ZW0sICJ3b3JrX2l0ZW0iKQorICAgICAgICBzZWxmLnJlY29yZCgic2hv dWxkX3Byb2NlZWRfd2l0aF93b3JrX2l0ZW0iKQorICAgICAgICBzZWxmLl90ZXN0LmFzc2VydEVx dWFscyh3b3JrX2l0ZW0sICJ3b3JrX2l0ZW0iKQogICAgICAgICByZXR1cm4gKFRydWUsICJ3YWl0 aW5nX21lc3NhZ2UiLCA0MikKIAogICAgIGRlZiBwcm9jZXNzX3dvcmtfaXRlbShzZWxmLCB3b3Jr X2l0ZW0pOgotICAgICAgICBzZWxmLmNhbGxiYWNrcy5hcHBlbmQoInByb2Nlc3Nfd29ya19pdGVt IikKLSAgICAgICAgc2VsZi50ZXN0LmFzc2VydEVxdWFscyh3b3JrX2l0ZW0sICJ3b3JrX2l0ZW0i KQorICAgICAgICBzZWxmLnJlY29yZCgicHJvY2Vzc193b3JrX2l0ZW0iKQorICAgICAgICBzZWxm Ll90ZXN0LmFzc2VydEVxdWFscyh3b3JrX2l0ZW0sICJ3b3JrX2l0ZW0iKQogCiAgICAgZGVmIGhh bmRsZV91bmV4cGVjdGVkX2Vycm9yKHNlbGYsIHdvcmtfaXRlbSwgbWVzc2FnZSk6Ci0gICAgICAg IHNlbGYuY2FsbGJhY2tzLmFwcGVuZCgiaGFuZGxlX3VuZXhwZWN0ZWRfZXJyb3IiKQotICAgICAg ICBzZWxmLnRlc3QuYXNzZXJ0RXF1YWxzKHdvcmtfaXRlbSwgIndvcmtfaXRlbSIpCisgICAgICAg IHNlbGYucmVjb3JkKCJoYW5kbGVfdW5leHBlY3RlZF9lcnJvciIpCisgICAgICAgIHNlbGYuX3Rl c3QuYXNzZXJ0RXF1YWxzKHdvcmtfaXRlbSwgIndvcmtfaXRlbSIpCisKK2NsYXNzIFRocm93RXJy b3JEZWxlZ2F0ZShMb2dnaW5nRGVsZWdhdGUpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCB0ZXN0 LCBlcnJvcl9jb2RlKToKKyAgICAgICAgTG9nZ2luZ0RlbGVnYXRlLl9faW5pdF9fKHNlbGYsIHRl c3QpCisgICAgICAgIHNlbGYuZXJyb3JfY29kZSA9IGVycm9yX2NvZGUKKworICAgIGRlZiBwcm9j ZXNzX3dvcmtfaXRlbShzZWxmLCB3b3JrX2l0ZW0pOgorICAgICAgICBzZWxmLnJlY29yZCgicHJv Y2Vzc193b3JrX2l0ZW0iKQorICAgICAgICByYWlzZSBTY3JpcHRFcnJvcihleGl0X2NvZGU9c2Vs Zi5lcnJvcl9jb2RlKQogCiBjbGFzcyBXb3JrUXVldWVUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToK ICAgICBkZWYgdGVzdF90cml2aWFsKHNlbGYpOgogICAgICAgICBkZWxlZ2F0ZSA9IExvZ2dpbmdE ZWxlZ2F0ZShzZWxmKQogICAgICAgICB3b3JrX3F1ZXVlID0gV29ya1F1ZXVlKGRlbGVnYXRlKQog ICAgICAgICB3b3JrX3F1ZXVlLnJ1bigpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGRlbGVn YXRlLmNhbGxiYWNrcywgWwotICAgICAgICAgICAgJ3F1ZXVlX2xvZ19wYXRoJywKLSAgICAgICAg ICAgICdzdGF0dXNfaG9zdCcsCi0gICAgICAgICAgICAnYmVnaW5fd29ya19xdWV1ZScsCi0gICAg ICAgICAgICAnc2hvdWxkX2NvbnRpbnVlX3dvcmtfcXVldWUnLAotICAgICAgICAgICAgJ25leHRf d29ya19pdGVtJywKLSAgICAgICAgICAgICdzaG91bGRfcHJvY2VlZF93aXRoX3dvcmtfaXRlbScs Ci0gICAgICAgICAgICAnd29ya19sb2dzX2RpcmVjdG9yeScsCi0gICAgICAgICAgICAncHJvY2Vz c193b3JrX2l0ZW0nLAotICAgICAgICAgICAgJ3Nob3VsZF9jb250aW51ZV93b3JrX3F1ZXVlJ10p CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGRlbGVnYXRlLl9jYWxsYmFja3MsIExvZ2dpbmdE ZWxlZ2F0ZS5leHBlY3RlZF9jYWxsYmFja3MpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShvcy5w YXRoLmV4aXN0cyhkZWxlZ2F0ZS5xdWV1ZV9sb2dfcGF0aCgpKSkKICAgICAgICAgc2VsZi5hc3Nl cnRUcnVlKG9zLnBhdGguZXhpc3RzKG9zLnBhdGguam9pbihkZWxlZ2F0ZS53b3JrX2xvZ3NfZGly ZWN0b3J5KCksICI0Mi5sb2ciKSkpCiAKKyAgICBkZWYgdGVzdF91bmV4cGVjdGVkX2Vycm9yKHNl bGYpOgorICAgICAgICBkZWxlZ2F0ZSA9IFRocm93RXJyb3JEZWxlZ2F0ZShzZWxmLCAzKQorICAg ICAgICB3b3JrX3F1ZXVlID0gV29ya1F1ZXVlKGRlbGVnYXRlKQorICAgICAgICB3b3JrX3F1ZXVl LnJ1bigpCisgICAgICAgIGV4cGVjdGVkX2NhbGxiYWNrcyA9IExvZ2dpbmdEZWxlZ2F0ZS5leHBl Y3RlZF9jYWxsYmFja3NbOl0KKyAgICAgICAgd29ya19pdGVtX2luZGV4ID0gZXhwZWN0ZWRfY2Fs bGJhY2tzLmluZGV4KCdwcm9jZXNzX3dvcmtfaXRlbScpCisgICAgICAgICMgVGhlIHVuZXhwZWN0 ZWQgZXJyb3Igc2hvdWxkIGJlIGhhbmRsZWQgcmlnaHQgYWZ0ZXIgcHJvY2Vzc193b3JrX2l0ZW0g c3RhcnRzCisgICAgICAgICMgYnV0IGJlZm9yZSBhbnkgb3RoZXIgY2FsbGJhY2suICBPdGhlcndp c2UgY2FsbGJhY2tzIHNob3VsZCBiZSBub3JtYWwuCisgICAgICAgIGV4cGVjdGVkX2NhbGxiYWNr cy5pbnNlcnQod29ya19pdGVtX2luZGV4ICsgMSwgJ2hhbmRsZV91bmV4cGVjdGVkX2Vycm9yJykK KyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZGVsZWdhdGUuX2NhbGxiYWNrcywgZXhwZWN0ZWRf Y2FsbGJhY2tzKQorCisgICAgZGVmIHRlc3RfaGFuZGxlZF9lcnJvcihzZWxmKToKKyAgICAgICAg ZGVsZWdhdGUgPSBUaHJvd0Vycm9yRGVsZWdhdGUoc2VsZiwgV29ya1F1ZXVlLmhhbmRsZWRfZXJy b3JfY29kZSkKKyAgICAgICAgd29ya19xdWV1ZSA9IFdvcmtRdWV1ZShkZWxlZ2F0ZSkKKyAgICAg ICAgd29ya19xdWV1ZS5ydW4oKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhkZWxlZ2F0ZS5f Y2FsbGJhY2tzLCBMb2dnaW5nRGVsZWdhdGUuZXhwZWN0ZWRfY2FsbGJhY2tzKQorCiAgICAgZGVm IHNldFVwKHNlbGYpOgogICAgICAgICBzZWxmLnRlbXBfZGlyID0gdGVtcGZpbGUubWtkdGVtcChz dWZmaXg9IndvcmtfcXVldWVfdGVzdF9sb2dzIikKIAo=