68698 2011-09-23 08:14:20 -0700 update layout_tests to account for new default of use_skia=1 2011-09-23 12:45:54 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac Unspecified RESOLVED FIXED P2 Normal --- 1 epoger epoger mihaip oldest_to_newest 472248 0 epoger 2011-09-23 08:14:20 -0700 Once the Chromium CL in http://codereview.chromium.org/8002009 is committed, Chromium will default to using the Skia graphics library on Mac (instead of Core Graphics). This change needs to be reflected in the layout_test machinery: the default port for mac changes from chromium-cg-mac to chromium-mac. This CL will cause some layout_tests to fail unless the aforementioned Chromium CL has been picked up as well. 472249 1 108477 epoger 2011-09-23 08:17:17 -0700 Created attachment 108477 Patch 472273 2 mihaip 2011-09-23 09:17:30 -0700 (In reply to comment #0) > This CL will cause some layout_tests to fail unless the aforementioned Chromium CL has been picked up as well. Does this mean that you'll need to land the Chromium change first, and update this patch to also modify http://trac.webkit.org/browser/trunk/Source/WebKit/chromium/DEPS to set chromium_rev to that revision? 472304 3 epoger 2011-09-23 10:17:08 -0700 (In reply to comment #2) > (In reply to comment #0) > > This CL will cause some layout_tests to fail unless the aforementioned Chromium CL has been picked up as well. > > Does this mean that you'll need to land the Chromium change first, and update this patch to also modify http://trac.webkit.org/browser/trunk/Source/WebKit/chromium/DEPS to set chromium_rev to that revision? Yes, you're right, I will have to do that. 472360 4 108498 epoger 2011-09-23 11:25:50 -0700 Created attachment 108498 Patch 472388 5 108505 epoger 2011-09-23 12:08:33 -0700 Created attachment 108505 Patch 472414 6 108505 mihaip 2011-09-23 12:45:50 -0700 Comment on attachment 108505 Patch Clearing flags on attachment: 108505 Committed r95850: <http://trac.webkit.org/changeset/95850> 472415 7 mihaip 2011-09-23 12:45:54 -0700 All reviewed patches have been landed. Closing bug. 108477 2011-09-23 08:17:17 -0700 2011-09-23 11:25:45 -0700 Patch bug-68698-20110923111715.patch text/plain 6558 epoger SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDk1ODA1KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTcgQEAKKzIwMTEtMDktMjMgIEVsbGlvdCBQb2dlciAgPGVwb2dlckBnb29nbGUuY29tPgor CisgICAgICAgIHVwZGF0ZSBsYXlvdXRfdGVzdHMgdG8gYWNjb3VudCBmb3IgbmV3IGRlZmF1bHQg b2YgdXNlX3NraWE9MQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9Njg2OTgKKworICAgICAgICBDaGFuZ2UgZGVmYXVsdCBNYWMgcG9ydCBmcm9tIGNocm9t aXVtLWNnLW1hYyB0byBjaHJvbWl1bS1tYWMuCisgICAgICAgIFRoaXMgQ0wgd2lsbCBjYXVzZSBz b21lIGxheW91dF90ZXN0cyB0byBmYWlsIHVubGVzcyB5b3UgYWxzbyBwaWNrIHVwCisgICAgICAg IHRoZSBDaHJvbWl1bSBDTCBkZXNjcmliZWQgaW4gaHR0cDovL2NvZGVyZXZpZXcuY2hyb21pdW0u b3JnLzgwMDIwMDkgLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMu cHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bV9tYWNfdW5pdHRlc3QucHk6CisKIDIwMTEtMDktMjIgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgZW5hYmxlIE5SV1QgZm9yIHJ1bi13ZWJraXQtdGVzdHMg b24gTGlvbgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bV9tYWMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkJKHJldmlzaW9uIDk1ODAwKQorKysgVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkJKHdvcmtp bmcgY29weSkKQEAgLTkyLDcgKzkyLDcgQEAgY2xhc3MgQ2hyb21pdW1NYWNQb3J0KGNocm9taXVt LkNocm9taXVtUAogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0X25hbWU9Tm9uZSwgb3NfdmVy c2lvbl9zdHJpbmc9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAgICAjIFdlJ3JlIGEgbGl0dGxlIGdl bmVyaWMgaGVyZSBiZWNhdXNlIHRoaXMgY29kZSBpcyByZXVzZWQgYnkgdGhlCiAgICAgICAgICMg J2dvb2dsZS1jaHJvbWUnIHBvcnQgYXMgd2VsbCBhcyB0aGUgJ21vY2stJyBhbmQgJ2RyeXJ1bi0n IHBvcnRzLgotICAgICAgICBwb3J0X25hbWUgPSBwb3J0X25hbWUgb3IgJ2Nocm9taXVtLWNnLW1h YycgICMgRklYTUU6IENoYW5nZSB0aGUgZGVmYXVsdCB0byBjaHJvbWl1bS1tYWMgb25jZSB3ZSdy ZSByZWFkeS4KKyAgICAgICAgcG9ydF9uYW1lID0gcG9ydF9uYW1lIG9yICdjaHJvbWl1bS1tYWMn CiAgICAgICAgIGNocm9taXVtLkNocm9taXVtUG9ydC5fX2luaXRfXyhzZWxmLCBwb3J0X25hbWU9 cG9ydF9uYW1lLCAqKmt3YXJncykKICAgICAgICAgaWYgcG9ydF9uYW1lLmVuZHN3aXRoKCctbWFj Jyk6CiAgICAgICAgICAgICBzZWxmLl92ZXJzaW9uID0gbWFjLm9zX3ZlcnNpb24ob3NfdmVyc2lv bl9zdHJpbmcsIHNlbGYuU1VQUE9SVEVEX09TX1ZFUlNJT05TKQpJbmRleDogVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWNfdW5pdHRlc3QucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bV9tYWNfdW5pdHRlc3QucHkJKHJldmlzaW9uIDk1ODAwKQorKysgVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWNfdW5pdHRlc3QucHkJKHdvcmtp bmcgY29weSkKQEAgLTUxLDQ0ICs1MSw0NCBAQCBjbGFzcyBDaHJvbWl1bU1hY1BvcnRUZXN0KHBv cnRfdGVzdGNhc2UuCiAKICAgICBkZWYgdGVzdF92ZXJzaW9ucyhzZWxmKToKICAgICAgICAgcG9y dCA9IGNocm9taXVtX21hYy5DaHJvbWl1bU1hY1BvcnQoKQotICAgICAgICBzZWxmLmFzc2VydFRy dWUocG9ydC5uYW1lKCkgaW4gKCdjaHJvbWl1bS1jZy1tYWMtbGVvcGFyZCcsICdjaHJvbWl1bS1j Zy1tYWMtc25vd2xlb3BhcmQnLCAnY2hyb21pdW0tY2ctbWFjLWZ1dHVyZScpKQorICAgICAgICBz ZWxmLmFzc2VydFRydWUocG9ydC5uYW1lKCkgaW4gKCdjaHJvbWl1bS1tYWMtbGVvcGFyZCcsICdj aHJvbWl1bS1tYWMtc25vd2xlb3BhcmQnLCAnY2hyb21pdW0tbWFjLWZ1dHVyZScpKQogCi0gICAg ICAgIHNlbGYuYXNzZXJ0X25hbWUoTm9uZSwgJzEwLjUuMycsICdjaHJvbWl1bS1jZy1tYWMtbGVv cGFyZCcpCi0gICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9taXVtLWNnLW1hYycsICcxMC41 LjMnLCAnY2hyb21pdW0tY2ctbWFjLWxlb3BhcmQnKQotICAgICAgICBzZWxmLmFzc2VydF9uYW1l KCdjaHJvbWl1bS1jZy1tYWMtbGVvcGFyZCcsICcxMC41LjMnLCAnY2hyb21pdW0tY2ctbWFjLWxl b3BhcmQnKQotICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1jZy1tYWMtbGVvcGFy ZCcsICcxMC42LjMnLCAnY2hyb21pdW0tY2ctbWFjLWxlb3BhcmQnKQotCi0gICAgICAgIHNlbGYu YXNzZXJ0X25hbWUoTm9uZSwgJzEwLjYuMycsICdjaHJvbWl1bS1jZy1tYWMtc25vd2xlb3BhcmQn KQotICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1jZy1tYWMnLCAnMTAuNi4zJywg J2Nocm9taXVtLWNnLW1hYy1zbm93bGVvcGFyZCcpCi0gICAgICAgIHNlbGYuYXNzZXJ0X25hbWUo J2Nocm9taXVtLWNnLW1hYy1zbm93bGVvcGFyZCcsICcxMC41LjMnLCAnY2hyb21pdW0tY2ctbWFj LXNub3dsZW9wYXJkJykKLSAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnY2hyb21pdW0tY2ctbWFj LXNub3dsZW9wYXJkJywgJzEwLjYuMycsICdjaHJvbWl1bS1jZy1tYWMtc25vd2xlb3BhcmQnKQot Ci0gICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoTm9uZSwgJzEwLjcnLCAnY2hyb21pdW0tY2ctbWFj LWxpb24nKQotICAgICAgICBzZWxmLmFzc2VydF9uYW1lKE5vbmUsICcxMC43LjMnLCAnY2hyb21p dW0tY2ctbWFjLWxpb24nKQotICAgICAgICBzZWxmLmFzc2VydF9uYW1lKE5vbmUsICcxMC44Jywg J2Nocm9taXVtLWNnLW1hYy1mdXR1cmUnKQotICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdjaHJv bWl1bS1jZy1tYWMnLCAnMTAuNy4zJywgJ2Nocm9taXVtLWNnLW1hYy1saW9uJykKLSAgICAgICAg c2VsZi5hc3NlcnRfbmFtZSgnY2hyb21pdW0tY2ctbWFjLWZ1dHVyZScsICcxMC40LjMnLCAnY2hy b21pdW0tY2ctbWFjLWZ1dHVyZScpCi0gICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9taXVt LWNnLW1hYy1mdXR1cmUnLCAnMTAuNS4zJywgJ2Nocm9taXVtLWNnLW1hYy1mdXR1cmUnKQotICAg ICAgICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1jZy1tYWMtZnV0dXJlJywgJzEwLjYuMycs ICdjaHJvbWl1bS1jZy1tYWMtZnV0dXJlJykKLSAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnY2hy b21pdW0tY2ctbWFjLWZ1dHVyZScsICcxMC43LjMnLCAnY2hyb21pdW0tY2ctbWFjLWZ1dHVyZScp CisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoTm9uZSwgJzEwLjUuMycsICdjaHJvbWl1bS1tYWMt bGVvcGFyZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9taXVtLW1hYycsICcxMC41 LjMnLCAnY2hyb21pdW0tbWFjLWxlb3BhcmQnKQorICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdj aHJvbWl1bS1tYWMtbGVvcGFyZCcsICcxMC41LjMnLCAnY2hyb21pdW0tbWFjLWxlb3BhcmQnKQor ICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1tYWMtbGVvcGFyZCcsICcxMC42LjMn LCAnY2hyb21pdW0tbWFjLWxlb3BhcmQnKQorCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoTm9u ZSwgJzEwLjYuMycsICdjaHJvbWl1bS1tYWMtc25vd2xlb3BhcmQnKQorICAgICAgICBzZWxmLmFz c2VydF9uYW1lKCdjaHJvbWl1bS1tYWMnLCAnMTAuNi4zJywgJ2Nocm9taXVtLW1hYy1zbm93bGVv cGFyZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9taXVtLW1hYy1zbm93bGVvcGFy ZCcsICcxMC41LjMnLCAnY2hyb21pdW0tbWFjLXNub3dsZW9wYXJkJykKKyAgICAgICAgc2VsZi5h c3NlcnRfbmFtZSgnY2hyb21pdW0tbWFjLXNub3dsZW9wYXJkJywgJzEwLjYuMycsICdjaHJvbWl1 bS1tYWMtc25vd2xlb3BhcmQnKQorCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoTm9uZSwgJzEw LjcnLCAnY2hyb21pdW0tbWFjLWxpb24nKQorICAgICAgICBzZWxmLmFzc2VydF9uYW1lKE5vbmUs ICcxMC43LjMnLCAnY2hyb21pdW0tbWFjLWxpb24nKQorICAgICAgICBzZWxmLmFzc2VydF9uYW1l KE5vbmUsICcxMC44JywgJ2Nocm9taXVtLW1hYy1mdXR1cmUnKQorICAgICAgICBzZWxmLmFzc2Vy dF9uYW1lKCdjaHJvbWl1bS1tYWMnLCAnMTAuNy4zJywgJ2Nocm9taXVtLW1hYy1saW9uJykKKyAg ICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnY2hyb21pdW0tbWFjLWZ1dHVyZScsICcxMC40LjMnLCAn Y2hyb21pdW0tbWFjLWZ1dHVyZScpCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9taXVt LW1hYy1mdXR1cmUnLCAnMTAuNS4zJywgJ2Nocm9taXVtLW1hYy1mdXR1cmUnKQorICAgICAgICBz ZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1tYWMtZnV0dXJlJywgJzEwLjYuMycsICdjaHJvbWl1 bS1tYWMtZnV0dXJlJykKKyAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnY2hyb21pdW0tbWFjLWZ1 dHVyZScsICcxMC43LjMnLCAnY2hyb21pdW0tbWFjLWZ1dHVyZScpCiAKICAgICAgICAgc2VsZi5h c3NlcnRSYWlzZXMoQXNzZXJ0aW9uRXJyb3IsIHNlbGYuYXNzZXJ0X25hbWUsIE5vbmUsICcxMC40 LjEnLCAnc2hvdWxkLXJhaXNlLWFzc2VydGlvbi1zby10aGlzLXZhbHVlLWRvZXMtbm90LW1hdHRl cicpCiAKICAgICBkZWYgdGVzdF9iYXNlbGluZV9wYXRoKHNlbGYpOgotICAgICAgICBwb3J0ID0g Y2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydChwb3J0X25hbWU9J2Nocm9taXVtLWNnLW1hYy1s ZW9wYXJkJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5iYXNlbGluZV9wYXRoKCks IHBvcnQuX3dlYmtpdF9iYXNlbGluZV9wYXRoKCdjaHJvbWl1bS1jZy1tYWMtbGVvcGFyZCcpKQor ICAgICAgICBwb3J0ID0gY2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydChwb3J0X25hbWU9J2No cm9taXVtLW1hYy1sZW9wYXJkJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5iYXNl bGluZV9wYXRoKCksIHBvcnQuX3dlYmtpdF9iYXNlbGluZV9wYXRoKCdjaHJvbWl1bS1tYWMtbGVv cGFyZCcpKQogCi0gICAgICAgIHBvcnQgPSBjaHJvbWl1bV9tYWMuQ2hyb21pdW1NYWNQb3J0KHBv cnRfbmFtZT0nY2hyb21pdW0tY2ctbWFjLXNub3dsZW9wYXJkJykKLSAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbHMocG9ydC5iYXNlbGluZV9wYXRoKCksIHBvcnQuX3dlYmtpdF9iYXNlbGluZV9wYXRo KCdjaHJvbWl1bS1jZy1tYWMnKSkKKyAgICAgICAgcG9ydCA9IGNocm9taXVtX21hYy5DaHJvbWl1 bU1hY1BvcnQocG9ydF9uYW1lPSdjaHJvbWl1bS1tYWMtc25vd2xlb3BhcmQnKQorICAgICAgICBz ZWxmLmFzc2VydEVxdWFscyhwb3J0LmJhc2VsaW5lX3BhdGgoKSwgcG9ydC5fd2Via2l0X2Jhc2Vs aW5lX3BhdGgoJ2Nocm9taXVtLW1hYycpKQogCiAgICAgZGVmIHRlc3RfZ3JhcGhpY3NfdHlwZShz ZWxmKToKICAgICAgICAgcG9ydCA9IGNocm9taXVtX21hYy5DaHJvbWl1bU1hY1BvcnQocG9ydF9u YW1lPSdjaHJvbWl1bS1jZy1tYWMnKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscygnY3B1LWNn JywgcG9ydC5ncmFwaGljc190eXBlKCkpCiAgICAgICAgIHBvcnQgPSBjaHJvbWl1bV9tYWMuQ2hy b21pdW1NYWNQb3J0KHBvcnRfbmFtZT0nY2hyb21pdW0tbWFjJykKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbHMoJ2NwdScsIHBvcnQuZ3JhcGhpY3NfdHlwZSgpKQotICAgICAgICAjIEZvciBub3cs IE1hYyBkZWZhdWx0cyB0byBjcHUtY2cgZ3JhcGhpY3MgdHlwZS4KKyAgICAgICAgIyBGb3Igbm93 LCBNYWMgZGVmYXVsdHMgdG8gY3B1IGdyYXBoaWNzIHR5cGUuCiAgICAgICAgIHBvcnQgPSBjaHJv bWl1bV9tYWMuQ2hyb21pdW1NYWNQb3J0KCkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoJ2Nw dS1jZycsIHBvcnQuZ3JhcGhpY3NfdHlwZSgpKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscygn Y3B1JywgcG9ydC5ncmFwaGljc190eXBlKCkpCiAKIAogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9f JzoK 108498 2011-09-23 11:25:50 -0700 2011-09-23 12:08:28 -0700 Patch bug-68698-20110923142548.patch text/plain 7853 epoger SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA5NTgzNikKKysrIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMDktMjMgIEVsbGlvdCBQb2dlciAgPGVwb2dlckBnb29nbGUuY29tPgorCisgICAg ICAgIHVwZGF0ZSBsYXlvdXRfdGVzdHMgdG8gYWNjb3VudCBmb3IgbmV3IGRlZmF1bHQgb2YgdXNl X3NraWE9MQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Njg2OTgKKworICAgICAgICBSb2xscyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RFUFMgdG8gcGlj ayB1cCBuZXcgZGVmYXVsdCB1c2Vfc2tpYT0xCisgICAgICAgIGZyb20gaHR0cDovL3NyYy5jaHJv bWl1bS5vcmcvdmlld3ZjL2Nocm9tZT92aWV3PXJldiZyZXZpc2lvbj0xMDI1MzIKKyAgICAgICAg KENocm9taXVtLW9uLU1hYyBub3cgdXNlcyB0aGUgU2tpYSBncmFwaGljcyBsaWJyYXJ5IGluc3Rl YWQgb2YKKyAgICAgICAgQ29yZSBHcmFwaGljcykuCisKKyAgICAgICAgQWxzbyB1cGRhdGVzIGxh eW91dF90ZXN0IGNvZGUgdG8gd29yayB3aXRoIHRoYXQgY2hhbmdlLgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogREVQUzoKKwogMjAxMS0wOS0yMiAg U2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZC4gIFJvbGxlZCBERVBTLgpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9ERVBT Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vREVQUwkocmV2aXNpb24gOTU4 MzYpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RFUFMJKHdvcmtpbmcgY29weSkKQEAgLTMy LDcgKzMyLDcgQEAKIAogdmFycyA9IHsKICAgJ2Nocm9taXVtX3N2bic6ICdodHRwOi8vc3JjLmNo cm9taXVtLm9yZy9zdm4vdHJ1bmsvc3JjJywKLSAgJ2Nocm9taXVtX3Jldic6ICcxMDIyNDcnCisg ICdjaHJvbWl1bV9yZXYnOiAnMTAyNTMyJwogfQogCiBkZXBzID0gewpJbmRleDogVG9vbHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gOTU4MzYpCisr KyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0w OS0yMyAgRWxsaW90IFBvZ2VyICA8ZXBvZ2VyQGdvb2dsZS5jb20+CisKKyAgICAgICAgdXBkYXRl IGxheW91dF90ZXN0cyB0byBhY2NvdW50IGZvciBuZXcgZGVmYXVsdCBvZiB1c2Vfc2tpYT0xCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODY5OAorCisg ICAgICAgIFJvbGxzIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vREVQUyB0byBwaWNrIHVwIG5ldyBk ZWZhdWx0IHVzZV9za2lhPTEKKyAgICAgICAgZnJvbSBodHRwOi8vc3JjLmNocm9taXVtLm9yZy92 aWV3dmMvY2hyb21lP3ZpZXc9cmV2JnJldmlzaW9uPTEwMjUzMgorICAgICAgICAoQ2hyb21pdW0t b24tTWFjIG5vdyB1c2VzIHRoZSBTa2lhIGdyYXBoaWNzIGxpYnJhcnkgaW5zdGVhZCBvZgorICAg ICAgICBDb3JlIEdyYXBoaWNzKS4KKworICAgICAgICBBbHNvIHVwZGF0ZXMgbGF5b3V0X3Rlc3Qg Y29kZSB0byB3b3JrIHdpdGggdGhhdCBjaGFuZ2UuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2Nocm9taXVtX21hYy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtX21hY191bml0dGVzdC5weToKKwogMjAxMS0wOS0yMyAgTWFyayBS b3dlICA8bXJvd2VAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCB0aGUgYnVpbGQuCkluZGV4OiBU b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2No cm9taXVtX21hYy5weQkocmV2aXNpb24gOTU4MzYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weQkod29ya2luZyBjb3B5KQpAQCAtOTIs NyArOTIsNyBAQCBjbGFzcyBDaHJvbWl1bU1hY1BvcnQoY2hyb21pdW0uQ2hyb21pdW1QCiAgICAg ZGVmIF9faW5pdF9fKHNlbGYsIHBvcnRfbmFtZT1Ob25lLCBvc192ZXJzaW9uX3N0cmluZz1Ob25l LCAqKmt3YXJncyk6CiAgICAgICAgICMgV2UncmUgYSBsaXR0bGUgZ2VuZXJpYyBoZXJlIGJlY2F1 c2UgdGhpcyBjb2RlIGlzIHJldXNlZCBieSB0aGUKICAgICAgICAgIyAnZ29vZ2xlLWNocm9tZScg cG9ydCBhcyB3ZWxsIGFzIHRoZSAnbW9jay0nIGFuZCAnZHJ5cnVuLScgcG9ydHMuCi0gICAgICAg IHBvcnRfbmFtZSA9IHBvcnRfbmFtZSBvciAnY2hyb21pdW0tY2ctbWFjJyAgIyBGSVhNRTogQ2hh bmdlIHRoZSBkZWZhdWx0IHRvIGNocm9taXVtLW1hYyBvbmNlIHdlJ3JlIHJlYWR5LgorICAgICAg ICBwb3J0X25hbWUgPSBwb3J0X25hbWUgb3IgJ2Nocm9taXVtLW1hYycKICAgICAgICAgY2hyb21p dW0uQ2hyb21pdW1Qb3J0Ll9faW5pdF9fKHNlbGYsIHBvcnRfbmFtZT1wb3J0X25hbWUsICoqa3dh cmdzKQogICAgICAgICBpZiBwb3J0X25hbWUuZW5kc3dpdGgoJy1tYWMnKToKICAgICAgICAgICAg IHNlbGYuX3ZlcnNpb24gPSBtYWMub3NfdmVyc2lvbihvc192ZXJzaW9uX3N0cmluZywgc2VsZi5T VVBQT1JURURfT1NfVkVSU0lPTlMpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hY191bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hY191bml0dGVz dC5weQkocmV2aXNpb24gOTU4MzYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtX21hY191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtNTEs NDQgKzUxLDQ0IEBAIGNsYXNzIENocm9taXVtTWFjUG9ydFRlc3QocG9ydF90ZXN0Y2FzZS4KIAog ICAgIGRlZiB0ZXN0X3ZlcnNpb25zKHNlbGYpOgogICAgICAgICBwb3J0ID0gY2hyb21pdW1fbWFj LkNocm9taXVtTWFjUG9ydCgpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0Lm5hbWUoKSBp biAoJ2Nocm9taXVtLWNnLW1hYy1sZW9wYXJkJywgJ2Nocm9taXVtLWNnLW1hYy1zbm93bGVvcGFy ZCcsICdjaHJvbWl1bS1jZy1tYWMtZnV0dXJlJykpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShw b3J0Lm5hbWUoKSBpbiAoJ2Nocm9taXVtLW1hYy1sZW9wYXJkJywgJ2Nocm9taXVtLW1hYy1zbm93 bGVvcGFyZCcsICdjaHJvbWl1bS1tYWMtZnV0dXJlJykpCiAKLSAgICAgICAgc2VsZi5hc3NlcnRf bmFtZShOb25lLCAnMTAuNS4zJywgJ2Nocm9taXVtLWNnLW1hYy1sZW9wYXJkJykKLSAgICAgICAg c2VsZi5hc3NlcnRfbmFtZSgnY2hyb21pdW0tY2ctbWFjJywgJzEwLjUuMycsICdjaHJvbWl1bS1j Zy1tYWMtbGVvcGFyZCcpCi0gICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9taXVtLWNnLW1h Yy1sZW9wYXJkJywgJzEwLjUuMycsICdjaHJvbWl1bS1jZy1tYWMtbGVvcGFyZCcpCi0gICAgICAg IHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9taXVtLWNnLW1hYy1sZW9wYXJkJywgJzEwLjYuMycsICdj aHJvbWl1bS1jZy1tYWMtbGVvcGFyZCcpCi0KLSAgICAgICAgc2VsZi5hc3NlcnRfbmFtZShOb25l LCAnMTAuNi4zJywgJ2Nocm9taXVtLWNnLW1hYy1zbm93bGVvcGFyZCcpCi0gICAgICAgIHNlbGYu YXNzZXJ0X25hbWUoJ2Nocm9taXVtLWNnLW1hYycsICcxMC42LjMnLCAnY2hyb21pdW0tY2ctbWFj LXNub3dsZW9wYXJkJykKLSAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnY2hyb21pdW0tY2ctbWFj LXNub3dsZW9wYXJkJywgJzEwLjUuMycsICdjaHJvbWl1bS1jZy1tYWMtc25vd2xlb3BhcmQnKQot ICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1jZy1tYWMtc25vd2xlb3BhcmQnLCAn MTAuNi4zJywgJ2Nocm9taXVtLWNnLW1hYy1zbm93bGVvcGFyZCcpCi0KLSAgICAgICAgc2VsZi5h c3NlcnRfbmFtZShOb25lLCAnMTAuNycsICdjaHJvbWl1bS1jZy1tYWMtbGlvbicpCi0gICAgICAg IHNlbGYuYXNzZXJ0X25hbWUoTm9uZSwgJzEwLjcuMycsICdjaHJvbWl1bS1jZy1tYWMtbGlvbicp Ci0gICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoTm9uZSwgJzEwLjgnLCAnY2hyb21pdW0tY2ctbWFj LWZ1dHVyZScpCi0gICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9taXVtLWNnLW1hYycsICcx MC43LjMnLCAnY2hyb21pdW0tY2ctbWFjLWxpb24nKQotICAgICAgICBzZWxmLmFzc2VydF9uYW1l KCdjaHJvbWl1bS1jZy1tYWMtZnV0dXJlJywgJzEwLjQuMycsICdjaHJvbWl1bS1jZy1tYWMtZnV0 dXJlJykKLSAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnY2hyb21pdW0tY2ctbWFjLWZ1dHVyZScs ICcxMC41LjMnLCAnY2hyb21pdW0tY2ctbWFjLWZ1dHVyZScpCi0gICAgICAgIHNlbGYuYXNzZXJ0 X25hbWUoJ2Nocm9taXVtLWNnLW1hYy1mdXR1cmUnLCAnMTAuNi4zJywgJ2Nocm9taXVtLWNnLW1h Yy1mdXR1cmUnKQotICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1jZy1tYWMtZnV0 dXJlJywgJzEwLjcuMycsICdjaHJvbWl1bS1jZy1tYWMtZnV0dXJlJykKKyAgICAgICAgc2VsZi5h c3NlcnRfbmFtZShOb25lLCAnMTAuNS4zJywgJ2Nocm9taXVtLW1hYy1sZW9wYXJkJykKKyAgICAg ICAgc2VsZi5hc3NlcnRfbmFtZSgnY2hyb21pdW0tbWFjJywgJzEwLjUuMycsICdjaHJvbWl1bS1t YWMtbGVvcGFyZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9taXVtLW1hYy1sZW9w YXJkJywgJzEwLjUuMycsICdjaHJvbWl1bS1tYWMtbGVvcGFyZCcpCisgICAgICAgIHNlbGYuYXNz ZXJ0X25hbWUoJ2Nocm9taXVtLW1hYy1sZW9wYXJkJywgJzEwLjYuMycsICdjaHJvbWl1bS1tYWMt bGVvcGFyZCcpCisKKyAgICAgICAgc2VsZi5hc3NlcnRfbmFtZShOb25lLCAnMTAuNi4zJywgJ2No cm9taXVtLW1hYy1zbm93bGVvcGFyZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9t aXVtLW1hYycsICcxMC42LjMnLCAnY2hyb21pdW0tbWFjLXNub3dsZW9wYXJkJykKKyAgICAgICAg c2VsZi5hc3NlcnRfbmFtZSgnY2hyb21pdW0tbWFjLXNub3dsZW9wYXJkJywgJzEwLjUuMycsICdj aHJvbWl1bS1tYWMtc25vd2xlb3BhcmQnKQorICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdjaHJv bWl1bS1tYWMtc25vd2xlb3BhcmQnLCAnMTAuNi4zJywgJ2Nocm9taXVtLW1hYy1zbm93bGVvcGFy ZCcpCisKKyAgICAgICAgc2VsZi5hc3NlcnRfbmFtZShOb25lLCAnMTAuNycsICdjaHJvbWl1bS1t YWMtbGlvbicpCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoTm9uZSwgJzEwLjcuMycsICdjaHJv bWl1bS1tYWMtbGlvbicpCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoTm9uZSwgJzEwLjgnLCAn Y2hyb21pdW0tbWFjLWZ1dHVyZScpCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9taXVt LW1hYycsICcxMC43LjMnLCAnY2hyb21pdW0tbWFjLWxpb24nKQorICAgICAgICBzZWxmLmFzc2Vy dF9uYW1lKCdjaHJvbWl1bS1tYWMtZnV0dXJlJywgJzEwLjQuMycsICdjaHJvbWl1bS1tYWMtZnV0 dXJlJykKKyAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnY2hyb21pdW0tbWFjLWZ1dHVyZScsICcx MC41LjMnLCAnY2hyb21pdW0tbWFjLWZ1dHVyZScpCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUo J2Nocm9taXVtLW1hYy1mdXR1cmUnLCAnMTAuNi4zJywgJ2Nocm9taXVtLW1hYy1mdXR1cmUnKQor ICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1tYWMtZnV0dXJlJywgJzEwLjcuMycs ICdjaHJvbWl1bS1tYWMtZnV0dXJlJykKIAogICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhBc3Nl cnRpb25FcnJvciwgc2VsZi5hc3NlcnRfbmFtZSwgTm9uZSwgJzEwLjQuMScsICdzaG91bGQtcmFp c2UtYXNzZXJ0aW9uLXNvLXRoaXMtdmFsdWUtZG9lcy1ub3QtbWF0dGVyJykKIAogICAgIGRlZiB0 ZXN0X2Jhc2VsaW5lX3BhdGgoc2VsZik6Ci0gICAgICAgIHBvcnQgPSBjaHJvbWl1bV9tYWMuQ2hy b21pdW1NYWNQb3J0KHBvcnRfbmFtZT0nY2hyb21pdW0tY2ctbWFjLWxlb3BhcmQnKQotICAgICAg ICBzZWxmLmFzc2VydEVxdWFscyhwb3J0LmJhc2VsaW5lX3BhdGgoKSwgcG9ydC5fd2Via2l0X2Jh c2VsaW5lX3BhdGgoJ2Nocm9taXVtLWNnLW1hYy1sZW9wYXJkJykpCisgICAgICAgIHBvcnQgPSBj aHJvbWl1bV9tYWMuQ2hyb21pdW1NYWNQb3J0KHBvcnRfbmFtZT0nY2hyb21pdW0tbWFjLWxlb3Bh cmQnKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0LmJhc2VsaW5lX3BhdGgoKSwgcG9y dC5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoJ2Nocm9taXVtLW1hYy1sZW9wYXJkJykpCiAKLSAgICAg ICAgcG9ydCA9IGNocm9taXVtX21hYy5DaHJvbWl1bU1hY1BvcnQocG9ydF9uYW1lPSdjaHJvbWl1 bS1jZy1tYWMtc25vd2xlb3BhcmQnKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0LmJh c2VsaW5lX3BhdGgoKSwgcG9ydC5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoJ2Nocm9taXVtLWNnLW1h YycpKQorICAgICAgICBwb3J0ID0gY2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydChwb3J0X25h bWU9J2Nocm9taXVtLW1hYy1zbm93bGVvcGFyZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxz KHBvcnQuYmFzZWxpbmVfcGF0aCgpLCBwb3J0Ll93ZWJraXRfYmFzZWxpbmVfcGF0aCgnY2hyb21p dW0tbWFjJykpCiAKICAgICBkZWYgdGVzdF9ncmFwaGljc190eXBlKHNlbGYpOgogICAgICAgICBw b3J0ID0gY2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydChwb3J0X25hbWU9J2Nocm9taXVtLWNn LW1hYycpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKCdjcHUtY2cnLCBwb3J0LmdyYXBoaWNz X3R5cGUoKSkKICAgICAgICAgcG9ydCA9IGNocm9taXVtX21hYy5DaHJvbWl1bU1hY1BvcnQocG9y dF9uYW1lPSdjaHJvbWl1bS1tYWMnKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscygnY3B1Jywg cG9ydC5ncmFwaGljc190eXBlKCkpCi0gICAgICAgICMgRm9yIG5vdywgTWFjIGRlZmF1bHRzIHRv IGNwdS1jZyBncmFwaGljcyB0eXBlLgorICAgICAgICAjIEZvciBub3csIE1hYyBkZWZhdWx0cyB0 byBjcHUgZ3JhcGhpY3MgdHlwZS4KICAgICAgICAgcG9ydCA9IGNocm9taXVtX21hYy5DaHJvbWl1 bU1hY1BvcnQoKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscygnY3B1LWNnJywgcG9ydC5ncmFw aGljc190eXBlKCkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKCdjcHUnLCBwb3J0LmdyYXBo aWNzX3R5cGUoKSkKIAogCiBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgo= 108505 2011-09-23 12:08:33 -0700 2011-09-23 12:45:50 -0700 Patch bug-68698-20110923150831.patch text/plain 8303 epoger SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA5NTg0MSkKKysrIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMDktMjMgIEVsbGlvdCBQb2dlciAgPGVwb2dlckBnb29nbGUuY29tPgorCisgICAg ICAgIHVwZGF0ZSBsYXlvdXRfdGVzdHMgdG8gYWNjb3VudCBmb3IgbmV3IGRlZmF1bHQgb2YgdXNl X3NraWE9MQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Njg2OTgKKworICAgICAgICBSb2xscyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RFUFMgdG8gcGlj ayB1cCBuZXcgZGVmYXVsdCB1c2Vfc2tpYT0xCisgICAgICAgIGZyb20gaHR0cDovL3NyYy5jaHJv bWl1bS5vcmcvdmlld3ZjL2Nocm9tZT92aWV3PXJldiZyZXZpc2lvbj0xMDI1MzIKKyAgICAgICAg KENocm9taXVtLW9uLU1hYyBub3cgdXNlcyB0aGUgU2tpYSBncmFwaGljcyBsaWJyYXJ5IGluc3Rl YWQgb2YKKyAgICAgICAgQ29yZSBHcmFwaGljcykuCisKKyAgICAgICAgQWxzbyB1cGRhdGVzIGxh eW91dF90ZXN0IGNvZGUgdG8gd29yayB3aXRoIHRoYXQgY2hhbmdlLgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogREVQUzoKKwogMjAxMS0wOS0yMiAg U2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZC4gIFJvbGxlZCBERVBTLgpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9ERVBT Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vREVQUwkocmV2aXNpb24gOTU4 NDEpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RFUFMJKHdvcmtpbmcgY29weSkKQEAgLTMy LDcgKzMyLDcgQEAKIAogdmFycyA9IHsKICAgJ2Nocm9taXVtX3N2bic6ICdodHRwOi8vc3JjLmNo cm9taXVtLm9yZy9zdm4vdHJ1bmsvc3JjJywKLSAgJ2Nocm9taXVtX3Jldic6ICcxMDIyNDcnCisg ICdjaHJvbWl1bV9yZXYnOiAnMTAyNTMyJwogfQogCiBkZXBzID0gewpAQCAtMTEwLDcgKzExMCw5 IEBAIGRlcHMgPSB7CiAgICd0aGlyZF9wYXJ0eS9saWJ3ZWJwJzoKICAgICBWYXIoJ2Nocm9taXVt X3N2bicpKycvdGhpcmRfcGFydHkvbGlid2VicEAnK1ZhcignY2hyb21pdW1fcmV2JyksCiAgICd0 b29scy9ncml0JzoKLSAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycvdG9vbHMvZ3JpdEAnK1Zhcign Y2hyb21pdW1fcmV2JyksCisgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdG9vbHMvZ3Jp dCcpLAorICAndG9vbHMvZ3JpdHNldHRpbmdzJzoKKyAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycv dG9vbHMvZ3JpdHNldHRpbmdzQCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwKICAgJ3Rvb2xzL2dlbmVy YXRlX3N0dWJzJzoKICAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycvdG9vbHMvZ2VuZXJhdGVfc3R1 YnNAJytWYXIoJ2Nocm9taXVtX3JldicpLAogICAndWknOgpJbmRleDogVG9vbHMvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gOTU4NDEpCisrKyBUb29s cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0wOS0yMyAg RWxsaW90IFBvZ2VyICA8ZXBvZ2VyQGdvb2dsZS5jb20+CisKKyAgICAgICAgdXBkYXRlIGxheW91 dF90ZXN0cyB0byBhY2NvdW50IGZvciBuZXcgZGVmYXVsdCBvZiB1c2Vfc2tpYT0xCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODY5OAorCisgICAgICAg IFJvbGxzIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vREVQUyB0byBwaWNrIHVwIG5ldyBkZWZhdWx0 IHVzZV9za2lhPTEKKyAgICAgICAgZnJvbSBodHRwOi8vc3JjLmNocm9taXVtLm9yZy92aWV3dmMv Y2hyb21lP3ZpZXc9cmV2JnJldmlzaW9uPTEwMjUzMgorICAgICAgICAoQ2hyb21pdW0tb24tTWFj IG5vdyB1c2VzIHRoZSBTa2lhIGdyYXBoaWNzIGxpYnJhcnkgaW5zdGVhZCBvZgorICAgICAgICBD b3JlIEdyYXBoaWNzKS4KKworICAgICAgICBBbHNvIHVwZGF0ZXMgbGF5b3V0X3Rlc3QgY29kZSB0 byB3b3JrIHdpdGggdGhhdCBjaGFuZ2UuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2No cm9taXVtX21hYy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2Nocm9taXVtX21hY191bml0dGVzdC5weToKKwogMjAxMS0wOS0yMyAgTWFyayBSb3dlICA8 bXJvd2VAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCB0aGUgYnVpbGQuCkluZGV4OiBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVt X21hYy5weQkocmV2aXNpb24gOTU4NDEpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weQkod29ya2luZyBjb3B5KQpAQCAtOTIsNyArOTIs NyBAQCBjbGFzcyBDaHJvbWl1bU1hY1BvcnQoY2hyb21pdW0uQ2hyb21pdW1QCiAgICAgZGVmIF9f aW5pdF9fKHNlbGYsIHBvcnRfbmFtZT1Ob25lLCBvc192ZXJzaW9uX3N0cmluZz1Ob25lLCAqKmt3 YXJncyk6CiAgICAgICAgICMgV2UncmUgYSBsaXR0bGUgZ2VuZXJpYyBoZXJlIGJlY2F1c2UgdGhp cyBjb2RlIGlzIHJldXNlZCBieSB0aGUKICAgICAgICAgIyAnZ29vZ2xlLWNocm9tZScgcG9ydCBh cyB3ZWxsIGFzIHRoZSAnbW9jay0nIGFuZCAnZHJ5cnVuLScgcG9ydHMuCi0gICAgICAgIHBvcnRf bmFtZSA9IHBvcnRfbmFtZSBvciAnY2hyb21pdW0tY2ctbWFjJyAgIyBGSVhNRTogQ2hhbmdlIHRo ZSBkZWZhdWx0IHRvIGNocm9taXVtLW1hYyBvbmNlIHdlJ3JlIHJlYWR5LgorICAgICAgICBwb3J0 X25hbWUgPSBwb3J0X25hbWUgb3IgJ2Nocm9taXVtLW1hYycKICAgICAgICAgY2hyb21pdW0uQ2hy b21pdW1Qb3J0Ll9faW5pdF9fKHNlbGYsIHBvcnRfbmFtZT1wb3J0X25hbWUsICoqa3dhcmdzKQog ICAgICAgICBpZiBwb3J0X25hbWUuZW5kc3dpdGgoJy1tYWMnKToKICAgICAgICAgICAgIHNlbGYu X3ZlcnNpb24gPSBtYWMub3NfdmVyc2lvbihvc192ZXJzaW9uX3N0cmluZywgc2VsZi5TVVBQT1JU RURfT1NfVkVSU0lPTlMpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2Nocm9taXVtX21hY191bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hY191bml0dGVzdC5weQko cmV2aXNpb24gOTU4NDEpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2Nocm9taXVtX21hY191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtNTEsNDQgKzUx LDQ0IEBAIGNsYXNzIENocm9taXVtTWFjUG9ydFRlc3QocG9ydF90ZXN0Y2FzZS4KIAogICAgIGRl ZiB0ZXN0X3ZlcnNpb25zKHNlbGYpOgogICAgICAgICBwb3J0ID0gY2hyb21pdW1fbWFjLkNocm9t aXVtTWFjUG9ydCgpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0Lm5hbWUoKSBpbiAoJ2No cm9taXVtLWNnLW1hYy1sZW9wYXJkJywgJ2Nocm9taXVtLWNnLW1hYy1zbm93bGVvcGFyZCcsICdj aHJvbWl1bS1jZy1tYWMtZnV0dXJlJykpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0Lm5h bWUoKSBpbiAoJ2Nocm9taXVtLW1hYy1sZW9wYXJkJywgJ2Nocm9taXVtLW1hYy1zbm93bGVvcGFy ZCcsICdjaHJvbWl1bS1tYWMtZnV0dXJlJykpCiAKLSAgICAgICAgc2VsZi5hc3NlcnRfbmFtZShO b25lLCAnMTAuNS4zJywgJ2Nocm9taXVtLWNnLW1hYy1sZW9wYXJkJykKLSAgICAgICAgc2VsZi5h c3NlcnRfbmFtZSgnY2hyb21pdW0tY2ctbWFjJywgJzEwLjUuMycsICdjaHJvbWl1bS1jZy1tYWMt bGVvcGFyZCcpCi0gICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9taXVtLWNnLW1hYy1sZW9w YXJkJywgJzEwLjUuMycsICdjaHJvbWl1bS1jZy1tYWMtbGVvcGFyZCcpCi0gICAgICAgIHNlbGYu YXNzZXJ0X25hbWUoJ2Nocm9taXVtLWNnLW1hYy1sZW9wYXJkJywgJzEwLjYuMycsICdjaHJvbWl1 bS1jZy1tYWMtbGVvcGFyZCcpCi0KLSAgICAgICAgc2VsZi5hc3NlcnRfbmFtZShOb25lLCAnMTAu Ni4zJywgJ2Nocm9taXVtLWNnLW1hYy1zbm93bGVvcGFyZCcpCi0gICAgICAgIHNlbGYuYXNzZXJ0 X25hbWUoJ2Nocm9taXVtLWNnLW1hYycsICcxMC42LjMnLCAnY2hyb21pdW0tY2ctbWFjLXNub3ds ZW9wYXJkJykKLSAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnY2hyb21pdW0tY2ctbWFjLXNub3ds ZW9wYXJkJywgJzEwLjUuMycsICdjaHJvbWl1bS1jZy1tYWMtc25vd2xlb3BhcmQnKQotICAgICAg ICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1jZy1tYWMtc25vd2xlb3BhcmQnLCAnMTAuNi4z JywgJ2Nocm9taXVtLWNnLW1hYy1zbm93bGVvcGFyZCcpCi0KLSAgICAgICAgc2VsZi5hc3NlcnRf bmFtZShOb25lLCAnMTAuNycsICdjaHJvbWl1bS1jZy1tYWMtbGlvbicpCi0gICAgICAgIHNlbGYu YXNzZXJ0X25hbWUoTm9uZSwgJzEwLjcuMycsICdjaHJvbWl1bS1jZy1tYWMtbGlvbicpCi0gICAg ICAgIHNlbGYuYXNzZXJ0X25hbWUoTm9uZSwgJzEwLjgnLCAnY2hyb21pdW0tY2ctbWFjLWZ1dHVy ZScpCi0gICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9taXVtLWNnLW1hYycsICcxMC43LjMn LCAnY2hyb21pdW0tY2ctbWFjLWxpb24nKQotICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdjaHJv bWl1bS1jZy1tYWMtZnV0dXJlJywgJzEwLjQuMycsICdjaHJvbWl1bS1jZy1tYWMtZnV0dXJlJykK LSAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnY2hyb21pdW0tY2ctbWFjLWZ1dHVyZScsICcxMC41 LjMnLCAnY2hyb21pdW0tY2ctbWFjLWZ1dHVyZScpCi0gICAgICAgIHNlbGYuYXNzZXJ0X25hbWUo J2Nocm9taXVtLWNnLW1hYy1mdXR1cmUnLCAnMTAuNi4zJywgJ2Nocm9taXVtLWNnLW1hYy1mdXR1 cmUnKQotICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1jZy1tYWMtZnV0dXJlJywg JzEwLjcuMycsICdjaHJvbWl1bS1jZy1tYWMtZnV0dXJlJykKKyAgICAgICAgc2VsZi5hc3NlcnRf bmFtZShOb25lLCAnMTAuNS4zJywgJ2Nocm9taXVtLW1hYy1sZW9wYXJkJykKKyAgICAgICAgc2Vs Zi5hc3NlcnRfbmFtZSgnY2hyb21pdW0tbWFjJywgJzEwLjUuMycsICdjaHJvbWl1bS1tYWMtbGVv cGFyZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9taXVtLW1hYy1sZW9wYXJkJywg JzEwLjUuMycsICdjaHJvbWl1bS1tYWMtbGVvcGFyZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0X25h bWUoJ2Nocm9taXVtLW1hYy1sZW9wYXJkJywgJzEwLjYuMycsICdjaHJvbWl1bS1tYWMtbGVvcGFy ZCcpCisKKyAgICAgICAgc2VsZi5hc3NlcnRfbmFtZShOb25lLCAnMTAuNi4zJywgJ2Nocm9taXVt LW1hYy1zbm93bGVvcGFyZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9taXVtLW1h YycsICcxMC42LjMnLCAnY2hyb21pdW0tbWFjLXNub3dsZW9wYXJkJykKKyAgICAgICAgc2VsZi5h c3NlcnRfbmFtZSgnY2hyb21pdW0tbWFjLXNub3dsZW9wYXJkJywgJzEwLjUuMycsICdjaHJvbWl1 bS1tYWMtc25vd2xlb3BhcmQnKQorICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1t YWMtc25vd2xlb3BhcmQnLCAnMTAuNi4zJywgJ2Nocm9taXVtLW1hYy1zbm93bGVvcGFyZCcpCisK KyAgICAgICAgc2VsZi5hc3NlcnRfbmFtZShOb25lLCAnMTAuNycsICdjaHJvbWl1bS1tYWMtbGlv bicpCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoTm9uZSwgJzEwLjcuMycsICdjaHJvbWl1bS1t YWMtbGlvbicpCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoTm9uZSwgJzEwLjgnLCAnY2hyb21p dW0tbWFjLWZ1dHVyZScpCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9taXVtLW1hYycs ICcxMC43LjMnLCAnY2hyb21pdW0tbWFjLWxpb24nKQorICAgICAgICBzZWxmLmFzc2VydF9uYW1l KCdjaHJvbWl1bS1tYWMtZnV0dXJlJywgJzEwLjQuMycsICdjaHJvbWl1bS1tYWMtZnV0dXJlJykK KyAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnY2hyb21pdW0tbWFjLWZ1dHVyZScsICcxMC41LjMn LCAnY2hyb21pdW0tbWFjLWZ1dHVyZScpCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9t aXVtLW1hYy1mdXR1cmUnLCAnMTAuNi4zJywgJ2Nocm9taXVtLW1hYy1mdXR1cmUnKQorICAgICAg ICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1tYWMtZnV0dXJlJywgJzEwLjcuMycsICdjaHJv bWl1bS1tYWMtZnV0dXJlJykKIAogICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhBc3NlcnRpb25F cnJvciwgc2VsZi5hc3NlcnRfbmFtZSwgTm9uZSwgJzEwLjQuMScsICdzaG91bGQtcmFpc2UtYXNz ZXJ0aW9uLXNvLXRoaXMtdmFsdWUtZG9lcy1ub3QtbWF0dGVyJykKIAogICAgIGRlZiB0ZXN0X2Jh c2VsaW5lX3BhdGgoc2VsZik6Ci0gICAgICAgIHBvcnQgPSBjaHJvbWl1bV9tYWMuQ2hyb21pdW1N YWNQb3J0KHBvcnRfbmFtZT0nY2hyb21pdW0tY2ctbWFjLWxlb3BhcmQnKQotICAgICAgICBzZWxm LmFzc2VydEVxdWFscyhwb3J0LmJhc2VsaW5lX3BhdGgoKSwgcG9ydC5fd2Via2l0X2Jhc2VsaW5l X3BhdGgoJ2Nocm9taXVtLWNnLW1hYy1sZW9wYXJkJykpCisgICAgICAgIHBvcnQgPSBjaHJvbWl1 bV9tYWMuQ2hyb21pdW1NYWNQb3J0KHBvcnRfbmFtZT0nY2hyb21pdW0tbWFjLWxlb3BhcmQnKQor ICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0LmJhc2VsaW5lX3BhdGgoKSwgcG9ydC5fd2Vi a2l0X2Jhc2VsaW5lX3BhdGgoJ2Nocm9taXVtLW1hYy1sZW9wYXJkJykpCiAKLSAgICAgICAgcG9y dCA9IGNocm9taXVtX21hYy5DaHJvbWl1bU1hY1BvcnQocG9ydF9uYW1lPSdjaHJvbWl1bS1jZy1t YWMtc25vd2xlb3BhcmQnKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0LmJhc2VsaW5l X3BhdGgoKSwgcG9ydC5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoJ2Nocm9taXVtLWNnLW1hYycpKQor ICAgICAgICBwb3J0ID0gY2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydChwb3J0X25hbWU9J2No cm9taXVtLW1hYy1zbm93bGVvcGFyZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQu YmFzZWxpbmVfcGF0aCgpLCBwb3J0Ll93ZWJraXRfYmFzZWxpbmVfcGF0aCgnY2hyb21pdW0tbWFj JykpCiAKICAgICBkZWYgdGVzdF9ncmFwaGljc190eXBlKHNlbGYpOgogICAgICAgICBwb3J0ID0g Y2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydChwb3J0X25hbWU9J2Nocm9taXVtLWNnLW1hYycp CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKCdjcHUtY2cnLCBwb3J0LmdyYXBoaWNzX3R5cGUo KSkKICAgICAgICAgcG9ydCA9IGNocm9taXVtX21hYy5DaHJvbWl1bU1hY1BvcnQocG9ydF9uYW1l PSdjaHJvbWl1bS1tYWMnKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscygnY3B1JywgcG9ydC5n cmFwaGljc190eXBlKCkpCi0gICAgICAgICMgRm9yIG5vdywgTWFjIGRlZmF1bHRzIHRvIGNwdS1j ZyBncmFwaGljcyB0eXBlLgorICAgICAgICAjIEZvciBub3csIE1hYyBkZWZhdWx0cyB0byBjcHUg Z3JhcGhpY3MgdHlwZS4KICAgICAgICAgcG9ydCA9IGNocm9taXVtX21hYy5DaHJvbWl1bU1hY1Bv cnQoKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscygnY3B1LWNnJywgcG9ydC5ncmFwaGljc190 eXBlKCkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKCdjcHUnLCBwb3J0LmdyYXBoaWNzX3R5 cGUoKSkKIAogCiBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgo=