54691 2011-02-17 14:50:58 -0800 nrwt: fix rebaselining for a generic directory 2011-02-18 14:48:45 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 54736 1 dpranke dpranke atwilson koz mihaip ojan oldest_to_newest 353185 0 dpranke 2011-02-17 14:50:58 -0800 nrwt: fix rebaselining for a generic directory 353186 1 82865 dpranke 2011-02-17 14:51:45 -0800 Created attachment 82865 Patch 353191 2 82867 dpranke 2011-02-17 15:07:19 -0800 Created attachment 82867 take two 353239 3 82875 dpranke 2011-02-17 16:24:10 -0800 Created attachment 82875 Patch 353240 4 dpranke 2011-02-17 16:30:15 -0800 Okay, this third patch is close to the "right" fix. I put "right" in quotation marks because there are at least two things wrong with using rebaseline-chromium-webkit-tests these days that keep it from being truly safe. The first is that we don't have a full complement of stable bots on the different versions (Win 7, Vista, SL), and so we hack around this in order to get the baselines in the right place. What should happen is that if you want something to go into chromium-win, you should either rebaseline the WIN-7 version of the test, or rebaseline all of the versions of the test and rely on the deduping logic to leave a single copy. The second is that I believe chromium-win-win7 is actually using platform/chromium-win-win7 as the baseline_path(), which is just wrong. I'm not fixing this now because I have another set of patches coming up that will fix this and continue to make the version code cleaner and more consistent across ports, and I'll fix it as part of that. We have a similar, but more debatable, issue w/ snow leopard (debatable because SL should either be using chromium-mac-snowleopard or chromium-mac depending on whether you think "lion" is a real port or not yet. 353838 5 83010 dpranke 2011-02-18 14:41:04 -0800 Created attachment 83010 clarify behavior of baseline_path for chromium-mac-snowleopard, chromium-win-win7 353849 6 dpranke 2011-02-18 14:48:45 -0800 Committed r79035: <http://trac.webkit.org/changeset/79035> 82865 2011-02-17 14:51:45 -0800 2011-02-17 15:07:17 -0800 Patch bug-54691-20110217145144.patch text/plain 2249 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogNzg4NTYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1NDgzMDQ3OGVmOWM0NzE5YTk0MTAyYTgwNjk1MjU2MDg2 ZGU2ODhjLi4yNjUwY2I4MjhjOWQ2NTIxNGI5OWE3NGRmMGE1ZTMyYjY3YjliNGM5IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDItMTcgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbnJ3dDogZml4IHJl YmFzZWxpbmluZyBmb3IgYSBnZW5lcmljIGRpcmVjdG9yeQorCisgICAgICAgIFRoZSByZWNlbnQg cm91bmQgb2YgdmVyc2lvbiBoYW5kbGluZyBjaGFuZ2VzIGJyb2tlIHRoZSBhYmlsaXR5CisgICAg ICAgIHRvIHJlYmFzZWxpbmUgaW50byBhIGdlbmVyaWMgZGlyZWN0b3J5LgorCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDY5MQorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW4ucHk6CisKIDIw MTEtMDItMTcgIEtldmluIE9sbGl2aWVyICA8a2V2aW5vQHRoZW9sbGl2aWVycy5jb20+CiAKICAg ICAgICAgW3d4XSBCdWlsZCBmaXhlcyBhZnRlciByZWNlbnQgY2hhbmdlcy4KZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW4u cHkKaW5kZXggODJkNTIxZjFjZWMyODM4ODY5NjNkMTdiMjYyOWRjMmMyYjg1ZWQxYy4uNDhiZjVj NzgyNmQ5ZGYzMzkyNDhmN2M5YmZiM2QzMzg0NzRjMmY0ZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW4ucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW4ucHkKQEAg LTcxLDggKzcxLDEwIEBAIGNsYXNzIENocm9taXVtV2luUG9ydChjaHJvbWl1bS5DaHJvbWl1bVBv cnQpOgogICAgICAgICBwb3J0X25hbWUgPSBwb3J0X25hbWUgb3IgJ2Nocm9taXVtLXdpbicKIAog ICAgICAgICBpZiBwb3J0X25hbWUuZW5kc3dpdGgoJy13aW4nKToKLSAgICAgICAgICAgIHNlbGYu X3ZlcnNpb24gPSBvc192ZXJzaW9uKHdpbmRvd3NfdmVyc2lvbikKLSAgICAgICAgICAgIHBvcnRf bmFtZSA9IHBvcnRfbmFtZSArICctJyArIHNlbGYuX3ZlcnNpb24KKyAgICAgICAgICAgIHBhc3MK KyAgICAgICAgICAgICMgc2VsZi5fdmVyc2lvbiA9IG9zX3ZlcnNpb24od2luZG93c192ZXJzaW9u KQorICAgICAgICAgICAgIyBwb3J0X25hbWUgPSBwb3J0X25hbWUgKyAnLScgKyBzZWxmLl92ZXJz aW9uCisgICAgICAgICAgICBzZWxmLl92ZXJzaW9uID0gTm9uZQogICAgICAgICBlbHNlOgogICAg ICAgICAgICAgc2VsZi5fdmVyc2lvbiA9IHBvcnRfbmFtZVtwb3J0X25hbWUuaW5kZXgoJy13aW4t JykgKyA1Ol0KICAgICAgICAgICAgIGFzc2VydCBzZWxmLl92ZXJzaW9uIGluIHNlbGYuU1VQUE9S VEVEX1ZFUlNJT05TCkBAIC05Nyw4ICs5OSwxMSBAQCBjbGFzcyBDaHJvbWl1bVdpblBvcnQoY2hy b21pdW0uQ2hyb21pdW1Qb3J0KToKICAgICAgICAgcmV0dXJuIGVudgogCiAgICAgZGVmIGJhc2Vs aW5lX3NlYXJjaF9wYXRoKHNlbGYpOgotICAgICAgICBwb3J0X25hbWVzID0gc2VsZi5GQUxMQkFD S19QQVRIU1tzZWxmLnZlcnNpb24oKV0KLSAgICAgICAgcmV0dXJuIG1hcChzZWxmLl93ZWJraXRf YmFzZWxpbmVfcGF0aCwgcG9ydF9uYW1lcykKKyAgICAgICAgaWYgc2VsZi5fdmVyc2lvbjoKKyAg ICAgICAgICAgIHBvcnRfbmFtZXMgPSBzZWxmLkZBTExCQUNLX1BBVEhTW3NlbGYudmVyc2lvbigp XQorICAgICAgICAgICAgcmV0dXJuIG1hcChzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aCwgcG9y dF9uYW1lcykKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHJldHVybiBbc2VsZi5fd2Via2l0 X2Jhc2VsaW5lX3BhdGgoc2VsZi5fbmFtZSldCiAKICAgICBkZWYgY2hlY2tfYnVpbGQoc2VsZiwg bmVlZHNfaHR0cCk6CiAgICAgICAgIHJlc3VsdCA9IGNocm9taXVtLkNocm9taXVtUG9ydC5jaGVj a19idWlsZChzZWxmLCBuZWVkc19odHRwKQo= 82867 2011-02-17 15:07:19 -0800 2011-02-17 16:24:08 -0800 take two bug-54691-20110217150718.patch text/plain 2447 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogNzg4NTYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1NDgzMDQ3OGVmOWM0NzE5YTk0MTAyYTgwNjk1MjU2MDg2 ZGU2ODhjLi4yNjUwY2I4MjhjOWQ2NTIxNGI5OWE3NGRmMGE1ZTMyYjY3YjliNGM5IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDItMTcgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbnJ3dDogZml4IHJl YmFzZWxpbmluZyBmb3IgYSBnZW5lcmljIGRpcmVjdG9yeQorCisgICAgICAgIFRoZSByZWNlbnQg cm91bmQgb2YgdmVyc2lvbiBoYW5kbGluZyBjaGFuZ2VzIGJyb2tlIHRoZSBhYmlsaXR5CisgICAg ICAgIHRvIHJlYmFzZWxpbmUgaW50byBhIGdlbmVyaWMgZGlyZWN0b3J5LgorCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDY5MQorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW4ucHk6CisKIDIw MTEtMDItMTcgIEtldmluIE9sbGl2aWVyICA8a2V2aW5vQHRoZW9sbGl2aWVycy5jb20+CiAKICAg ICAgICAgW3d4XSBCdWlsZCBmaXhlcyBhZnRlciByZWNlbnQgY2hhbmdlcy4KZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW4u cHkKaW5kZXggODJkNTIxZjFjZWMyODM4ODY5NjNkMTdiMjYyOWRjMmMyYjg1ZWQxYy4uMjM4NTI4 OWM3YmRlYmVhZmQwODhhYThjMmEzNjdhNGE3OGIwZmVmOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW4ucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW4ucHkKQEAg LTYzLDYgKzYzLDcgQEAgY2xhc3MgQ2hyb21pdW1XaW5Qb3J0KGNocm9taXVtLkNocm9taXVtUG9y dCk6CiAgICAgICAgICd4cCc6IFsnY2hyb21pdW0td2luLXhwJywgJ2Nocm9taXVtLXdpbi12aXN0 YScsICdjaHJvbWl1bS13aW4nLCAnY2hyb21pdW0nLCAnd2luJywgJ21hYyddLAogICAgICAgICAn dmlzdGEnOiBbJ2Nocm9taXVtLXdpbi12aXN0YScsICdjaHJvbWl1bS13aW4nLCAnY2hyb21pdW0n LCAnd2luJywgJ21hYyddLAogICAgICAgICAnd2luNyc6IFsnY2hyb21pdW0td2luJywgJ2Nocm9t aXVtJywgJ3dpbicsICdtYWMnXSwKKyAgICAgICAgJyc6IFsnY2hyb21pdW0td2luJywgJ2Nocm9t aXVtJywgJ3dpbicsICdtYWMnXSwKICAgICB9CiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgcG9y dF9uYW1lPU5vbmUsIHdpbmRvd3NfdmVyc2lvbj1Ob25lLCAqKmt3YXJncyk6CkBAIC03MSw4ICs3 Miw5IEBAIGNsYXNzIENocm9taXVtV2luUG9ydChjaHJvbWl1bS5DaHJvbWl1bVBvcnQpOgogICAg ICAgICBwb3J0X25hbWUgPSBwb3J0X25hbWUgb3IgJ2Nocm9taXVtLXdpbicKIAogICAgICAgICBp ZiBwb3J0X25hbWUuZW5kc3dpdGgoJy13aW4nKToKLSAgICAgICAgICAgIHNlbGYuX3ZlcnNpb24g PSBvc192ZXJzaW9uKHdpbmRvd3NfdmVyc2lvbikKLSAgICAgICAgICAgIHBvcnRfbmFtZSA9IHBv cnRfbmFtZSArICctJyArIHNlbGYuX3ZlcnNpb24KKyAgICAgICAgICAgICNzZWxmLl92ZXJzaW9u ID0gb3NfdmVyc2lvbih3aW5kb3dzX3ZlcnNpb24pCisgICAgICAgICAgICAjcG9ydF9uYW1lID0g cG9ydF9uYW1lICsgJy0nICsgc2VsZi5fdmVyc2lvbgorICAgICAgICAgICAgc2VsZi5fdmVyc2lv biA9ICcnCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBzZWxmLl92ZXJzaW9uID0gcG9ydF9u YW1lW3BvcnRfbmFtZS5pbmRleCgnLXdpbi0nKSArIDU6XQogICAgICAgICAgICAgYXNzZXJ0IHNl bGYuX3ZlcnNpb24gaW4gc2VsZi5TVVBQT1JURURfVkVSU0lPTlMKQEAgLTExOCw2ICsxMjAsOCBA QCBjbGFzcyBDaHJvbWl1bVdpblBvcnQoY2hyb21pdW0uQ2hyb21pdW1Qb3J0KToKICAgICAgICAg IyBXZSByZXR1cm4gJ3dpbi14cCcsIG5vdCAnY2hyb21pdW0td2luLXhwJyBoZXJlLCBmb3IgY29u dmVuaWVuY2UuCiAKICAgICAgICAgIyBGSVhNRTogR2V0IHJpZCBvZiB0aGlzIG1ldGhvZCBhZnRl ciByZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cyBkaWVzLgorICAgICAgICBpZiBzZWxm LnZlcnNpb24oKSA9PSAnJzoKKyAgICAgICAgICAgIHJldHVybiAnd2luJwogICAgICAgICByZXR1 cm4gJ3dpbi0nICsgc2VsZi52ZXJzaW9uKCkKIAogICAgIGRlZiB2ZXJzaW9uKHNlbGYpOgo= 82875 2011-02-17 16:24:10 -0800 2011-02-18 14:41:01 -0800 Patch bug-54691-20110217162409.patch text/plain 9843 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogNzg4NTYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1NDgzMDQ3OGVmOWM0NzE5YTk0MTAyYTgwNjk1MjU2MDg2 ZGU2ODhjLi5mZWNmZjQ5NTY2OWU0ZjUyMzA4NjFjNWY1ZTQzZjgxNWE2MjUwZGQ1IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTEtMDItMTcgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbmV3LXJ1bi13ZWJr aXQtdGVzdHM6IHI3ODUyMiBtYWRlIGl0IGltcG9zc2libGUgdG8gY3JlYXRlIGEKKyAgICAgICAg J2Nocm9taXVtLXdpbicgb3IgJ2Nocm9taXVtLW1hYycgcG9ydDsgdGhleSB3b3VsZCBhbHdheXMg Z2V0IHRoZQorICAgICAgICB2ZXJzaW9uIHRhY2tlZCBvbiB0byB0aGUgZW5kLiBJdCB0dXJucyBv dXQgdGhhdCB3ZSBhY3R1YWxseSBuZWVkCisgICAgICAgIHRvIGJlIGFibGUgdG8gY3JlYXRlIHRo ZXNlIHBvcnRzIGluIG9yZGVyIGZvcgorICAgICAgICByZWJhc2VsaW5lLWNocm9taXVtLXdlYmtp dC10ZXN0cyB0byB3b3JrIGNvcnJlY3RseSBnaXZlbiB0aGUKKyAgICAgICAgYnJva2VuIGNvdmVy YWdlIG9mIG91ciBsYXlvdXQgYm90cy4gQXMgc29vbiBhcyB3ZSBnZXQgU0wgYW5kCisgICAgICAg IFdpbiA3IGJvdHMgcnVubmluZyByZWxpYWJseSBvbiB0aGUgY2FuYXJpZXMsIHdlIGNhbiBnZXQg cmlkIG9mCisgICAgICAgIHRoaXMgY2hhbmdlLiBOb3RlIHRoYXQgd2Ugb25seSBuZWVkIHRvIGNo YW5nZSB0aGUgY2hyb21pdW1fbWFjCisgICAgICAgIGFuZCB3aW4gcG9ydHMgYmVjYXVzZSBsaW51 eCBkb2Vzbid0IHlldCB1c2UgdmVyc2lvbnMgYW5kIHRoYXQKKyAgICAgICAgc2NyaXB0IGRvZXNu J3Qgd29yayB3aXRoIG5vbi1jaHJvbWl1bSBwb3J0cy4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQ2OTEKKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5OgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjX3VuaXR0ZXN0LnB5Ogor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2lu LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21p dW1fd2luX3VuaXR0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3JlYmFzZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rlc3RzLnB5OgorCiAyMDExLTAyLTE3ICBL ZXZpbiBPbGxpdmllciAgPGtldmlub0B0aGVvbGxpdmllcnMuY29tPgogCiAgICAgICAgIFt3eF0g QnVpbGQgZml4ZXMgYWZ0ZXIgcmVjZW50IGNoYW5nZXMuCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5CmluZGV4IDEy NWFkYTUwYWQyNTg5OTE4NDNmYTMyMzIyYmQ5ZjBiZWI4ZTlmOTYuLjQzOWM1ODg4Mjc0MWEzOTlh ZmFjOWRhMDM5OTFlM2RhZDU4N2YzYzcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5CkBAIC01MCwxNiArNTAs MjkgQEAgY2xhc3MgQ2hyb21pdW1NYWNQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAgICAg ICAgICAgICAgICAgICAgICdtYWMtbGVvcGFyZCcsICdtYWMtc25vd2xlb3BhcmQnLCAnbWFjJ10s CiAgICAgICAgICdzbm93bGVvcGFyZCc6IFsnY2hyb21pdW0tbWFjLXNub3dsZW9wYXJkJywgJ2No cm9taXVtLW1hYycsICdjaHJvbWl1bScsCiAgICAgICAgICAgICAgICAgICAgICAgICAnbWFjLXNu b3dsZW9wYXJkJywgJ21hYyddLAorICAgICAgICAnJzogWydjaHJvbWl1bS1tYWMnLCAnY2hyb21p dW0nLCAnbWFjJ10sCiAgICAgfQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnRfbmFtZT1O b25lLCBvc192ZXJzaW9uX3N0cmluZz1Ob25lLCAqKmt3YXJncyk6CisgICAgZGVmIF9faW5pdF9f KHNlbGYsIHBvcnRfbmFtZT1Ob25lLCBvc192ZXJzaW9uX3N0cmluZz1Ob25lLCByZWJhc2VsaW5p bmc9RmFsc2UsICoqa3dhcmdzKToKICAgICAgICAgIyBXZSdyZSBhIGxpdHRsZSBnZW5lcmljIGhl cmUgYmVjYXVzZSB0aGlzIGNvZGUgaXMgcmV1c2VkIGJ5IHRoZQogICAgICAgICAjICdnb29nbGUt Y2hyb21lJyBwb3J0IGFzIHdlbGwgYXMgdGhlICdtb2NrLScgYW5kICdkcnlydW4tJyBwb3J0cy4K ICAgICAgICAgcG9ydF9uYW1lID0gcG9ydF9uYW1lIG9yICdjaHJvbWl1bS1tYWMnCiAKICAgICAg ICAgaWYgcG9ydF9uYW1lLmVuZHN3aXRoKCctbWFjJyk6Ci0gICAgICAgICAgICBzZWxmLl92ZXJz aW9uID0gbWFjLm9zX3ZlcnNpb24ob3NfdmVyc2lvbl9zdHJpbmcsIHNlbGYuU1VQUE9SVEVEX09T X1ZFUlNJT05TKQotICAgICAgICAgICAgcG9ydF9uYW1lID0gcG9ydF9uYW1lICsgJy0nICsgc2Vs Zi5fdmVyc2lvbgorICAgICAgICAgICAgIyBGSVhNRTogVGhlIHJlYmFzZWxpbmluZyBmbGFnIGlz IGFuIHVnbHkgaGFjayB0aGF0IGxldHMgdXMgY3JlYXRlIGFuCisgICAgICAgICAgICAjICJjaHJv bWl1bS1tYWMiIHBvcnQgdGhhdCBpcyBub3QgdmVyc2lvbi1zcGVjaWZpYy4gSXQgc2hvdWxkIG9u bHkgYmUKKyAgICAgICAgICAgICMgdXNlZCBieSByZWJhc2VsaW5lLWNocm9taXVtLXdlYmtpdC10 ZXN0cyB0byBleHBsaWNpdGx5IHB1dCBmaWxlcyBpbnRvCisgICAgICAgICAgICAjIHRoZSBnZW5l cmljIGRpcmVjdG9yeS4gSW4gdGhlb3J5IHdlIHNob3VsZG4ndCBuZWVkIHRoaXMsIGJlY2F1c2UK KyAgICAgICAgICAgICMgdGhlIG5ld2VzdCBtYWMgcG9ydCBzaG91bGQgYmUgdXNpbmcgJ2Nocm9t aXVtLW1hYycgYXMgdGhlIGJhc2VsaW5lCisgICAgICAgICAgICAjIGRpcmVjdG9yeS4gSG93ZXZl ciwgd2UgYWxzbyBkb24ndCBoYXZlIHN0YWJsZSBTTCBib3RzIDooCisgICAgICAgICAgICAjCisg ICAgICAgICAgICAjIFdoZW4gd2UgcmVtb3ZlIHRoaXMgRklYTUUsIHdlIGFsc28gbmVlZCB0byBy ZW1vdmUgJycgYXMgYSB2YWxpZAorICAgICAgICAgICAgIyBmYWxsYmFjayBrZXkgaW4gc2VsZi5G QUxMQkFDS19QQVRIUy4KKyAgICAgICAgICAgIGlmIHJlYmFzZWxpbmluZzoKKyAgICAgICAgICAg ICAgICBzZWxmLl92ZXJzaW9uID0gJycKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAg ICAgc2VsZi5fdmVyc2lvbiA9IG1hYy5vc192ZXJzaW9uKG9zX3ZlcnNpb25fc3RyaW5nLCBzZWxm LlNVUFBPUlRFRF9PU19WRVJTSU9OUykKKyAgICAgICAgICAgICAgICBwb3J0X25hbWUgPSBwb3J0 X25hbWUgKyAnLScgKyBzZWxmLl92ZXJzaW9uCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBz ZWxmLl92ZXJzaW9uID0gcG9ydF9uYW1lW3BvcnRfbmFtZS5pbmRleCgnLW1hYy0nKSArIDU6XQog ICAgICAgICAgICAgYXNzZXJ0IHNlbGYuX3ZlcnNpb24gaW4gc2VsZi5TVVBQT1JURURfT1NfVkVS U0lPTlMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvY2hyb21pdW1fbWFjX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWNfdW5pdHRlc3QucHkKaW5kZXggNGNhYjJmMDgwMGM4 OWVjODUzNzRiYWIwNWUyMGNkMmFjNTJiMWE4NS4uYmYxYWZiNzY3MzBjNDY0NjdiZjQxZGJhNDA3 YjA3MWZmN2YyZDBhYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9jaHJvbWl1bV9tYWNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWNfdW5pdHRlc3QucHkKQEAgLTY4 LDYgKzY4LDE2IEBAIGNsYXNzIENocm9taXVtTWFjUG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0 VGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhLZXlFcnJvciwgc2VsZi5hc3Nl cnRfbmFtZSwgTm9uZSwgJzEwLjcuMScsICdjaHJvbWl1bS1tYWMtbGVvcGFyZCcpCiAgICAgICAg IHNlbGYuYXNzZXJ0UmFpc2VzKEFzc2VydGlvbkVycm9yLCBzZWxmLmFzc2VydF9uYW1lLCBOb25l LCAnMTAuNC4xJywgJ2Nocm9taXVtLW1hYy1sZW9wYXJkJykKIAorICAgIGRlZiB0ZXN0X2dlbmVy aWNfcmViYXNlbGluaW5nX3BvcnQoc2VsZik6CisgICAgICAgIHBvcnQgPSBjaHJvbWl1bV9tYWMu Q2hyb21pdW1NYWNQb3J0KHJlYmFzZWxpbmluZz1UcnVlKQorICAgICAgICBzZWxmLmFzc2VydEVx dWFscyhwb3J0Lm5hbWUoKSwgJ2Nocm9taXVtLW1hYycpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxzKHBvcnQudmVyc2lvbigpLCAnJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5i YXNlbGluZV9wYXRoKCksIHBvcnQuX3dlYmtpdF9iYXNlbGluZV9wYXRoKHBvcnQubmFtZSgpKSkK KworICAgICAgICBwb3J0ID0gY2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydChwb3J0X25hbWU9 J2Nocm9taXVtLW1hYy1sZW9wYXJkJywgcmViYXNlbGluaW5nPVRydWUpCisgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWxzKHBvcnQubmFtZSgpLCAnY2hyb21pdW0tbWFjLWxlb3BhcmQnKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFscyhwb3J0LmJhc2VsaW5lX3BhdGgoKSwgcG9ydC5fd2Via2l0X2Jh c2VsaW5lX3BhdGgocG9ydC5uYW1lKCkpKQorCiAKIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6 CiAgICAgdW5pdHRlc3QubWFpbigpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3dpbi5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5CmluZGV4IDgyZDUyMWYxY2VjMjgz ODg2OTYzZDE3YjI2MjlkYzJjMmI4NWVkMWMuLjE0Y2YyNTkzYTg4MjYyMzUxZTFhYjQzNDQwYjU4 MDI2OTAxMGRmMDcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvY2hyb21pdW1fd2luLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5CkBAIC02MywxNiArNjMsMjkgQEAgY2xhc3Mg Q2hyb21pdW1XaW5Qb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAgICAgICAgICd4cCc6IFsn Y2hyb21pdW0td2luLXhwJywgJ2Nocm9taXVtLXdpbi12aXN0YScsICdjaHJvbWl1bS13aW4nLCAn Y2hyb21pdW0nLCAnd2luJywgJ21hYyddLAogICAgICAgICAndmlzdGEnOiBbJ2Nocm9taXVtLXdp bi12aXN0YScsICdjaHJvbWl1bS13aW4nLCAnY2hyb21pdW0nLCAnd2luJywgJ21hYyddLAogICAg ICAgICAnd2luNyc6IFsnY2hyb21pdW0td2luJywgJ2Nocm9taXVtJywgJ3dpbicsICdtYWMnXSwK KyAgICAgICAgJyc6IFsnY2hyb21pdW0td2luJywgJ2Nocm9taXVtJywgJ3dpbicsICdtYWMnXSwK ICAgICB9CiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcG9ydF9uYW1lPU5vbmUsIHdpbmRvd3Nf dmVyc2lvbj1Ob25lLCAqKmt3YXJncyk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnRfbmFt ZT1Ob25lLCB3aW5kb3dzX3ZlcnNpb249Tm9uZSwgcmViYXNlbGluaW5nPUZhbHNlLCAqKmt3YXJn cyk6CiAgICAgICAgICMgV2UncmUgYSBsaXR0bGUgZ2VuZXJpYyBoZXJlIGJlY2F1c2UgdGhpcyBj b2RlIGlzIHJldXNlZCBieSB0aGUKICAgICAgICAgIyAnZ29vZ2xlLWNocm9tZScgcG9ydCBhcyB3 ZWxsIGFzIHRoZSAnbW9jay0nIGFuZCAnZHJ5cnVuLScgcG9ydHMuCiAgICAgICAgIHBvcnRfbmFt ZSA9IHBvcnRfbmFtZSBvciAnY2hyb21pdW0td2luJwogCiAgICAgICAgIGlmIHBvcnRfbmFtZS5l bmRzd2l0aCgnLXdpbicpOgotICAgICAgICAgICAgc2VsZi5fdmVyc2lvbiA9IG9zX3ZlcnNpb24o d2luZG93c192ZXJzaW9uKQotICAgICAgICAgICAgcG9ydF9uYW1lID0gcG9ydF9uYW1lICsgJy0n ICsgc2VsZi5fdmVyc2lvbgorICAgICAgICAgICAgIyBGSVhNRTogVGhlIHJlYmFzZWxpbmluZyBm bGFnIGlzIGFuIHVnbHkgaGFjayB0aGF0IGxldHMgdXMgY3JlYXRlIGFuCisgICAgICAgICAgICAj ICJjaHJvbWl1bS13aW4iIHBvcnQgdGhhdCBpcyBub3QgdmVyc2lvbi1zcGVjaWZpYy4gSXQgc2hv dWxkIG9ubHkgYmUKKyAgICAgICAgICAgICMgdXNlZCBieSByZWJhc2VsaW5lLWNocm9taXVtLXdl YmtpdC10ZXN0cyB0byBleHBsaWNpdGx5IHB1dCBmaWxlcyBpbnRvCisgICAgICAgICAgICAjIHRo ZSBnZW5lcmljIGRpcmVjdG9yeS4gSW4gdGhlb3J5IHdlIHNob3VsZG4ndCBuZWVkIHRoaXMsIGJl Y2F1c2UKKyAgICAgICAgICAgICMgdGhlIG5ld2VzdCB3aW4gcG9ydCBzaG91bGQgYmUgdXNpbmcg J2Nocm9taXVtLXdpbicgYXMgdGhlIGJhc2VsaW5lCisgICAgICAgICAgICAjIGRpcmVjdG9yeS4g SG93ZXZlciwgd2UgYWxzbyBkb24ndCBoYXZlIHN0YWJsZSBXaW4gNyBib3RzIDooCisgICAgICAg ICAgICAjCisgICAgICAgICAgICAjIFdoZW4gd2UgcmVtb3ZlIHRoaXMgRklYTUUsIHdlIGFsc28g bmVlZCB0byByZW1vdmUgJycgYXMgYSB2YWxpZAorICAgICAgICAgICAgIyBmYWxsYmFjayBrZXkg aW4gc2VsZi5GQUxMQkFDS19QQVRIUy4KKyAgICAgICAgICAgIGlmIHJlYmFzZWxpbmluZzoKKyAg ICAgICAgICAgICAgICBzZWxmLl92ZXJzaW9uID0gJycKKyAgICAgICAgICAgIGVsc2U6CisgICAg ICAgICAgICAgICAgc2VsZi5fdmVyc2lvbiA9IG9zX3ZlcnNpb24od2luZG93c192ZXJzaW9uKQor ICAgICAgICAgICAgICAgIHBvcnRfbmFtZSA9IHBvcnRfbmFtZSArICctJyArIHNlbGYuX3ZlcnNp b24KICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHNlbGYuX3ZlcnNpb24gPSBwb3J0X25hbWVb cG9ydF9uYW1lLmluZGV4KCctd2luLScpICsgNTpdCiAgICAgICAgICAgICBhc3NlcnQgc2VsZi5f dmVyc2lvbiBpbiBzZWxmLlNVUFBPUlRFRF9WRVJTSU9OUwpAQCAtMTE4LDYgKzEzMSw4IEBAIGNs YXNzIENocm9taXVtV2luUG9ydChjaHJvbWl1bS5DaHJvbWl1bVBvcnQpOgogICAgICAgICAjIFdl IHJldHVybiAnd2luLXhwJywgbm90ICdjaHJvbWl1bS13aW4teHAnIGhlcmUsIGZvciBjb252ZW5p ZW5jZS4KIAogICAgICAgICAjIEZJWE1FOiBHZXQgcmlkIG9mIHRoaXMgbWV0aG9kIGFmdGVyIHJl YmFzZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rlc3RzIGRpZXMuCisgICAgICAgIGlmIHNlbGYudmVy c2lvbigpID09ICcnOgorICAgICAgICAgICAgcmV0dXJuICd3aW4nCiAgICAgICAgIHJldHVybiAn d2luLScgKyBzZWxmLnZlcnNpb24oKQogCiAgICAgZGVmIHZlcnNpb24oc2VsZik6CmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3dp bl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv Y2hyb21pdW1fd2luX3VuaXR0ZXN0LnB5CmluZGV4IDkwYmMzOGFiZGUyMzk0YTkyOGEzZWNhNDA0 ZGQ0ZTZkNjhkNmI4NmEuLmI3NjlkY2RhMDA5YTFiZWZmODMxZWUzYTc2ZWUzYWExZGNlYjY2MWQg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW1fd2luX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luX3VuaXR0ZXN0LnB5CkBAIC0xMTksNiArMTE5LDE2IEBA IGNsYXNzIENocm9taXVtV2luVGVzdChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6CiAgICAg ICAgIHNlbGYuYXNzZXJ0UmFpc2VzKEtleUVycm9yLCBzZWxmLmFzc2VydF9uYW1lLCBOb25lLCAo NSwgMiksICdjaHJvbWl1bS13aW4teHAnKQogICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhLZXlF cnJvciwgc2VsZi5hc3NlcnRfbmFtZSwgTm9uZSwgKDcsIDEpLCAnY2hyb21pdW0td2luLXhwJykK IAorICAgIGRlZiB0ZXN0X2dlbmVyaWNfcmViYXNlbGluaW5nX3BvcnQoc2VsZik6CisgICAgICAg IHBvcnQgPSBjaHJvbWl1bV93aW4uQ2hyb21pdW1XaW5Qb3J0KHJlYmFzZWxpbmluZz1UcnVlKQor ICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0Lm5hbWUoKSwgJ2Nocm9taXVtLXdpbicpCisg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQudmVyc2lvbigpLCAnJykKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbHMocG9ydC5iYXNlbGluZV9wYXRoKCksIHBvcnQuX3dlYmtpdF9iYXNlbGlu ZV9wYXRoKHBvcnQubmFtZSgpKSkKKworICAgICAgICBwb3J0ID0gY2hyb21pdW1fd2luLkNocm9t aXVtV2luUG9ydChwb3J0X25hbWU9J2Nocm9taXVtLXdpbi14cCcsIHJlYmFzZWxpbmluZz1UcnVl KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0Lm5hbWUoKSwgJ2Nocm9taXVtLXdpbi14 cCcpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuYmFzZWxpbmVfcGF0aCgpLCBwb3J0 Ll93ZWJraXRfYmFzZWxpbmVfcGF0aChwb3J0Lm5hbWUoKSkpCisKIAogaWYgX19uYW1lX18gPT0g J19fbWFpbl9fJzoKICAgICB1bml0dGVzdC5tYWluKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3JlYmFzZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rlc3Rz LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcmViYXNlbGluZV9jaHJv bWl1bV93ZWJraXRfdGVzdHMucHkKaW5kZXggNTY3OTc1Y2E3MWZkNmFjMzdkODJlM2EyZWJkMzU2 YmM4NDJiNDE4OC4uNDVlY2U4YTMzZTdiZDRlZGRkZDM2ZmNjMmJjMTIxOGI5OGY1MTlkZSAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcmViYXNlbGluZV9j aHJvbWl1bV93ZWJraXRfdGVzdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVzdHMucHkKQEAgLTE2MCw5ICsx NjAsMTEgQEAgY2xhc3MgUmViYXNlbGluZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5fZmlsZXN5 c3RlbSA9IHJ1bm5pbmdfcG9ydC5fZmlsZXN5c3RlbQogICAgICAgICBzZWxmLl90YXJnZXRfcG9y dCA9IHRhcmdldF9wb3J0CiAKKyAgICAgICAgIyBGSVhNRTogU2VlIHRoZSBjb21tZW50cyBpbiBj aHJvbWl1bV97d2luLG1hY30ucHkgYWJvdXQgd2h5IHdlIG5lZWQKKyAgICAgICAgIyB0aGUgJ3Jl YmFzZWxpbmluZycga2V5d29yZC4KICAgICAgICAgc2VsZi5fcmViYXNlbGluZV9wb3J0ID0gcG9y dC5nZXQoCiAgICAgICAgICAgICBzZWxmLl90YXJnZXRfcG9ydC50ZXN0X3BsYXRmb3JtX25hbWVf dG9fbmFtZShwbGF0Zm9ybSksIG9wdGlvbnMsCi0gICAgICAgICAgICBmaWxlc3lzdGVtPXNlbGYu X2ZpbGVzeXN0ZW0pCisgICAgICAgICAgICBmaWxlc3lzdGVtPXNlbGYuX2ZpbGVzeXN0ZW0sIHJl YmFzZWxpbmluZz1UcnVlKQogICAgICAgICBzZWxmLl9yZWJhc2VsaW5pbmdfdGVzdHMgPSBbXQog ICAgICAgICBzZWxmLl9yZWJhc2VsaW5lZF90ZXN0cyA9IFtdCiAK 83010 2011-02-18 14:41:04 -0800 2011-02-18 14:42:53 -0800 clarify behavior of baseline_path for chromium-mac-snowleopard, chromium-win-win7 bug-54691-20110218144102.patch text/plain 11588 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogNzkwMzMKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhOWU0YjgwMzQ4NzAzMDc5NmEyYWVhZWU2ZjFiOWFhMDk3 NTc2ODRiLi42MWNhNTUxOGEwZWY0YWZhYTBjMjhmMzc3NTQ0ZmY3YmNmOWVhNjE5IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTEtMDItMTggIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgT2phbiBWYWZhaS4KKworICAgICAgICBuZXctcnVuLXdlYmtpdC10 ZXN0czogcjc4NTIyIG1hZGUgaXQgaW1wb3NzaWJsZSB0byBjcmVhdGUgYQorICAgICAgICAnY2hy b21pdW0td2luJyBvciAnY2hyb21pdW0tbWFjJyBwb3J0OyB0aGV5IHdvdWxkIGFsd2F5cyBnZXQg dGhlCisgICAgICAgIHZlcnNpb24gdGFja2VkIG9uIHRvIHRoZSBlbmQuIEl0IHR1cm5zIG91dCB0 aGF0IHdlIGFjdHVhbGx5IG5lZWQKKyAgICAgICAgdG8gYmUgYWJsZSB0byBjcmVhdGUgdGhlc2Ug cG9ydHMgaW4gb3JkZXIgZm9yCisgICAgICAgIHJlYmFzZWxpbmUtY2hyb21pdW0td2Via2l0LXRl c3RzIHRvIHdvcmsgY29ycmVjdGx5IGdpdmVuIHRoZQorICAgICAgICBicm9rZW4gY292ZXJhZ2Ug b2Ygb3VyIGxheW91dCBib3RzLiBBcyBzb29uIGFzIHdlIGdldCBTTCBhbmQKKyAgICAgICAgV2lu IDcgYm90cyBydW5uaW5nIHJlbGlhYmx5IG9uIHRoZSBjYW5hcmllcywgd2UgY2FuIGdldCByaWQg b2YKKyAgICAgICAgdGhpcyBjaGFuZ2UuIE5vdGUgdGhhdCB3ZSBvbmx5IG5lZWQgdG8gY2hhbmdl IHRoZSBjaHJvbWl1bV9tYWMKKyAgICAgICAgYW5kIHdpbiBwb3J0cyBiZWNhdXNlIGxpbnV4IGRv ZXNuJ3QgeWV0IHVzZSB2ZXJzaW9ucyBhbmQgdGhhdAorICAgICAgICBzY3JpcHQgZG9lc24ndCB3 b3JrIHdpdGggbm9uLWNocm9taXVtIHBvcnRzLgorCisgICAgICAgIEFsc28sIHRoaXMgY2hhbmdl IGZpeGVzIGEgYnVnIHdoZXJlIHdlIHdlcmUgdXNpbmcKKyAgICAgICAgInBsYXRmb3JtL2Nocm9t aXVtLXdpbi13aW43IiBhbmQKKyAgICAgICAgInBsYXRmb3JtL2Nocm9taXVtLW1hYy1zbm93bGVv cGFyZCIgYXMgdGhlIGJhc2VsaW5lIGRpcnMgZm9yCisgICAgICAgIFdpbiA3IGFuZCBTTDsgd2Ug c2hvdWxkJ3ZlIGJlZW4gdXNpbmcgdGhlIGdlbmVyaWMgZGlyZWN0b3JpZXMKKyAgICAgICAgaW5z dGVhZCBzaW5jZSB0aGV5IGFyZSB0aGUgbmV3ZXN0IHZlcnNpb25zIG9mIHRoZSBvcydzLgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDY5MQorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMu cHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bV9tYWNfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9jaHJvbWl1bV93aW4ucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW5fdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVzdHMu cHk6CisKIDIwMTEtMDItMTYgIE1PUklUQSBIYWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgS2VudCBUYW11cmEuCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5CmluZGV4IDEy NWFkYTUwYWQyNTg5OTE4NDNmYTMyMzIyYmQ5ZjBiZWI4ZTlmOTYuLmY1Y2Y4M2MwMjI1NTYzMGVk MzI4YjljYmRkZTM1YjI1OTBhYzYwMzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5CkBAIC01MCwyMiArNTAs NDIgQEAgY2xhc3MgQ2hyb21pdW1NYWNQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAgICAg ICAgICAgICAgICAgICAgICdtYWMtbGVvcGFyZCcsICdtYWMtc25vd2xlb3BhcmQnLCAnbWFjJ10s CiAgICAgICAgICdzbm93bGVvcGFyZCc6IFsnY2hyb21pdW0tbWFjLXNub3dsZW9wYXJkJywgJ2No cm9taXVtLW1hYycsICdjaHJvbWl1bScsCiAgICAgICAgICAgICAgICAgICAgICAgICAnbWFjLXNu b3dsZW9wYXJkJywgJ21hYyddLAorICAgICAgICAnJzogWydjaHJvbWl1bS1tYWMnLCAnY2hyb21p dW0nLCAnbWFjJ10sCiAgICAgfQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnRfbmFtZT1O b25lLCBvc192ZXJzaW9uX3N0cmluZz1Ob25lLCAqKmt3YXJncyk6CisgICAgZGVmIF9faW5pdF9f KHNlbGYsIHBvcnRfbmFtZT1Ob25lLCBvc192ZXJzaW9uX3N0cmluZz1Ob25lLCByZWJhc2VsaW5p bmc9RmFsc2UsICoqa3dhcmdzKToKICAgICAgICAgIyBXZSdyZSBhIGxpdHRsZSBnZW5lcmljIGhl cmUgYmVjYXVzZSB0aGlzIGNvZGUgaXMgcmV1c2VkIGJ5IHRoZQogICAgICAgICAjICdnb29nbGUt Y2hyb21lJyBwb3J0IGFzIHdlbGwgYXMgdGhlICdtb2NrLScgYW5kICdkcnlydW4tJyBwb3J0cy4K ICAgICAgICAgcG9ydF9uYW1lID0gcG9ydF9uYW1lIG9yICdjaHJvbWl1bS1tYWMnCiAKICAgICAg ICAgaWYgcG9ydF9uYW1lLmVuZHN3aXRoKCctbWFjJyk6Ci0gICAgICAgICAgICBzZWxmLl92ZXJz aW9uID0gbWFjLm9zX3ZlcnNpb24ob3NfdmVyc2lvbl9zdHJpbmcsIHNlbGYuU1VQUE9SVEVEX09T X1ZFUlNJT05TKQotICAgICAgICAgICAgcG9ydF9uYW1lID0gcG9ydF9uYW1lICsgJy0nICsgc2Vs Zi5fdmVyc2lvbgorICAgICAgICAgICAgIyBGSVhNRTogVGhlIHJlYmFzZWxpbmluZyBmbGFnIGlz IGFuIHVnbHkgaGFjayB0aGF0IGxldHMgdXMgY3JlYXRlIGFuCisgICAgICAgICAgICAjICJjaHJv bWl1bS1tYWMiIHBvcnQgdGhhdCBpcyBub3QgdmVyc2lvbi1zcGVjaWZpYy4gSXQgc2hvdWxkIG9u bHkgYmUKKyAgICAgICAgICAgICMgdXNlZCBieSByZWJhc2VsaW5lLWNocm9taXVtLXdlYmtpdC10 ZXN0cyB0byBleHBsaWNpdGx5IHB1dCBmaWxlcyBpbnRvCisgICAgICAgICAgICAjIHRoZSBnZW5l cmljIGRpcmVjdG9yeS4gSW4gdGhlb3J5IHdlIHNob3VsZG4ndCBuZWVkIHRoaXMsIGJlY2F1c2UK KyAgICAgICAgICAgICMgdGhlIG5ld2VzdCBtYWMgcG9ydCBzaG91bGQgYmUgdXNpbmcgJ2Nocm9t aXVtLW1hYycgYXMgdGhlIGJhc2VsaW5lCisgICAgICAgICAgICAjIGRpcmVjdG9yeS4gSG93ZXZl ciwgd2UgYWxzbyBkb24ndCBoYXZlIHN0YWJsZSBTTCBib3RzIDooCisgICAgICAgICAgICAjCisg ICAgICAgICAgICAjIFdoZW4gd2UgcmVtb3ZlIHRoaXMgRklYTUUsIHdlIGFsc28gbmVlZCB0byBy ZW1vdmUgJycgYXMgYSB2YWxpZAorICAgICAgICAgICAgIyBmYWxsYmFjayBrZXkgaW4gc2VsZi5G QUxMQkFDS19QQVRIUy4KKyAgICAgICAgICAgIGlmIHJlYmFzZWxpbmluZzoKKyAgICAgICAgICAg ICAgICBzZWxmLl92ZXJzaW9uID0gJycKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAg ICAgc2VsZi5fdmVyc2lvbiA9IG1hYy5vc192ZXJzaW9uKG9zX3ZlcnNpb25fc3RyaW5nLCBzZWxm LlNVUFBPUlRFRF9PU19WRVJTSU9OUykKKyAgICAgICAgICAgICAgICBwb3J0X25hbWUgPSBwb3J0 X25hbWUgKyAnLScgKyBzZWxmLl92ZXJzaW9uCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBz ZWxmLl92ZXJzaW9uID0gcG9ydF9uYW1lW3BvcnRfbmFtZS5pbmRleCgnLW1hYy0nKSArIDU6XQog ICAgICAgICAgICAgYXNzZXJ0IHNlbGYuX3ZlcnNpb24gaW4gc2VsZi5TVVBQT1JURURfT1NfVkVS U0lPTlMKIAogICAgICAgICBjaHJvbWl1bS5DaHJvbWl1bVBvcnQuX19pbml0X18oc2VsZiwgcG9y dF9uYW1lPXBvcnRfbmFtZSwgKiprd2FyZ3MpCiAKKyAgICBkZWYgYmFzZWxpbmVfcGF0aChzZWxm KToKKyAgICAgICAgaWYgc2VsZi52ZXJzaW9uKCkgPT0gJ3Nub3dsZW9wYXJkJzoKKyAgICAgICAg ICAgICMgV2UgdHJlYXQgU25vdyBMZW9wYXJkIGFzIHRoZSBuZXdlc3QgdmVyc2lvbiBvZiBtYWMs CisgICAgICAgICAgICAjIHNvIGl0IGdldHMgdGhlIGJhc2UgZGlyLgorICAgICAgICAgICAgcmV0 dXJuIHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoKCdjaHJvbWl1bS1tYWMnKQorICAgICAgICBy ZXR1cm4gc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoc2VsZi5uYW1lKCkpCisKICAgICBkZWYg YmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6CiAgICAgICAgIHJldHVybiBtYXAoc2VsZi5fd2Vi a2l0X2Jhc2VsaW5lX3BhdGgsIHNlbGYuRkFMTEJBQ0tfUEFUSFNbc2VsZi5fdmVyc2lvbl0pCiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW1fbWFjX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9jaHJvbWl1bV9tYWNfdW5pdHRlc3QucHkKaW5kZXggNGNhYjJmMDgwMGM4OWVjODUz NzRiYWIwNWUyMGNkMmFjNTJiMWE4NS4uMTIwMTFjNmNkNGZmMjFmN2ExODFmZGIyMGE0NWM3YzA0 MjdkMGI5MyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9jaHJvbWl1bV9tYWNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWNfdW5pdHRlc3QucHkKQEAgLTY4LDYgKzY4 LDIzIEBAIGNsYXNzIENocm9taXVtTWFjUG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENh c2UpOgogICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhLZXlFcnJvciwgc2VsZi5hc3NlcnRfbmFt ZSwgTm9uZSwgJzEwLjcuMScsICdjaHJvbWl1bS1tYWMtbGVvcGFyZCcpCiAgICAgICAgIHNlbGYu YXNzZXJ0UmFpc2VzKEFzc2VydGlvbkVycm9yLCBzZWxmLmFzc2VydF9uYW1lLCBOb25lLCAnMTAu NC4xJywgJ2Nocm9taXVtLW1hYy1sZW9wYXJkJykKIAorICAgIGRlZiB0ZXN0X2dlbmVyaWNfcmVi YXNlbGluaW5nX3BvcnQoc2VsZik6CisgICAgICAgIHBvcnQgPSBjaHJvbWl1bV9tYWMuQ2hyb21p dW1NYWNQb3J0KHJlYmFzZWxpbmluZz1UcnVlKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhw b3J0Lm5hbWUoKSwgJ2Nocm9taXVtLW1hYycpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBv cnQudmVyc2lvbigpLCAnJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5iYXNlbGlu ZV9wYXRoKCksIHBvcnQuX3dlYmtpdF9iYXNlbGluZV9wYXRoKHBvcnQubmFtZSgpKSkKKworICAg ICAgICBwb3J0ID0gY2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydChwb3J0X25hbWU9J2Nocm9t aXVtLW1hYy1sZW9wYXJkJywgcmViYXNlbGluaW5nPVRydWUpCisgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWxzKHBvcnQubmFtZSgpLCAnY2hyb21pdW0tbWFjLWxlb3BhcmQnKQorICAgICAgICBzZWxm LmFzc2VydEVxdWFscyhwb3J0LmJhc2VsaW5lX3BhdGgoKSwgcG9ydC5fd2Via2l0X2Jhc2VsaW5l X3BhdGgocG9ydC5uYW1lKCkpKQorCisgICAgZGVmIHRlc3RfYmFzZWxpbmVfcGF0aChzZWxmKToK KyAgICAgICAgcG9ydCA9IGNocm9taXVtX21hYy5DaHJvbWl1bU1hY1BvcnQocG9ydF9uYW1lPSdj aHJvbWl1bS1tYWMtbGVvcGFyZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuYmFz ZWxpbmVfcGF0aCgpLCBwb3J0Ll93ZWJraXRfYmFzZWxpbmVfcGF0aCgnY2hyb21pdW0tbWFjLWxl b3BhcmQnKSkKKworICAgICAgICBwb3J0ID0gY2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydChw b3J0X25hbWU9J2Nocm9taXVtLW1hYy1zbm93bGVvcGFyZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWxzKHBvcnQuYmFzZWxpbmVfcGF0aCgpLCBwb3J0Ll93ZWJraXRfYmFzZWxpbmVfcGF0aCgn Y2hyb21pdW0tbWFjJykpCisKIAogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICB1bml0 dGVzdC5tYWluKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvY2hyb21pdW1fd2luLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9jaHJvbWl1bV93aW4ucHkKaW5kZXggYTBhY2NlYzg5YWM5YWJhYmI4NjQyZTBj ODE4ZDcyZDEzMjlkZGY5ZS4uN2VhNjM3OTg4YmQ0ODUxNmZiYjkyMWM3NzU2ZDY1MDlkNzJhNjg4 OSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bV93aW4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9jaHJvbWl1bV93aW4ucHkKQEAgLTYzLDE2ICs2MywyOSBAQCBjbGFzcyBDaHJvbWl1bVdp blBvcnQoY2hyb21pdW0uQ2hyb21pdW1Qb3J0KToKICAgICAgICAgJ3hwJzogWydjaHJvbWl1bS13 aW4teHAnLCAnY2hyb21pdW0td2luLXZpc3RhJywgJ2Nocm9taXVtLXdpbicsICdjaHJvbWl1bScs ICd3aW4nLCAnbWFjJ10sCiAgICAgICAgICd2aXN0YSc6IFsnY2hyb21pdW0td2luLXZpc3RhJywg J2Nocm9taXVtLXdpbicsICdjaHJvbWl1bScsICd3aW4nLCAnbWFjJ10sCiAgICAgICAgICd3aW43 JzogWydjaHJvbWl1bS13aW4nLCAnY2hyb21pdW0nLCAnd2luJywgJ21hYyddLAorICAgICAgICAn JzogWydjaHJvbWl1bS13aW4nLCAnY2hyb21pdW0nLCAnd2luJywgJ21hYyddLAogICAgIH0KIAot ICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0X25hbWU9Tm9uZSwgd2luZG93c192ZXJzaW9uPU5v bmUsICoqa3dhcmdzKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcG9ydF9uYW1lPU5vbmUsIHdp bmRvd3NfdmVyc2lvbj1Ob25lLCByZWJhc2VsaW5pbmc9RmFsc2UsICoqa3dhcmdzKToKICAgICAg ICAgIyBXZSdyZSBhIGxpdHRsZSBnZW5lcmljIGhlcmUgYmVjYXVzZSB0aGlzIGNvZGUgaXMgcmV1 c2VkIGJ5IHRoZQogICAgICAgICAjICdnb29nbGUtY2hyb21lJyBwb3J0IGFzIHdlbGwgYXMgdGhl ICdtb2NrLScgYW5kICdkcnlydW4tJyBwb3J0cy4KICAgICAgICAgcG9ydF9uYW1lID0gcG9ydF9u YW1lIG9yICdjaHJvbWl1bS13aW4nCiAKICAgICAgICAgaWYgcG9ydF9uYW1lLmVuZHN3aXRoKCct d2luJyk6Ci0gICAgICAgICAgICBzZWxmLl92ZXJzaW9uID0gb3NfdmVyc2lvbih3aW5kb3dzX3Zl cnNpb24pCi0gICAgICAgICAgICBwb3J0X25hbWUgPSBwb3J0X25hbWUgKyAnLScgKyBzZWxmLl92 ZXJzaW9uCisgICAgICAgICAgICAjIEZJWE1FOiBUaGUgcmViYXNlbGluaW5nIGZsYWcgaXMgYW4g dWdseSBoYWNrIHRoYXQgbGV0cyB1cyBjcmVhdGUgYW4KKyAgICAgICAgICAgICMgImNocm9taXVt LXdpbiIgcG9ydCB0aGF0IGlzIG5vdCB2ZXJzaW9uLXNwZWNpZmljLiBJdCBzaG91bGQgb25seSBi ZQorICAgICAgICAgICAgIyB1c2VkIGJ5IHJlYmFzZWxpbmUtY2hyb21pdW0td2Via2l0LXRlc3Rz IHRvIGV4cGxpY2l0bHkgcHV0IGZpbGVzIGludG8KKyAgICAgICAgICAgICMgdGhlIGdlbmVyaWMg ZGlyZWN0b3J5LiBJbiB0aGVvcnkgd2Ugc2hvdWxkbid0IG5lZWQgdGhpcywgYmVjYXVzZQorICAg ICAgICAgICAgIyB0aGUgbmV3ZXN0IHdpbiBwb3J0IHNob3VsZCBiZSB1c2luZyAnY2hyb21pdW0t d2luJyBhcyB0aGUgYmFzZWxpbmUKKyAgICAgICAgICAgICMgZGlyZWN0b3J5LiBIb3dldmVyLCB3 ZSBhbHNvIGRvbid0IGhhdmUgc3RhYmxlIFdpbiA3IGJvdHMgOigKKyAgICAgICAgICAgICMKKyAg ICAgICAgICAgICMgV2hlbiB3ZSByZW1vdmUgdGhpcyBGSVhNRSwgd2UgYWxzbyBuZWVkIHRvIHJl bW92ZSAnJyBhcyBhIHZhbGlkCisgICAgICAgICAgICAjIGZhbGxiYWNrIGtleSBpbiBzZWxmLkZB TExCQUNLX1BBVEhTLgorICAgICAgICAgICAgaWYgcmViYXNlbGluaW5nOgorICAgICAgICAgICAg ICAgIHNlbGYuX3ZlcnNpb24gPSAnJworICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAg ICBzZWxmLl92ZXJzaW9uID0gb3NfdmVyc2lvbih3aW5kb3dzX3ZlcnNpb24pCisgICAgICAgICAg ICAgICAgcG9ydF9uYW1lID0gcG9ydF9uYW1lICsgJy0nICsgc2VsZi5fdmVyc2lvbgogICAgICAg ICBlbHNlOgogICAgICAgICAgICAgc2VsZi5fdmVyc2lvbiA9IHBvcnRfbmFtZVtwb3J0X25hbWUu aW5kZXgoJy13aW4tJykgKyA1Ol0KICAgICAgICAgICAgIGFzc2VydCBzZWxmLl92ZXJzaW9uIGlu IHNlbGYuU1VQUE9SVEVEX1ZFUlNJT05TCkBAIC0xMjQsNiArMTM3LDggQEAgY2xhc3MgQ2hyb21p dW1XaW5Qb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAgICAgICAgICMgV2UgcmV0dXJuICd3 aW4teHAnLCBub3QgJ2Nocm9taXVtLXdpbi14cCcgaGVyZSwgZm9yIGNvbnZlbmllbmNlLgogCiAg ICAgICAgICMgRklYTUU6IEdldCByaWQgb2YgdGhpcyBtZXRob2QgYWZ0ZXIgcmViYXNlbGluZV9j aHJvbWl1bV93ZWJraXRfdGVzdHMgZGllcy4KKyAgICAgICAgaWYgc2VsZi52ZXJzaW9uKCkgPT0g Jyc6CisgICAgICAgICAgICByZXR1cm4gJ3dpbicKICAgICAgICAgcmV0dXJuICd3aW4tJyArIHNl bGYudmVyc2lvbigpCiAKICAgICBkZWYgdmVyc2lvbihzZWxmKToKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luX3VuaXR0ZXN0 LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93 aW5fdW5pdHRlc3QucHkKaW5kZXggMjMzMjBiYzkyYjMwMzEyYTNhYmQ2YjliOGJhNjhlNmIyZmE5 OWM2Ni4uNTkzYTI0NDMyMzA4NTVkMzZlOTM4MGQ1NmI2Y2E3MmQ5NWE3YWEzZCAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW5f dW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9jaHJvbWl1bV93aW5fdW5pdHRlc3QucHkKQEAgLTEyMCw2ICsxMjAsMjcgQEAgY2xhc3MgQ2hy b21pdW1XaW5UZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RDYXNlKToKICAgICAgICAgc2VsZi5h c3NlcnRSYWlzZXMoS2V5RXJyb3IsIHNlbGYuYXNzZXJ0X25hbWUsIE5vbmUsICg1LCAyKSwgJ2No cm9taXVtLXdpbi14cCcpCiAgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKEtleUVycm9yLCBzZWxm LmFzc2VydF9uYW1lLCBOb25lLCAoNywgMSksICdjaHJvbWl1bS13aW4teHAnKQogCisgICAgZGVm IHRlc3RfZ2VuZXJpY19yZWJhc2VsaW5pbmdfcG9ydChzZWxmKToKKyAgICAgICAgcG9ydCA9IGNo cm9taXVtX3dpbi5DaHJvbWl1bVdpblBvcnQocmViYXNlbGluaW5nPVRydWUpCisgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWxzKHBvcnQubmFtZSgpLCAnY2hyb21pdW0td2luJykKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbHMocG9ydC52ZXJzaW9uKCksICcnKQorICAgICAgICBzZWxmLmFzc2VydEVx dWFscyhwb3J0LmJhc2VsaW5lX3BhdGgoKSwgcG9ydC5fd2Via2l0X2Jhc2VsaW5lX3BhdGgocG9y dC5uYW1lKCkpKQorCisgICAgICAgIHBvcnQgPSBjaHJvbWl1bV93aW4uQ2hyb21pdW1XaW5Qb3J0 KHBvcnRfbmFtZT0nY2hyb21pdW0td2luLXhwJywgcmViYXNlbGluaW5nPVRydWUpCisgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQubmFtZSgpLCAnY2hyb21pdW0td2luLXhwJykKKyAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5iYXNlbGluZV9wYXRoKCksIHBvcnQuX3dlYmtpdF9i YXNlbGluZV9wYXRoKHBvcnQubmFtZSgpKSkKKworICAgIGRlZiB0ZXN0X2Jhc2VsaW5lX3BhdGgo c2VsZik6CisgICAgICAgIHBvcnQgPSBjaHJvbWl1bV93aW4uQ2hyb21pdW1XaW5Qb3J0KHBvcnRf bmFtZT0nY2hyb21pdW0td2luLXhwJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5i YXNlbGluZV9wYXRoKCksIHBvcnQuX3dlYmtpdF9iYXNlbGluZV9wYXRoKCdjaHJvbWl1bS13aW4t eHAnKSkKKworICAgICAgICBwb3J0ID0gY2hyb21pdW1fd2luLkNocm9taXVtV2luUG9ydChwb3J0 X25hbWU9J2Nocm9taXVtLXdpbi12aXN0YScpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBv cnQuYmFzZWxpbmVfcGF0aCgpLCBwb3J0Ll93ZWJraXRfYmFzZWxpbmVfcGF0aCgnY2hyb21pdW0t d2luLXZpc3RhJykpCisKKyAgICAgICAgcG9ydCA9IGNocm9taXVtX3dpbi5DaHJvbWl1bVdpblBv cnQocG9ydF9uYW1lPSdjaHJvbWl1bS13aW4td2luNycpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxzKHBvcnQuYmFzZWxpbmVfcGF0aCgpLCBwb3J0Ll93ZWJraXRfYmFzZWxpbmVfcGF0aCgnY2hy b21pdW0td2luJykpCisKKwogCiBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAgIHVuaXR0 ZXN0Lm1haW4oKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cy5weQpp bmRleCA1Njc5NzVjYTcxZmQ2YWMzN2Q4MmUzYTJlYmQzNTZiYzg0MmI0MTg4Li40NWVjZThhMzNl N2JkNGVkZGRkMzZmY2MyYmMxMjE4Yjk4ZjUxOWRlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cy5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2No cm9taXVtX3dlYmtpdF90ZXN0cy5weQpAQCAtMTYwLDkgKzE2MCwxMSBAQCBjbGFzcyBSZWJhc2Vs aW5lcihvYmplY3QpOgogICAgICAgICBzZWxmLl9maWxlc3lzdGVtID0gcnVubmluZ19wb3J0Ll9m aWxlc3lzdGVtCiAgICAgICAgIHNlbGYuX3RhcmdldF9wb3J0ID0gdGFyZ2V0X3BvcnQKIAorICAg ICAgICAjIEZJWE1FOiBTZWUgdGhlIGNvbW1lbnRzIGluIGNocm9taXVtX3t3aW4sbWFjfS5weSBh Ym91dCB3aHkgd2UgbmVlZAorICAgICAgICAjIHRoZSAncmViYXNlbGluaW5nJyBrZXl3b3JkLgog ICAgICAgICBzZWxmLl9yZWJhc2VsaW5lX3BvcnQgPSBwb3J0LmdldCgKICAgICAgICAgICAgIHNl bGYuX3RhcmdldF9wb3J0LnRlc3RfcGxhdGZvcm1fbmFtZV90b19uYW1lKHBsYXRmb3JtKSwgb3B0 aW9ucywKLSAgICAgICAgICAgIGZpbGVzeXN0ZW09c2VsZi5fZmlsZXN5c3RlbSkKKyAgICAgICAg ICAgIGZpbGVzeXN0ZW09c2VsZi5fZmlsZXN5c3RlbSwgcmViYXNlbGluaW5nPVRydWUpCiAgICAg ICAgIHNlbGYuX3JlYmFzZWxpbmluZ190ZXN0cyA9IFtdCiAgICAgICAgIHNlbGYuX3JlYmFzZWxp bmVkX3Rlc3RzID0gW10KIAo=