70056 2011-10-13 14:37:53 -0700 [webkit-patch] Put Source/Tools changes at the top of patches, LayoutTests at the bottom 2011-10-15 12:14:12 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 robert robert abarth ddkilzer eric robert oldest_to_newest 483503 0 robert 2011-10-13 14:37:53 -0700 This allows git diffs to match the ordering of svn diffs, where LayoutTests are left to the end of the patch. It makes patches easier to review because the code changes are always at the after the blurb in the Changelog. 483510 1 110908 robert 2011-10-13 14:43:57 -0700 Created attachment 110908 Patch 483524 2 110908 abarth 2011-10-13 14:53:38 -0700 Comment on attachment 110908 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=110908&action=review > Tools/Scripts/webkitpy/common/checkout/scm/git.py:255 > + order_file = tempfile.NamedTemporaryFile() Should this just be a static file in the config directory? (You can look at the watchlist config file to see how to find the path to config files.) That seems better that creating and destroying it every time. Also, please include a test. 484594 3 111137 robert 2011-10-15 09:19:20 -0700 Created attachment 111137 Patch 484605 4 111137 abarth 2011-10-15 11:13:07 -0700 Comment on attachment 111137 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=111137&action=review > Tools/ChangeLog:14 > + * Scripts/webkitpy/common/config/orderfile: Added. I might have called the file something slightly different, like patchorder, but orderfile is ok to. Thanks! 484613 5 robert 2011-10-15 12:14:12 -0700 Committed r97561: <http://trac.webkit.org/changeset/97561> 110908 2011-10-13 14:43:57 -0700 2011-10-15 09:19:14 -0700 Patch bug-70056-20111013224354.patch text/plain 2452 robert U3VidmVyc2lvbiBSZXZpc2lvbjogOTczODkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0ZjdkZGY2ZWE5Yjc5NDNjM2JkOWM0YzA5YWE0YTNjZGZl MzMzN2U5Li4wNWE4ZWRlNjcxNjc4N2VlMzA1ZjM4Zjk3MGM0YjExZmVjZGNmMWQwIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIg QEAKKzIwMTEtMTAtMTMgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgorCisgICAg ICAgIFt3ZWJraXQtcGF0Y2hdIFB1dCBTb3VyY2UvVG9vbHMgY2hhbmdlcyBhdCB0aGUgdG9wIG9m IHBhdGNoZXMsIExheW91dFRlc3RzIGF0IHRoZSBib3R0b20KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwMDU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9zY20vZ2l0LnB5OgorCiAyMDExLTEwLTEzICBKb2huIEtub3R0ZW5iZWx0ICA8amtub3R0 ZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gQWxsb3cgYnVpbGRpbmcgd2l0 aG91dCBzcGVlY2ggaW5wdXQgZW5hYmxlZC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CmluZGV4IGM5NmQxYTc4NmJiNTRjYTUzY2M0OWI4 N2ZlZWVlMTkxNTAzYTNjZGYuLjZjZDlhYjNmOWNlNGUwYjE3OTliNjNhMzliNjMxZmU2MzY2NGQx MjEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3Nj bS9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2Nt L2dpdC5weQpAQCAtMzAsNiArMzAsNyBAQAogaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBvcwogaW1w b3J0IHJlCitpbXBvcnQgdGVtcGZpbGUKIAogZnJvbSB3ZWJraXRweS5jb21tb24ubWVtb2l6ZWQg aW1wb3J0IG1lbW9pemVkCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZGVwcmVjYXRlZF9s b2dnaW5nIGltcG9ydCBsb2cKQEAgLTI0OCw3ICsyNDksMjIgQEAgY2xhc3MgR2l0KFNDTSwgU1ZO UmVwb3NpdG9yeSk6CiAgICAgICAgICIiIlJldHVybnMgYSBieXRlIGFycmF5IChzdHIoKSkgcmVw cmVzZW50aW5nIHRoZSBwYXRjaCBmaWxlLgogICAgICAgICBQYXRjaCBmaWxlcyBhcmUgZWZmZWN0 aXZlbHkgYmluYXJ5IHNpbmNlIHRoZXkgbWF5IGNvbnRhaW4KICAgICAgICAgZmlsZXMgb2YgbXVs dGlwbGUgZGlmZmVyZW50IGVuY29kaW5ncy4iIiIKLSAgICAgICAgY29tbWFuZCA9IFsnZ2l0Jywg J2RpZmYnLCAnLS1iaW5hcnknLCAiLS1uby1leHQtZGlmZiIsICItLWZ1bGwtaW5kZXgiLCAiLS1u by1yZW5hbWVzIiwgc2VsZi5tZXJnZV9iYXNlKGdpdF9jb21taXQpLCAiLS0iXQorCisgICAgICAg ICMgUHV0IGNvZGUgY2hhbmdlcyBhdCB0aGUgdG9wIG9mIHRoZSBwYXRjaCBhbmQgbGF5b3V0IHRl c3RzCisgICAgICAgICMgYXQgdGhlIGJvdHRvbSwgdGhpcyBtYWtlcyBmb3IgZWFzaWVyIHJldmll d2luZy4KKyAgICAgICAgb3JkZXJfZmlsZSA9IHRlbXBmaWxlLk5hbWVkVGVtcG9yYXJ5RmlsZSgp CisgICAgICAgIG9yZGVyX2ZpbGUud3JpdGUoIlNvdXJjZSpDaGFuZ2VMb2dcbiIpCisgICAgICAg IG9yZGVyX2ZpbGUud3JpdGUoIlNvdXJjZSpcbiIpCisgICAgICAgIG9yZGVyX2ZpbGUud3JpdGUo IlRvb2xzKkNoYW5nZUxvZ1xuIikKKyAgICAgICAgb3JkZXJfZmlsZS53cml0ZSgiVG9vbHMqXG4i KQorICAgICAgICBvcmRlcl9maWxlLndyaXRlKCJXZWJzaXRlcypDaGFuZ2VMb2dcbiIpCisgICAg ICAgIG9yZGVyX2ZpbGUud3JpdGUoIldlYnNpdGVzKlxuIikKKyAgICAgICAgb3JkZXJfZmlsZS53 cml0ZSgiTGF5b3V0VGVzdHMqQ2hhbmdlTG9nXG4iKQorICAgICAgICBvcmRlcl9maWxlLndyaXRl KCJMYXlvdXRUZXN0cypcbiIpCisgICAgICAgIG9yZGVyX2ZpbGUuZmx1c2goKQorICAgICAgICBv cmRlciA9ICItTyVzIiAlIG9yZGVyX2ZpbGUubmFtZQorCisgICAgICAgIGNvbW1hbmQgPSBbJ2dp dCcsICdkaWZmJywgJy0tYmluYXJ5JywgIi0tbm8tZXh0LWRpZmYiLCAiLS1mdWxsLWluZGV4Iiwg Ii0tbm8tcmVuYW1lcyIsIG9yZGVyLCBzZWxmLm1lcmdlX2Jhc2UoZ2l0X2NvbW1pdCksICItLSJd CiAgICAgICAgIGlmIGNoYW5nZWRfZmlsZXM6CiAgICAgICAgICAgICBjb21tYW5kICs9IGNoYW5n ZWRfZmlsZXMKICAgICAgICAgcmV0dXJuIHNlbGYucHJlcGVuZF9zdm5fcmV2aXNpb24oc2VsZi5y dW4oY29tbWFuZCwgZGVjb2RlX291dHB1dD1GYWxzZSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkp Cg== 111137 2011-10-15 09:19:20 -0700 2011-10-15 11:13:07 -0700 Patch bug-70056-20111015171918.patch text/plain 6944 robert U3VidmVyc2lvbiBSZXZpc2lvbjogOTc1NTgKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0MDc0ODM3OTM0MDRlY2JkODU0NThlYTc0ZWIwZTAzZjA4 OGE1ODUzLi41YzJlZGMxNDdjMmJlMGQ4OTZiNmUyNTdhZDlmODE1MzU4MzkxMGZjIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMTAtMTUgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgorCisgICAg ICAgIFt3ZWJraXQtcGF0Y2hdIFB1dCBTb3VyY2UvVG9vbHMgY2hhbmdlcyBhdCB0aGUgdG9wIG9m IHBhdGNoZXMsIExheW91dFRlc3RzIGF0IHRoZSBib3R0b20KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwMDU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHByZWZlcnJlZCBmaWxlLW9yZGVyIGZvciBw YXRjaGVzIGlzIExheW91dFRlc3RzIGF0IHRoZSBlbmQgYW5kCisgICAgICAgIENoYW5nZUxvZ3Mg YmVmb3JlIGV2ZXJ5dGhpbmcgZWxzZSBpbiBhIHN1YmRpcmVjdG9yeS4gU3BlY2lmeSB0aGlzIGlu IGEgZ2l0ICdvcmRlcmZpbGUnIGFuZCB1c2UgCisgICAgICAgIGl0IHdoZW4gY3JlYXRpbmcgcGF0 Y2hlcyBmb3IgcmV2aWV3IGFuZCBsYW5kaW5nLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NvbmZpZy9vcmRlcmZpbGU6IEFkZGVkLgorCiAyMDExLTEwLTE1ICBM YXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRd IFtTeW1iaWFuXSBSZW1vdmUgc3VwcG9ydCBmb3IgdGhlIFN5bWJpYW4gcGxhdGZvcm0gZm9yIHRo ZSBRdFdlYktpdCBwb3J0CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9zY20vZ2l0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvc2NtL2dpdC5weQppbmRleCBjOTZkMWE3ODZiYjU0Y2E1M2NjNDliODdmZWVlZTE5MTUw M2EzY2RmLi45MzRhNWM2MTIwOWQ5YWM1Njk4OGQ5YTMyNzFmNGFiYTVhNjk2ZmVhIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKQEAg LTI0OCw3ICsyNDgsMTYgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAg ICIiIlJldHVybnMgYSBieXRlIGFycmF5IChzdHIoKSkgcmVwcmVzZW50aW5nIHRoZSBwYXRjaCBm aWxlLgogICAgICAgICBQYXRjaCBmaWxlcyBhcmUgZWZmZWN0aXZlbHkgYmluYXJ5IHNpbmNlIHRo ZXkgbWF5IGNvbnRhaW4KICAgICAgICAgZmlsZXMgb2YgbXVsdGlwbGUgZGlmZmVyZW50IGVuY29k aW5ncy4iIiIKLSAgICAgICAgY29tbWFuZCA9IFsnZ2l0JywgJ2RpZmYnLCAnLS1iaW5hcnknLCAi LS1uby1leHQtZGlmZiIsICItLWZ1bGwtaW5kZXgiLCAiLS1uby1yZW5hbWVzIiwgc2VsZi5tZXJn ZV9iYXNlKGdpdF9jb21taXQpLCAiLS0iXQorCisgICAgICAgICMgUHV0IGNvZGUgY2hhbmdlcyBh dCB0aGUgdG9wIG9mIHRoZSBwYXRjaCBhbmQgbGF5b3V0IHRlc3RzCisgICAgICAgICMgYXQgdGhl IGJvdHRvbSwgdGhpcyBtYWtlcyBmb3IgZWFzaWVyIHJldmlld2luZy4KKyAgICAgICAgY29uZmln X3BhdGggPSBzZWxmLl9maWxlc3lzdGVtLmRpcm5hbWUoc2VsZi5fZmlsZXN5c3RlbS5wYXRoX3Rv X21vZHVsZSgnd2Via2l0cHkuY29tbW9uLmNvbmZpZycpKQorICAgICAgICBvcmRlcl9maWxlID0g c2VsZi5fZmlsZXN5c3RlbS5qb2luKGNvbmZpZ19wYXRoLCAnb3JkZXJmaWxlJykKKyAgICAgICAg b3JkZXIgPSAiIgorICAgICAgICBpZiBzZWxmLl9maWxlc3lzdGVtLmV4aXN0cyhvcmRlcl9maWxl KToKKyAgICAgICAgICAgIG9yZGVyID0gIi1PJXMiICUgb3JkZXJfZmlsZQorCisgICAgICAgIGNv bW1hbmQgPSBbJ2dpdCcsICdkaWZmJywgJy0tYmluYXJ5JywgIi0tbm8tZXh0LWRpZmYiLCAiLS1m dWxsLWluZGV4IiwgIi0tbm8tcmVuYW1lcyIsIG9yZGVyLCBzZWxmLm1lcmdlX2Jhc2UoZ2l0X2Nv bW1pdCksICItLSJdCiAgICAgICAgIGlmIGNoYW5nZWRfZmlsZXM6CiAgICAgICAgICAgICBjb21t YW5kICs9IGNoYW5nZWRfZmlsZXMKICAgICAgICAgcmV0dXJuIHNlbGYucHJlcGVuZF9zdm5fcmV2 aXNpb24oc2VsZi5ydW4oY29tbWFuZCwgZGVjb2RlX291dHB1dD1GYWxzZSwgY3dkPXNlbGYuY2hl Y2tvdXRfcm9vdCkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weQppbmRleCBmN2Y0YjVlMmVjYWNmMjcyMDkz YmRjYjg3ZGEzN2QwNGQ5YTNlMWIyLi42YzFmNDJiM2NiOGMwYmRjZjg5YWZjZDM4MTNmNThjZGIy NjdkMThhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291 dC9zY20vc2NtX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHkKQEAgLTEwMDAsNiArMTAwMCw2MCBAQCBjbGFz cyBHaXRUZXN0KFNDTVRlc3QpOgogICAgICAgICBwYXRjaCA9IHNjbS5jcmVhdGVfcGF0Y2goKQog ICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHJlLnNlYXJjaChyJ1N1YnZlcnNpb24gUmV2aXNpb246 JywgcGF0Y2gpKQogCisgICAgZGVmIHRlc3Rfb3JkZXJmaWxlKHNlbGYpOgorICAgICAgICBvcy5t a2RpcigiVG9vbHMiKQorICAgICAgICBvcy5ta2RpcigiU291cmNlIikKKyAgICAgICAgb3MubWtk aXIoIkxheW91dFRlc3RzIikKKyAgICAgICAgb3MubWtkaXIoIldlYnNpdGVzIikKKworICAgICAg ICAjIFNsYXNoIHNob3VsZCBhbHdheXMgYmUgdGhlIHJpZ2h0IHBhdGggc2VwYXJhdG9yIHNpbmNl IHdlIHVzZSBjeWd3aW4gb24gV2luZG93cy4KKyAgICAgICAgVG9vbHNfQ2hhbmdlTG9nID0gIlRv b2xzL0NoYW5nZUxvZyIKKyAgICAgICAgd3JpdGVfaW50b19maWxlX2F0X3BhdGgoVG9vbHNfQ2hh bmdlTG9nLCAiY29udGVudHMiKQorICAgICAgICBTb3VyY2VfQ2hhbmdlTG9nID0gIlNvdXJjZS9D aGFuZ2VMb2ciCisgICAgICAgIHdyaXRlX2ludG9fZmlsZV9hdF9wYXRoKFNvdXJjZV9DaGFuZ2VM b2csICJjb250ZW50cyIpCisgICAgICAgIExheW91dFRlc3RzX0NoYW5nZUxvZyA9ICJMYXlvdXRU ZXN0cy9DaGFuZ2VMb2ciCisgICAgICAgIHdyaXRlX2ludG9fZmlsZV9hdF9wYXRoKExheW91dFRl c3RzX0NoYW5nZUxvZywgImNvbnRlbnRzIikKKyAgICAgICAgV2Vic2l0ZXNfQ2hhbmdlTG9nID0g IldlYnNpdGVzL0NoYW5nZUxvZyIKKyAgICAgICAgd3JpdGVfaW50b19maWxlX2F0X3BhdGgoV2Vi c2l0ZXNfQ2hhbmdlTG9nLCAiY29udGVudHMiKQorCisgICAgICAgIFRvb2xzX0NoYW5nZUZpbGUg PSAiVG9vbHMvQ2hhbmdlRmlsZSIKKyAgICAgICAgd3JpdGVfaW50b19maWxlX2F0X3BhdGgoVG9v bHNfQ2hhbmdlRmlsZSwgImNvbnRlbnRzIikKKyAgICAgICAgU291cmNlX0NoYW5nZUZpbGUgPSAi U291cmNlL0NoYW5nZUZpbGUiCisgICAgICAgIHdyaXRlX2ludG9fZmlsZV9hdF9wYXRoKFNvdXJj ZV9DaGFuZ2VGaWxlLCAiY29udGVudHMiKQorICAgICAgICBMYXlvdXRUZXN0c19DaGFuZ2VGaWxl ID0gIkxheW91dFRlc3RzL0NoYW5nZUZpbGUiCisgICAgICAgIHdyaXRlX2ludG9fZmlsZV9hdF9w YXRoKExheW91dFRlc3RzX0NoYW5nZUZpbGUsICJjb250ZW50cyIpCisgICAgICAgIFdlYnNpdGVz X0NoYW5nZUZpbGUgPSAiV2Vic2l0ZXMvQ2hhbmdlRmlsZSIKKyAgICAgICAgd3JpdGVfaW50b19m aWxlX2F0X3BhdGgoV2Vic2l0ZXNfQ2hhbmdlRmlsZSwgImNvbnRlbnRzIikKKworICAgICAgICBy dW5fY29tbWFuZChbJ2dpdCcsICdhZGQnLCAnVG9vbHMvQ2hhbmdlTG9nJ10pCisgICAgICAgIHJ1 bl9jb21tYW5kKFsnZ2l0JywgJ2FkZCcsICdMYXlvdXRUZXN0cy9DaGFuZ2VMb2cnXSkKKyAgICAg ICAgcnVuX2NvbW1hbmQoWydnaXQnLCAnYWRkJywgJ1NvdXJjZS9DaGFuZ2VMb2cnXSkKKyAgICAg ICAgcnVuX2NvbW1hbmQoWydnaXQnLCAnYWRkJywgJ1dlYnNpdGVzL0NoYW5nZUxvZyddKQorICAg ICAgICBydW5fY29tbWFuZChbJ2dpdCcsICdhZGQnLCAnVG9vbHMvQ2hhbmdlRmlsZSddKQorICAg ICAgICBydW5fY29tbWFuZChbJ2dpdCcsICdhZGQnLCAnTGF5b3V0VGVzdHMvQ2hhbmdlRmlsZSdd KQorICAgICAgICBydW5fY29tbWFuZChbJ2dpdCcsICdhZGQnLCAnU291cmNlL0NoYW5nZUZpbGUn XSkKKyAgICAgICAgcnVuX2NvbW1hbmQoWydnaXQnLCAnYWRkJywgJ1dlYnNpdGVzL0NoYW5nZUZp bGUnXSkKKyAgICAgICAgc2NtID0gc2VsZi50cmFja2luZ19zY20KKyAgICAgICAgc2NtLmNvbW1p dF9sb2NhbGx5X3dpdGhfbWVzc2FnZSgnbWVzc2FnZScpCisKKyAgICAgICAgcGF0Y2ggPSBzY20u Y3JlYXRlX3BhdGNoKCkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHJlLnNlYXJjaChyJ1Rvb2xz L0NoYW5nZUxvZycsIHBhdGNoKS5zdGFydCgpIDwgcmUuc2VhcmNoKHInVG9vbHMvQ2hhbmdlRmls ZScsIHBhdGNoKS5zdGFydCgpKQorICAgICAgICBzZWxmLmFzc2VydFRydWUocmUuc2VhcmNoKHIn V2Vic2l0ZXMvQ2hhbmdlTG9nJywgcGF0Y2gpLnN0YXJ0KCkgPCByZS5zZWFyY2gocidXZWJzaXRl cy9DaGFuZ2VGaWxlJywgcGF0Y2gpLnN0YXJ0KCkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShy ZS5zZWFyY2gocidTb3VyY2UvQ2hhbmdlTG9nJywgcGF0Y2gpLnN0YXJ0KCkgPCByZS5zZWFyY2go cidTb3VyY2UvQ2hhbmdlRmlsZScsIHBhdGNoKS5zdGFydCgpKQorICAgICAgICBzZWxmLmFzc2Vy dFRydWUocmUuc2VhcmNoKHInTGF5b3V0VGVzdHMvQ2hhbmdlTG9nJywgcGF0Y2gpLnN0YXJ0KCkg PCByZS5zZWFyY2gocidMYXlvdXRUZXN0cy9DaGFuZ2VGaWxlJywgcGF0Y2gpLnN0YXJ0KCkpCisK KyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHJlLnNlYXJjaChyJ1NvdXJjZS9DaGFuZ2VMb2cnLCBw YXRjaCkuc3RhcnQoKSA8IHJlLnNlYXJjaChyJ0xheW91dFRlc3RzL0NoYW5nZUxvZycsIHBhdGNo KS5zdGFydCgpKQorICAgICAgICBzZWxmLmFzc2VydFRydWUocmUuc2VhcmNoKHInVG9vbHMvQ2hh bmdlTG9nJywgcGF0Y2gpLnN0YXJ0KCkgPCByZS5zZWFyY2gocidMYXlvdXRUZXN0cy9DaGFuZ2VM b2cnLCBwYXRjaCkuc3RhcnQoKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHJlLnNlYXJjaChy J1dlYnNpdGVzL0NoYW5nZUxvZycsIHBhdGNoKS5zdGFydCgpIDwgcmUuc2VhcmNoKHInTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nJywgcGF0Y2gpLnN0YXJ0KCkpCisKKyAgICAgICAgc2VsZi5hc3NlcnRU cnVlKHJlLnNlYXJjaChyJ1NvdXJjZS9DaGFuZ2VGaWxlJywgcGF0Y2gpLnN0YXJ0KCkgPCByZS5z ZWFyY2gocidMYXlvdXRUZXN0cy9DaGFuZ2VMb2cnLCBwYXRjaCkuc3RhcnQoKSkKKyAgICAgICAg c2VsZi5hc3NlcnRUcnVlKHJlLnNlYXJjaChyJ1Rvb2xzL0NoYW5nZUZpbGUnLCBwYXRjaCkuc3Rh cnQoKSA8IHJlLnNlYXJjaChyJ0xheW91dFRlc3RzL0NoYW5nZUxvZycsIHBhdGNoKS5zdGFydCgp KQorICAgICAgICBzZWxmLmFzc2VydFRydWUocmUuc2VhcmNoKHInV2Vic2l0ZXMvQ2hhbmdlRmls ZScsIHBhdGNoKS5zdGFydCgpIDwgcmUuc2VhcmNoKHInTGF5b3V0VGVzdHMvQ2hhbmdlTG9nJywg cGF0Y2gpLnN0YXJ0KCkpCisKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHJlLnNlYXJjaChyJ1Nv dXJjZS9DaGFuZ2VGaWxlJywgcGF0Y2gpLnN0YXJ0KCkgPCByZS5zZWFyY2gocidMYXlvdXRUZXN0 cy9DaGFuZ2VGaWxlJywgcGF0Y2gpLnN0YXJ0KCkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShy ZS5zZWFyY2gocidUb29scy9DaGFuZ2VGaWxlJywgcGF0Y2gpLnN0YXJ0KCkgPCByZS5zZWFyY2go cidMYXlvdXRUZXN0cy9DaGFuZ2VGaWxlJywgcGF0Y2gpLnN0YXJ0KCkpCisgICAgICAgIHNlbGYu YXNzZXJ0VHJ1ZShyZS5zZWFyY2gocidXZWJzaXRlcy9DaGFuZ2VGaWxlJywgcGF0Y2gpLnN0YXJ0 KCkgPCByZS5zZWFyY2gocidMYXlvdXRUZXN0cy9DaGFuZ2VGaWxlJywgcGF0Y2gpLnN0YXJ0KCkp CisKICAgICBkZWYgdGVzdF9leGlzdHMoc2VsZik6CiAgICAgICAgIHNjbSA9IHNlbGYudW50cmFj a2luZ19zY20KICAgICAgICAgc2VsZi5fc2hhcmVkX3Rlc3RfZXhpc3RzKHNjbSwgc2NtLmNvbW1p dF9sb2NhbGx5X3dpdGhfbWVzc2FnZSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NvbmZpZy9vcmRlcmZpbGUgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jb25maWcvb3JkZXJmaWxlCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjlmYjQ5NzdhOTg3MjkxMzIxZDJmMmM2Mjhk YmQ3OGVkY2NmOGM5ZTAKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jb25maWcvb3JkZXJmaWxlCkBAIC0wLDAgKzEsOCBAQAorU291cmNlKkNoYW5nZUxv ZworU291cmNlKgorVG9vbHMqQ2hhbmdlTG9nCitUb29scyoKK1dlYnNpdGVzKkNoYW5nZUxvZwor V2Vic2l0ZXMqCitMYXlvdXRUZXN0cypDaGFuZ2VMb2cKK0xheW91dFRlc3RzKgo=