90204 2012-06-28 14:09:33 -0700 Fix rebaselining for Qt and Apple ports 2012-06-29 11:28:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan ojan abarth dpranke jberlin lforschler ossy simon.fraser oldest_to_newest 659808 0 ojan 2012-06-28 14:09:33 -0700 Fix rebaselining for Qt and Apple ports 659811 1 150011 ojan 2012-06-28 14:11:07 -0700 Created attachment 150011 Patch 659813 2 ojan 2012-06-28 14:12:11 -0700 With this patch, I think the rebaseline tool will work for all ports. We'll need some real-world experience to flush out edge cases I didn't think of. 659817 3 150011 abarth 2012-06-28 14:16:05 -0700 Comment on attachment 150011 Patch baseline_path_for_rebaseline makes sense as a concept. I'm not 100% sure about the details for each port. 659820 4 ojan 2012-06-28 14:18:15 -0700 (In reply to comment #3) > (From update of attachment 150011 [details]) > baseline_path_for_rebaseline makes sense as a concept. I'm not 100% sure about the details for each port. Yeah, I tried to do a best guess based off what I see with the existing bots and platform directories. 659908 5 150033 ojan 2012-06-28 15:58:04 -0700 Created attachment 150033 Patch 659954 6 150033 dpranke 2012-06-28 16:57:02 -0700 Comment on attachment 150033 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150033&action=review r+ w/ nits/questions. > Tools/Scripts/webkitpy/layout_tests/port/builders.py:61 > + "Apple Win XP Debug (Tests)": {"port_name": "win-xp", "specifiers": set(["win", "debug"]), "rebaseline_override_dir": "win"}, shouldn't this be win-xp? > Tools/Scripts/webkitpy/tool/commands/rebaseline.py:94 > return port.baseline_path() nit: can you change port.baseline_path() to port.baseline_version_dir() while you're at it? > Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py:49 > + self.assertEqual(command._baseline_directory("Apple Win XP Debug (Tests)"), "/mock-checkout/LayoutTests/platform/win") same comment re: -xp. 659993 7 150033 ojan 2012-06-28 17:53:02 -0700 Comment on attachment 150033 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150033&action=review >> Tools/Scripts/webkitpy/layout_tests/port/builders.py:61 >> + "Apple Win XP Debug (Tests)": {"port_name": "win-xp", "specifiers": set(["win", "debug"]), "rebaseline_override_dir": "win"}, > > shouldn't this be win-xp? lol-whoops. yes. 660658 8 ojan 2012-06-29 11:28:43 -0700 Committed r121577: <http://trac.webkit.org/changeset/121577> 150011 2012-06-28 14:11:07 -0700 2012-06-28 15:57:58 -0700 Patch bug-90204-20120628141107.patch text/plain 11617 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxNDQ3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDIyMjIzZTI5NTg1NjdmZmE3NjQ0OWZkMmRlNzdlMDdj ODBhZGRhMS4uODAwNDE0NDMwNGJjOThiMTExYzQ1MDMzNjBiY2NiYTFiZGE4ZGZlNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4 IEBACiAyMDEyLTA2LTI4ICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKKyAgICAg ICAgRml4IHJlYmFzZWxpbmluZyBmb3IgUXQgYW5kIEFwcGxlIHBvcnRzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDIwNAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC1BcHBvcnByaWF0ZWx5IHB1dCB3azIg cmVzdWx0cyBpbiB0aGUgLXdrMiBkaXJlY3Rvcmllcy4KKyAgICAgICAgLVNpbmNlIFF0IGFuZCBB cHBsZS1XaW4gZG9uJ3QgaGF2ZSBib3RzIHRoYXQgY29ycmVzcG9uZCB0byB0aGUKKyAgICAgICAg cGxhdGZvcm0vcXQgYW5kIHBsYXRmb3JtL3dpbiBkaXJlY3Rvcmllcywgd2UgbmVlZCB0byBmdWRn ZSBpdAorICAgICAgICBhbmQgYWx3YXlzIHB1dCB0aGUgcmVzdWx0cyBpbiB0aG9zZSBkaXJlY3Rv cmllcyBmb3IgdGhvc2UgcG9ydHMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Jhc2UucHk6CisgICAgICAgIChQb3J0LmJhc2VsaW5lX3BhdGhfZm9yX3Jl YmFzZWxpbmUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv YmFzZV91bml0dGVzdC5weToKKyAgICAgICAgKFBvcnRUZXN0LnRlc3RfYmFzZWxpbmVfcGF0aF9m b3JfcmViYXNlbGluZSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9mYWN0b3J5LnB5OgorICAgICAgICAoX2J1aWxkZXJfb3B0aW9ucyk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWNfdW5pdHRlc3QucHk6CisgICAg ICAgICh0ZXN0X2Jhc2VsaW5lX3BhdGhfZm9yX3JlYmFzZWxpbmUpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHk6CisgICAgICAgIChRdFBvcnQpOgor ICAgICAgICAoUXRQb3J0LmJhc2VsaW5lX3BhdGhfZm9yX3JlYmFzZWxpbmUpOgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRlc3QucHk6CisgICAg ICAgIChRdFBvcnRUZXN0LnRlc3RfYmFzZWxpbmVfcGF0aF9mb3JfcmViYXNlbGluZSk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW4ucHk6CisgICAgICAg IChXaW5Qb3J0LmJhc2VsaW5lX3BhdGhfZm9yX3JlYmFzZWxpbmUpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2luX3VuaXR0ZXN0LnB5OgorICAgICAgICAo V2luUG9ydFRlc3QudGVzdF9iYXNlbGluZV9wYXRoX2Zvcl9yZWJhc2VsaW5lKToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5weToKKyAgICAgICAg KFJlYmFzZWxpbmVUZXN0Ll9iYXNlbGluZV9kaXJlY3RvcnkpOgorICAgICAgICAoUmViYXNlbGlu ZVRlc3QuX2NvcHlfZXhpc3RpbmdfYmFzZWxpbmUpOgorCisyMDEyLTA2LTI4ICBPamFuIFZhZmFp ICA8b2phbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgTWFrZSByZWJhc2VsaW5lLXRlc3QgYW5k IHJlYmFzZWxpbmUtZXhwZWN0YXRpb25zIHdvcmsgZm9yIG5vbi1DaHJvbWl1bSBwb3J0cwogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTAxODYKIApkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4 IDBmYTdlM2YzZjEzZTZkNmRjMzcwOTlkYWExOTkxM2EyZDhhMjA4NzQuLjVlOTBjODFhOTdmNjEw YmE4MjZhNzU4YTU4ZDZjMzI3MDI5ZTY1YjQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKQEAgLTE3Nyw2ICsxNzcsOSBAQCBjbGFzcyBQ b3J0KG9iamVjdCk6CiAgICAgICAgIGJhc2VsaW5lX3NlYXJjaF9wYXRocyA9IHNlbGYuZ2V0X29w dGlvbignYWRkaXRpb25hbF9wbGF0Zm9ybV9kaXJlY3RvcnknLCBbXSkgKyBzZWxmLmJhc2VsaW5l X3NlYXJjaF9wYXRoKCkKICAgICAgICAgcmV0dXJuIGJhc2VsaW5lX3NlYXJjaF9wYXRoc1swXQog CisgICAgZGVmIGJhc2VsaW5lX3BhdGhfZm9yX3JlYmFzZWxpbmUoc2VsZik6CisgICAgICAgIHJl dHVybiBzZWxmLmJhc2VsaW5lX3BhdGgoKQorCiAgICAgZGVmIGJhc2VsaW5lX3NlYXJjaF9wYXRo KHNlbGYpOgogICAgICAgICAiIiJSZXR1cm4gYSBsaXN0IG9mIGFic29sdXRlIHBhdGhzIHRvIGRp cmVjdG9yaWVzIHRvIHNlYXJjaCB1bmRlciBmb3IKICAgICAgICAgYmFzZWxpbmVzLiBUaGUgZGly ZWN0b3JpZXMgYXJlIHNlYXJjaGVkIGluIG9yZGVyLiIiIgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5CmluZGV4 IGY3YWZiN2IyMmMxMmEzN2JlNjMwY2RiZjZmMTkzZTliOTIzNjE0NGYuLjYzNjAyZDIzMTJhOWJk NzkzNDk2YzYwZjVjN2U1YzNjNjUyY2YzNDUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZV91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2VfdW5pdHRlc3QucHkKQEAgLTI2NCw2 ICsyNjQsMTEgQEAgY2xhc3MgUG9ydFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAg ICAgWygnL3RtcC9sb2NhbC1iYXNlbGluZXMnLCAnZmFzdC90ZXN0LWV4cGVjdGVkLnR4dCcpXSkK ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LmJhc2VsaW5lX3BhdGgoKSwgJy9mb28nKQog CisgICAgZGVmIHRlc3RfYmFzZWxpbmVfcGF0aF9mb3JfcmViYXNlbGluZShzZWxmKToKKyAgICAg ICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KHBvcnRfbmFtZT0nZm9vJykKKyAgICAgICAgcG9ydC5i YXNlbGluZV9zZWFyY2hfcGF0aCA9IGxhbWJkYTogWydMYXlvdXRUZXN0cy9wbGF0Zm9ybS9mb28n XQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuYmFzZWxpbmVfcGF0aCgpLCBwb3J0LmJh c2VsaW5lX3BhdGhfZm9yX3JlYmFzZWxpbmUoKSkKKwogICAgIGRlZiB0ZXN0X2FkZGl0aW9uYWxf ZXhwZWN0YXRpb25zKHNlbGYpOgogICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQocG9ydF9u YW1lPSdmb28nKQogICAgICAgICBwb3J0LnBvcnRfbmFtZSA9ICdmb28nCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2ZhY3RvcnkucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2ZhY3RvcnkucHkKaW5kZXggODgx YTgwYmVjMTQ4MWU2ZWYyZTY1MTdhNzJiM2M5NDY2M2I0ZGQyZS4uMDNmNzk5OGMxNGRlOGMzYjkw ODRkY2VmNjUwYjUwNjU4ZDJkNzA2MSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZmFjdG9yeS5weQpAQCAtNjAsOCArNjAsOSBAQCBkZWYgcG9y dF9vcHRpb25zKCoqaGVscF9zdHJpbmdzKToKIAogZGVmIF9idWlsZGVyX29wdGlvbnMoYnVpbGRl cl9uYW1lKToKICAgICBjb25maWd1cmF0aW9uID0gIkRlYnVnIiBpZiByZS5zZWFyY2gociJbZHxE XShlYnV8YilnIiwgYnVpbGRlcl9uYW1lKSBlbHNlICJSZWxlYXNlIgorICAgIGlzX3dlYmtpdDIg PSBidWlsZGVyX25hbWUuZmluZCgiV0syIikgIT0gLTEKICAgICBidWlsZGVyX25hbWUgPSBidWls ZGVyX25hbWUKLSAgICByZXR1cm4gb3B0cGFyc2UuVmFsdWVzKHsnYnVpbGRlcl9uYW1lJzogYnVp bGRlcl9uYW1lLCAnY29uZmlndXJhdGlvbic6IGNvbmZpZ3VyYXRpb259KQorICAgIHJldHVybiBv cHRwYXJzZS5WYWx1ZXMoeydidWlsZGVyX25hbWUnOiBidWlsZGVyX25hbWUsICdjb25maWd1cmF0 aW9uJzogY29uZmlndXJhdGlvbiwgJ3dlYmtpdF90ZXN0X3J1bm5lcic6IGlzX3dlYmtpdDJ9KQog CiAKIGNsYXNzIFBvcnRGYWN0b3J5KG9iamVjdCk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hY191bml0dGVzdC5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5CmluZGV4IDJlYmYy NTVhZWEwMWZjM2Y1MTYwMzUxZTY4ZWY2NDBhNzZlNDYxMGQuLjRkZjNkMjUzZGZiOGE0OGU1Yzc4 YjQzNDVlNmYyOGNhODI0NzJmYjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5CkBAIC0xNjgsNiArMTY4LDE5 IEBAIGphdmEvCiAgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aCgnbWFjLWxpb24nLCAn bWFjLXdrMicsIFsnbWFjLXdrMicsICdtYWMtbGlvbicsICdtYWMnXSwgdXNlX3dlYmtpdDI9VHJ1 ZSkKICAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKCdtYWMtZnV0dXJlJywgJ21hYy13 azInLCBbJ21hYy13azInLCAnbWFjJ10sIHVzZV93ZWJraXQyPVRydWUpCiAKKyAgICBkZWYgdGVz dF9iYXNlbGluZV9wYXRoX2Zvcl9yZWJhc2VsaW5lKHNlbGYpOgorICAgICAgICBwb3J0ID0gc2Vs Zi5tYWtlX3BvcnQocG9ydF9uYW1lPSdtYWMnLCBvc192ZXJzaW9uPSdsZW9wYXJkJykKKyAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LmJhc2VsaW5lX3BhdGhfZm9yX3JlYmFzZWxpbmUoKSwg Jy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy1sZW9wYXJkJykKKworICAg ICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQocG9ydF9uYW1lPSdtYWMnLCBvc192ZXJzaW9uPSdz bm93bGVvcGFyZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5iYXNlbGluZV9wYXRo X2Zvcl9yZWJhc2VsaW5lKCksICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMtc25vd2xlb3BhcmQnKQorCisgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChwb3J0X25h bWU9J21hYycsIG9zX3ZlcnNpb249J2xpb24nKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBv cnQuYmFzZWxpbmVfcGF0aF9mb3JfcmViYXNlbGluZSgpLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vbWFjJykKKworICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQocG9y dF9uYW1lPSdtYWMnLCBvc192ZXJzaW9uPSdsaW9uJywgb3B0aW9ucz1Nb2NrT3B0aW9ucyh3ZWJr aXRfdGVzdF9ydW5uZXI9VHJ1ZSkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5iYXNl bGluZV9wYXRoX2Zvcl9yZWJhc2VsaW5lKCksICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMtd2syJykKKwogICAgIGRlZiB0ZXN0X3Nob3dfcmVzdWx0c19odG1sX2ZpbGUo c2VsZik6CiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCiAgICAgICAgICMgRGVsYXkg c2V0dGluZyBhIHNob3VsZF9sb2cgZXhlY3V0aXZlIHRvIGF2b2lkIGxvZ2dpbmcgZnJvbSBNYWNQ b3J0Ll9faW5pdF9fLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9xdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvcXQucHkKaW5kZXggNTA4YzdkNGVlYTQyMmM3MzhiZDIyMDcyZGNkNzQyY2ZlNjMzZjg3Zi4u OTlmNDAwYjY1NTA0MmE5Mzk5MzE2YTQwM2YxMjhkNTJkYWFiMmM0YiAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CkBAIC0xMzQsNiArMTM0LDEw IEBAIGNsYXNzIFF0UG9ydChXZWJLaXRQb3J0KToKICAgICBkZWYgYmFzZWxpbmVfc2VhcmNoX3Bh dGgoc2VsZik6CiAgICAgICAgIHJldHVybiBtYXAoc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgs IHNlbGYuX3NlYXJjaF9wYXRocygpKQogCisgICAgIyBTaW5jZSBRdCBvbmx5IGhhcyBvbmUgYm90 IHJ1bm5pbmcgdGVzdHMsIGFsd2F5cyByZWJhc2VsaW5lIHRvIHRoZSBwbGF0Zm9ybS9xdCBkaXJl Y3RvcnkuCisgICAgZGVmIGJhc2VsaW5lX3BhdGhfZm9yX3JlYmFzZWxpbmUoc2VsZik6CisgICAg ICAgIHJldHVybiBzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aChzZWxmLnBvcnRfbmFtZSkKKwog ICAgIGRlZiBfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRocyhzZWxmKToKICAgICAgICAgc2tpcHBl ZF9wYXRoID0gc2VsZi5fc2VhcmNoX3BhdGhzKCkKICAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9u KCd3ZWJraXRfdGVzdF9ydW5uZXInKSBhbmQgJzUuMCcgaW4gc2VsZi5xdF92ZXJzaW9uKCk6CmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3Vu aXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91 bml0dGVzdC5weQppbmRleCBmNzk2M2UzOGE0MDc2MmYyODRiMmY5YmZhMzg5MzBjNjlkZGI1NzVi Li4xN2EwNzU4MWU2NGI0YzgzODBhMzk5NWM4MTgxZGUyNDZhN2Q2OGIyIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRlc3Qu cHkKQEAgLTg4LDYgKzg4LDEwIEBAIGNsYXNzIFF0UG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0 VGVzdENhc2UpOgogICAgICAgICBmb3IgY2FzZSBpbiBzZWxmLnNlYXJjaF9wYXRoc19jYXNlczoK ICAgICAgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aCgqKmNhc2UpCiAKKyAgICBkZWYg dGVzdF9iYXNlbGluZV9wYXRoX2Zvcl9yZWJhc2VsaW5lKHNlbGYpOgorICAgICAgICBwb3J0ID0g c2VsZi5tYWtlX3BvcnQoKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuYmFzZWxpbmVf cGF0aF9mb3JfcmViYXNlbGluZSgpLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZv cm0vcXQnKQorCiAgICAgZGVmIHRlc3Rfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRoKHNlbGYpOgog ICAgICAgICBjYXNlbGlzdCA9IHNlbGYuc2VhcmNoX3BhdGhzX2Nhc2VzWzpdCiAgICAgICAgIGZv ciBjYXNlIGluIGNhc2VsaXN0OgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC93aW4ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3dpbi5weQppbmRleCA0MjBmNGRiMDRjNjgyYjFlM2MwM2ExMzUyNGMyN2I4YTQ5 ZjQwMzU3Li5iN2E0ZmUwM2ExY2I3MjU2MDFmZTMxODlkOTkxNTRiNTdhMzVkYWM1IDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbi5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbi5weQpAQCAtNzQs NiArNzQsMTIgQEAgY2xhc3MgV2luUG9ydChBcHBsZVBvcnQpOgogICAgICAgICBmYWxsYmFja19u YW1lcy5leHRlbmQoWydtYWMtbGlvbicsICdtYWMnXSkKICAgICAgICAgcmV0dXJuIG1hcChzZWxm Ll93ZWJraXRfYmFzZWxpbmVfcGF0aCwgZmFsbGJhY2tfbmFtZXMpCiAKKyAgICBkZWYgYmFzZWxp bmVfcGF0aF9mb3JfcmViYXNlbGluZShzZWxmKToKKyAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9u KCd3ZWJraXRfdGVzdF9ydW5uZXInKToKKyAgICAgICAgICAgIHJldHVybiBzZWxmLl93ZWJraXRf YmFzZWxpbmVfcGF0aChzZWxmLl93azJfcG9ydF9uYW1lKCkpCisgICAgICAgICMgU2luY2UgQXBw bGUtV2luIGRvZXNuJ3QgaGF2ZSBmdWxsIGJvdCBjb3ZlcmFnZSwgYWx3YXlzIHJlYmFzZWxpbmUg dG8gdGhlIHBsYXRmb3JtL3dpbiBkaXJlY3RvcnkuCisgICAgICAgIHJldHVybiBzZWxmLl93ZWJr aXRfYmFzZWxpbmVfcGF0aChzZWxmLnBvcnRfbmFtZSkKKwogICAgIGRlZiBvcGVyYXRpbmdfc3lz dGVtKHNlbGYpOgogICAgICAgICByZXR1cm4gJ3dpbicKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW5fdW5pdHRlc3QucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbl91bml0dGVzdC5weQppbmRleCBj NTExYzg3MmUyYjU4ODgxYTJmNmRkNWY4MjFkOTMxNDZmOGMyNzBkLi40NjYyMmRlYjhmZTIwMTU5 ODM5MjliZWU1YTVmNGEwZDU1MzNhMDEwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbl91bml0dGVzdC5weQpAQCAtNzEsNiArNzEs MTkgQEAgY2xhc3MgV2luUG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAg ICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWyd3aW4td2syJywgJ3dpbi12aXN0YScsICd3 aW4tN3NwMCcsICd3aW4nLCAnbWFjLXdrMicsICdtYWMtbGlvbicsICdtYWMnXSwgJ3Zpc3RhJywg dXNlX3dlYmtpdDI9VHJ1ZSkKICAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsnd2lu LXdrMicsICd3aW4tN3NwMCcsICd3aW4nLCAnbWFjLXdrMicsICdtYWMtbGlvbicsICdtYWMnXSwg JzdzcDAnLCB1c2Vfd2Via2l0Mj1UcnVlKQogCisgICAgZGVmIHRlc3RfYmFzZWxpbmVfcGF0aF9m b3JfcmViYXNlbGluZShzZWxmKToKKyAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KHBvcnRf bmFtZT0nd2luJywgb3NfdmVyc2lvbj0neHAnKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBv cnQuYmFzZWxpbmVfcGF0aF9mb3JfcmViYXNlbGluZSgpLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vd2luJykKKworICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQocG9y dF9uYW1lPSd3aW4nLCBvc192ZXJzaW9uPSd2aXN0YScpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwocG9ydC5iYXNlbGluZV9wYXRoX2Zvcl9yZWJhc2VsaW5lKCksICcvbW9jay1jaGVja291dC9M YXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4nKQorCisgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9y dChwb3J0X25hbWU9J3dpbicsIG9zX3ZlcnNpb249JzdzcDAnKQorICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKHBvcnQuYmFzZWxpbmVfcGF0aF9mb3JfcmViYXNlbGluZSgpLCAnL21vY2stY2hlY2tv dXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luJykKKworICAgICAgICBwb3J0ID0gc2VsZi5tYWtl X3BvcnQocG9ydF9uYW1lPSd3aW4nLCBvc192ZXJzaW9uPSd4cCcsIG9wdGlvbnM9TW9ja09wdGlv bnMod2Via2l0X3Rlc3RfcnVubmVyPVRydWUpKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBv cnQuYmFzZWxpbmVfcGF0aF9mb3JfcmViYXNlbGluZSgpLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vd2luLXdrMicpCisKICAgICBkZWYgX2Fzc2VydF92ZXJzaW9uKHNlbGYs IHBvcnRfbmFtZSwgZXhwZWN0ZWRfdmVyc2lvbik6CiAgICAgICAgIGhvc3QgPSBNb2NrU3lzdGVt SG9zdChvc19uYW1lPSd3aW4nLCBvc192ZXJzaW9uPWV4cGVjdGVkX3ZlcnNpb24pCiAgICAgICAg IHBvcnQgPSBXaW5Qb3J0KGhvc3QsIHBvcnRfbmFtZT1wb3J0X25hbWUpCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CmluZGV4IDc4ZDli ZWYzM2VlMThlYWZiZjI3ZTk5NDEzNjI1MzE4YzdjZjUxMzguLjVhZjE4YWMzMzYwOWU4YzM5NGU5 NmI1NTY3MzRjMWJlZTg5NDFiYjggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CkBAIC04OCw3ICs4OCw3IEBAIGNsYXNzIFJlYmFz ZWxpbmVUZXN0KEFic3RyYWN0UmViYXNlbGluaW5nQ29tbWFuZCk6CiAKICAgICBkZWYgX2Jhc2Vs aW5lX2RpcmVjdG9yeShzZWxmLCBidWlsZGVyX25hbWUpOgogICAgICAgICBwb3J0ID0gc2VsZi5f dG9vbC5wb3J0X2ZhY3RvcnkuZ2V0X2Zyb21fYnVpbGRlcl9uYW1lKGJ1aWxkZXJfbmFtZSkKLSAg ICAgICAgcmV0dXJuIHBvcnQuYmFzZWxpbmVfcGF0aCgpCisgICAgICAgIHJldHVybiBwb3J0LmJh c2VsaW5lX3BhdGhfZm9yX3JlYmFzZWxpbmUoKQogCiAgICAgZGVmIF9jb3B5X2V4aXN0aW5nX2Jh c2VsaW5lKHNlbGYsIHBsYXRmb3Jtc190b19tb3ZlX2V4aXN0aW5nX2Jhc2VsaW5lc190bywgdGVz dF9uYW1lLCBzdWZmaXgpOgogICAgICAgICBvbGRfYmFzZWxpbmVzID0gW10KQEAgLTEwMyw3ICsx MDMsNyBAQCBjbGFzcyBSZWJhc2VsaW5lVGVzdChBYnN0cmFjdFJlYmFzZWxpbmluZ0NvbW1hbmQp OgogICAgICAgICAgICAgICAgIF9sb2cuaW5mbygiTm8gZXhpc3RpbmcgYmFzZWxpbmUgZm9yICVz LiIgJSB0ZXN0X25hbWUpCiAgICAgICAgICAgICAgICAgY29udGludWUKIAotICAgICAgICAgICAg bmV3X2Jhc2VsaW5lID0gc2VsZi5fdG9vbC5maWxlc3lzdGVtLmpvaW4ocG9ydC5iYXNlbGluZV9w YXRoKCksIHNlbGYuX2ZpbGVfbmFtZV9mb3JfZXhwZWN0ZWRfcmVzdWx0KHRlc3RfbmFtZSwgc3Vm Zml4KSkKKyAgICAgICAgICAgIG5ld19iYXNlbGluZSA9IHNlbGYuX3Rvb2wuZmlsZXN5c3RlbS5q b2luKHBvcnQuYmFzZWxpbmVfcGF0aF9mb3JfcmViYXNlbGluZSgpLCBzZWxmLl9maWxlX25hbWVf Zm9yX2V4cGVjdGVkX3Jlc3VsdCh0ZXN0X25hbWUsIHN1ZmZpeCkpCiAgICAgICAgICAgICBpZiBz ZWxmLl90b29sLmZpbGVzeXN0ZW0uZXhpc3RzKG5ld19iYXNlbGluZSk6CiAgICAgICAgICAgICAg ICAgX2xvZy5pbmZvKCJFeGlzdGluZyBiYXNlbGluZSBhdCAlcywgbm90IGNvcHlpbmcgb3ZlciBp dC4iICUgbmV3X2Jhc2VsaW5lKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlCg== 150033 2012-06-28 15:58:04 -0700 2012-06-28 17:53:02 -0700 Patch bug-90204-20120628155803.patch text/plain 7532 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxNDQ3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDIyMjIzZTI5NTg1NjdmZmE3NjQ0OWZkMmRlNzdlMDdj ODBhZGRhMS4uYzljM2IzNWQ5N2M1ZTExNTIyNjUzNzgwZmMxMTcxOTUwMzhkZDgyYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3 IEBACiAyMDEyLTA2LTI4ICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKKyAgICAg ICAgRml4IHJlYmFzZWxpbmluZyBmb3IgUXQgYW5kIEFwcGxlIHBvcnRzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDIwNAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC1BcHBvcnByaWF0ZWx5IHB1dCB3azIg cmVzdWx0cyBpbiB0aGUgLXdrMiBkaXJlY3Rvcmllcy4KKyAgICAgICAgLVNpbmNlIFF0IGFuZCBB cHBsZS1XaW4gZG9uJ3QgaGF2ZSBib3RzIHRoYXQgY29ycmVzcG9uZCB0byB0aGUKKyAgICAgICAg cGxhdGZvcm0vcXQgYW5kIHBsYXRmb3JtL3dpbiBkaXJlY3Rvcmllcywgd2UgbmVlZCB0byBmdWRn ZSBpdAorICAgICAgICBhbmQgYWx3YXlzIHB1dCB0aGUgcmVzdWx0cyBpbiB0aG9zZSBkaXJlY3Rv cmllcyBmb3IgdGhvc2UgcG9ydHMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2J1aWxkZXJzLnB5OgorICAgICAgICAocmViYXNlbGluZV9vdmVycmlkZV9k aXIpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZmFjdG9y eS5weToKKyAgICAgICAgKF9idWlsZGVyX29wdGlvbnMpOgorICAgICAgICBJZGVudGlmeSB3ZWJr aXQyIGJ1aWxkZXJzIGJ5IHRoZSBXSzIgaW4gdGhlIGJ1aWxkZXIgbmFtZS4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5weToKKyAgICAgICAgKFJl YmFzZWxpbmVUZXN0Ll9iYXNlbGluZV9kaXJlY3RvcnkpOgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVz dFJlYmFzZWxpbmUudGVzdF9iYXNlbGluZV9kaXJlY3RvcnkpOgorCisyMDEyLTA2LTI4ICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgTWFrZSByZWJhc2VsaW5lLXRl c3QgYW5kIHJlYmFzZWxpbmUtZXhwZWN0YXRpb25zIHdvcmsgZm9yIG5vbi1DaHJvbWl1bSBwb3J0 cwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTAxODYK IApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9i dWlsZGVycy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYnVp bGRlcnMucHkKaW5kZXggYjY0M2E1ODExMDBmZTUwMjhjOWQ3ZmUzMGFhYWUzODA5MmJiOGExMS4u YjQxOTAwYjI5NWEyZjJiOTkxNTY2YzE0NDQ5ZWNiZDExZGFiZGZiYSAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9idWlsZGVycy5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2J1aWxkZXJzLnB5CkBAIC01 NywxNSArNTcsMTcgQEAgX2V4YWN0X21hdGNoZXMgPSB7CiAgICAgIkFwcGxlIExpb24gUmVsZWFz ZSBXSzIgKFRlc3RzKSI6IHsicG9ydF9uYW1lIjogIm1hYy1saW9uIiwgInNwZWNpZmllcnMiOiBz ZXQoWyJsaW9uIiwgIndrMiJdKX0sCiAgICAgIkFwcGxlIExpb24gRGVidWcgV0syIChUZXN0cyki OiB7InBvcnRfbmFtZSI6ICJtYWMtbGlvbiIsICJzcGVjaWZpZXJzIjogc2V0KFsibGlvbiIsICJ3 azIiLCAiZGVidWciXSl9LAogCi0gICAgIkFwcGxlIFdpbiBYUCBEZWJ1ZyAoVGVzdHMpIjogeyJw b3J0X25hbWUiOiAid2luLXhwIiwgInNwZWNpZmllcnMiOiBzZXQoWyJ3aW4iLCAiZGVidWciXSl9 LAotICAgICJBcHBsZSBXaW4gNyBSZWxlYXNlIChUZXN0cykiOiB7InBvcnRfbmFtZSI6ICJ3aW4t N3NwMCIsICJzcGVjaWZpZXJzIjogc2V0KFsid2luIl0pfSwKKyAgICAjIEZJWE1FOiBSZW1vdmUg cmViYXNlbGluZV9vdmVycmlkZV9kaXIgb25jZSB0aGVyZSBpcyBhbiBBcHBsZSBidWlsZGJvdCB0 aGF0IGNvcnJlc3BvbmRzIHRvIHBsYXRmb3JtL3dpbi4KKyAgICAiQXBwbGUgV2luIFhQIERlYnVn IChUZXN0cykiOiB7InBvcnRfbmFtZSI6ICJ3aW4teHAiLCAic3BlY2lmaWVycyI6IHNldChbIndp biIsICJkZWJ1ZyJdKSwgInJlYmFzZWxpbmVfb3ZlcnJpZGVfZGlyIjogIndpbiJ9LAorICAgICJB cHBsZSBXaW4gNyBSZWxlYXNlIChUZXN0cykiOiB7InBvcnRfbmFtZSI6ICJ3aW4tN3NwMCIsICJz cGVjaWZpZXJzIjogc2V0KFsid2luIl0pLCAicmViYXNlbGluZV9vdmVycmlkZV9kaXIiOiAid2lu In0sCiAKICAgICAiR1RLIExpbnV4IDMyLWJpdCBSZWxlYXNlIjogeyJwb3J0X25hbWUiOiAiZ3Rr IiwgInNwZWNpZmllcnMiOiBzZXQoWyJndGsiLCAieDg2IiwgInJlbGVhc2UiXSl9LAogICAgICJH VEsgTGludXggNjQtYml0IERlYnVnIjogeyJwb3J0X25hbWUiOiAiZ3RrIiwgInNwZWNpZmllcnMi OiBzZXQoWyJndGsiLCAieDg2XzY0IiwgImRlYnVnIl0pfSwKICAgICAiR1RLIExpbnV4IDY0LWJp dCBSZWxlYXNlIjogeyJwb3J0X25hbWUiOiAiZ3RrIiwgInNwZWNpZmllcnMiOiBzZXQoWyJndGsi LCAieDg2XzY0IiwgInJlbGVhc2UiXSl9LAogICAgICJHVEsgTGludXggNjQtYml0IFJlbGVhc2Ug V0syIChUZXN0cykiOiB7InBvcnRfbmFtZSI6ICJndGsiLCAic3BlY2lmaWVycyI6IHNldChbImd0 ayIsICJ4ODZfNjQiLCAid2syIiwgInJlbGVhc2UiXSl9LAogCi0gICAgIlF0IExpbnV4IFJlbGVh c2UiOiB7InBvcnRfbmFtZSI6ICJxdC1saW51eCIsICJzcGVjaWZpZXJzIjogc2V0KFsid2luIiwg ImxpbnV4IiwgIm1hYyJdKX0sCisgICAgIyBGSVhNRTogUmVtb3ZlIHJlYmFzZWxpbmVfb3ZlcnJp ZGVfZGlyIG9uY2UgdGhlcmUgYXJlIFF0IGJvdHMgZm9yIGFsbCB0aGUgcGxhdGZvcm0vcXQtKiBk aXJlY3Rvcmllcy4KKyAgICAiUXQgTGludXggUmVsZWFzZSI6IHsicG9ydF9uYW1lIjogInF0LWxp bnV4IiwgInNwZWNpZmllcnMiOiBzZXQoWyJ3aW4iLCAibGludXgiLCAibWFjIl0pLCAicmViYXNl bGluZV9vdmVycmlkZV9kaXIiOiAicXQifSwKIAogICAgICJFRkwgTGludXggNjQtYml0IERlYnVn IjogeyJwb3J0X25hbWUiOiAiZWZsIiwgInNwZWNpZmllcnMiOiBzZXQoWyJlZmwiLCAiZGVidWci XSl9LAogICAgICJFRkwgTGludXggNjQtYml0IFJlbGVhc2UiOiB7InBvcnRfbmFtZSI6ICJlZmwi LCAic3BlY2lmaWVycyI6IHNldChbImVmbCIsICJyZWxlYXNlIl0pfSwKQEAgLTExMyw2ICsxMTUs MTAgQEAgZGVmIGNvdmVyYWdlX3NwZWNpZmllcnNfZm9yX2J1aWxkZXJfbmFtZShidWlsZGVyX25h bWUpOgogICAgIHJldHVybiBfZXhhY3RfbWF0Y2hlc1tidWlsZGVyX25hbWVdLmdldCgic3BlY2lm aWVycyIsIHNldCgpKQogCiAKK2RlZiByZWJhc2VsaW5lX292ZXJyaWRlX2RpcihidWlsZGVyX25h bWUpOgorICAgIHJldHVybiBfZXhhY3RfbWF0Y2hlc1tidWlsZGVyX25hbWVdLmdldCgicmViYXNl bGluZV9vdmVycmlkZV9kaXIiLCBOb25lKQorCisKIGRlZiBwb3J0X25hbWVfZm9yX2J1aWxkZXJf bmFtZShidWlsZGVyX25hbWUpOgogICAgIGlmIGJ1aWxkZXJfbmFtZSBpbiBfZXhhY3RfbWF0Y2hl czoKICAgICAgICAgcmV0dXJuIF9leGFjdF9tYXRjaGVzW2J1aWxkZXJfbmFtZV1bInBvcnRfbmFt ZSJdCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2ZhY3RvcnkucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Zh Y3RvcnkucHkKaW5kZXggODgxYTgwYmVjMTQ4MWU2ZWYyZTY1MTdhNzJiM2M5NDY2M2I0ZGQyZS4u MDNmNzk5OGMxNGRlOGMzYjkwODRkY2VmNjUwYjUwNjU4ZDJkNzA2MSAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5LnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZmFjdG9yeS5weQpAQCAtNjAs OCArNjAsOSBAQCBkZWYgcG9ydF9vcHRpb25zKCoqaGVscF9zdHJpbmdzKToKIAogZGVmIF9idWls ZGVyX29wdGlvbnMoYnVpbGRlcl9uYW1lKToKICAgICBjb25maWd1cmF0aW9uID0gIkRlYnVnIiBp ZiByZS5zZWFyY2gociJbZHxEXShlYnV8YilnIiwgYnVpbGRlcl9uYW1lKSBlbHNlICJSZWxlYXNl IgorICAgIGlzX3dlYmtpdDIgPSBidWlsZGVyX25hbWUuZmluZCgiV0syIikgIT0gLTEKICAgICBi dWlsZGVyX25hbWUgPSBidWlsZGVyX25hbWUKLSAgICByZXR1cm4gb3B0cGFyc2UuVmFsdWVzKHsn YnVpbGRlcl9uYW1lJzogYnVpbGRlcl9uYW1lLCAnY29uZmlndXJhdGlvbic6IGNvbmZpZ3VyYXRp b259KQorICAgIHJldHVybiBvcHRwYXJzZS5WYWx1ZXMoeydidWlsZGVyX25hbWUnOiBidWlsZGVy X25hbWUsICdjb25maWd1cmF0aW9uJzogY29uZmlndXJhdGlvbiwgJ3dlYmtpdF90ZXN0X3J1bm5l cic6IGlzX3dlYmtpdDJ9KQogCiAKIGNsYXNzIFBvcnRGYWN0b3J5KG9iamVjdCk6CmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CmluZGV4 IDc4ZDliZWYzM2VlMThlYWZiZjI3ZTk5NDEzNjI1MzE4YzdjZjUxMzguLjIwYzQyMWM5YTljMGQ5 MDA5YTExNWNiZjFlNGM3MWVjNTAwYmI1OGMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CkBAIC04OCw2ICs4OCw5IEBAIGNsYXNz IFJlYmFzZWxpbmVUZXN0KEFic3RyYWN0UmViYXNlbGluaW5nQ29tbWFuZCk6CiAKICAgICBkZWYg X2Jhc2VsaW5lX2RpcmVjdG9yeShzZWxmLCBidWlsZGVyX25hbWUpOgogICAgICAgICBwb3J0ID0g c2VsZi5fdG9vbC5wb3J0X2ZhY3RvcnkuZ2V0X2Zyb21fYnVpbGRlcl9uYW1lKGJ1aWxkZXJfbmFt ZSkKKyAgICAgICAgb3ZlcnJpZGVfZGlyID0gYnVpbGRlcnMucmViYXNlbGluZV9vdmVycmlkZV9k aXIoYnVpbGRlcl9uYW1lKQorICAgICAgICBpZiBvdmVycmlkZV9kaXI6CisgICAgICAgICAgICBy ZXR1cm4gc2VsZi5fdG9vbC5maWxlc3lzdGVtLmpvaW4ocG9ydC5sYXlvdXRfdGVzdHNfZGlyKCks ICdwbGF0Zm9ybScsIG92ZXJyaWRlX2RpcikKICAgICAgICAgcmV0dXJuIHBvcnQuYmFzZWxpbmVf cGF0aCgpCiAKICAgICBkZWYgX2NvcHlfZXhpc3RpbmdfYmFzZWxpbmUoc2VsZiwgcGxhdGZvcm1z X3RvX21vdmVfZXhpc3RpbmdfYmFzZWxpbmVzX3RvLCB0ZXN0X25hbWUsIHN1ZmZpeCk6CmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZV91 bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2Vs aW5lX3VuaXR0ZXN0LnB5CmluZGV4IDIyYzU2ZThlMzg0MTU4NWFjYTI2M2Y3YmI5ZTBiMzYyNjE3 ZTg3ZjkuLjYwMDM3NWM3ZjgwM2RmNTNhZmE4Mzk0ODQ4YjhkNjQwM2Y4YjNkNGEgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lX3VuaXR0 ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2Vs aW5lX3VuaXR0ZXN0LnB5CkBAIC00Miw2ICs0MiwyMCBAQCBjbGFzcyBUZXN0UmViYXNlbGluZSh1 bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIGJ1aWxkID0gTW9jaygpCiAgICAgICAgIE91dHB1 dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBjb21tYW5kLl90ZXN0c190b191cGRhdGUs IFtidWlsZF0pCiAKKyAgICBkZWYgdGVzdF9iYXNlbGluZV9kaXJlY3Rvcnkoc2VsZik6CisgICAg ICAgIGNvbW1hbmQgPSBSZWJhc2VsaW5lVGVzdCgpCisgICAgICAgIHRvb2wgPSBNb2NrVG9vbCgp CisgICAgICAgIGNvbW1hbmQuYmluZF90b190b29sKHRvb2wpCisgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoY29tbWFuZC5fYmFzZWxpbmVfZGlyZWN0b3J5KCJBcHBsZSBXaW4gWFAgRGVidWcgKFRl c3RzKSIpLCAiL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luIikKKyAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChjb21tYW5kLl9iYXNlbGluZV9kaXJlY3RvcnkoIkFwcGxlIFdp biA3IFJlbGVhc2UgKFRlc3RzKSIpLCAiL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZv cm0vd2luIikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21tYW5kLl9iYXNlbGluZV9kaXJl Y3RvcnkoIkFwcGxlIExpb24gUmVsZWFzZSBXSzEgKFRlc3RzKSIpLCAiL21vY2stY2hlY2tvdXQv TGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjIikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21t YW5kLl9iYXNlbGluZV9kaXJlY3RvcnkoIkFwcGxlIExpb24gUmVsZWFzZSBXSzIgKFRlc3RzKSIp LCAiL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMiIpCisgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoY29tbWFuZC5fYmFzZWxpbmVfZGlyZWN0b3J5KCJHVEsgTGludXgg MzItYml0IFJlbGVhc2UiKSwgIi9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2d0 ayIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWFuZC5fYmFzZWxpbmVfZGlyZWN0b3J5 KCJFRkwgTGludXggNjQtYml0IERlYnVnIiksICIvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9lZmwiKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1hbmQuX2Jhc2VsaW5l X2RpcmVjdG9yeSgiUXQgTGludXggUmVsZWFzZSIpLCAiL21vY2stY2hlY2tvdXQvTGF5b3V0VGVz dHMvcGxhdGZvcm0vcXQiKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1hbmQuX2Jhc2Vs aW5lX2RpcmVjdG9yeSgiV2Via2l0IE1hYzEwLjciKSwgIi9tb2NrLWNoZWNrb3V0L0xheW91dFRl c3RzL3BsYXRmb3JtL2Nocm9taXVtLW1hYyIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29t bWFuZC5fYmFzZWxpbmVfZGlyZWN0b3J5KCJXZWJraXQgTWFjMTAuNiIpLCAiL21vY2stY2hlY2tv dXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0tbWFjLXNub3dsZW9wYXJkIikKKwogICAg IGRlZiB0ZXN0X3JlYmFzZWxpbmVfdXBkYXRlc19leHBlY3RhdGlvbnNfZmlsZV9ub29wKHNlbGYp OgogICAgICAgICBjb21tYW5kID0gUmViYXNlbGluZVRlc3QoKQogICAgICAgICB0b29sID0gTW9j a1Rvb2woKQo=