94865 2012-08-23 15:18:57 -0700 [Chromium-Android] Many 'Unexpected EOF ...' when a test crashes 2012-08-24 11:55:32 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 wangxianzhu wangxianzhu abarth dpranke ojan webkit.review.bot oldest_to_newest 703450 0 wangxianzhu 2012-08-23 15:18:57 -0700 After patch of https://bugs.webkit.org/show_bug.cgi?id=94387, NRWT chromium-android can't detect crashes, but quickly prints many 'Unexpected EOF ...' when a test crashes until timeout, and will treat it a timeout. On Android we depend on read() return None to detect crashes, so when the test crashes, the process (adb shell) is still alive. 703495 1 160271 wangxianzhu 2012-08-23 16:00:50 -0700 Created attachment 160271 Patch 703505 2 abarth 2012-08-23 16:09:38 -0700 dpranke is your best reviewer here. 703711 3 160271 dpranke 2012-08-23 21:10:49 -0700 Comment on attachment 160271 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160271&action=review Ah, I knew the android port depended on this somehow but I didn't connect the dots to realize that adb was still running. Sorry about that! > Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py:143 > + universal_newlines=True, treat_no_data_as_crash=True) why not just make this a method on the port class? 704228 4 160449 wangxianzhu 2012-08-24 10:45:17 -0700 Created attachment 160449 Patch 704229 5 160271 wangxianzhu 2012-08-24 10:46:05 -0700 Comment on attachment 160271 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160271&action=review >> Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py:143 >> + universal_newlines=True, treat_no_data_as_crash=True) > > why not just make this a method on the port class? Done. 704303 6 160449 webkit.review.bot 2012-08-24 11:55:29 -0700 Comment on attachment 160449 Patch Clearing flags on attachment: 160449 Committed r126607: <http://trac.webkit.org/changeset/126607> 704304 7 webkit.review.bot 2012-08-24 11:55:32 -0700 All reviewed patches have been landed. Closing bug. 160271 2012-08-23 16:00:50 -0700 2012-08-24 10:46:05 -0700 Patch bug-94865-20120823160047.patch text/plain 6595 wangxianzhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NDgxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjgyYmU3NjNmMWYzNWU5OTY1ZGQ1NGUyZjA1Y2Q1ZjU1 ZWI1OWU0NS4uM2Y2MjBjZDBjMWM4NGI0NDg1ZDJkOGQ4ZDc0ODQxYmY4Njk3Njc5MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDEyLTA4LTIzICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIE1hbnkgJ1VuZXhwZWN0ZWQgRU9GIC4uLicg d2hlbiBhIHRlc3QgY3Jhc2hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTQ4NjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBbmRyb2lkIGRldGVjdHMgY3Jhc2ggb2YgdGVzdCBieSBjaGVja2luZyBpZiB0 aGUgcmV0dXJuIHZhbHVlIG9mIHJlYWQoKSBpcyBOb25lLgorICAgICAgICBBZGRlZCBhIHBhcmFt ZXRlciAndHJlYXRfbm9fZGF0YV9hc19jcmFzaCcgdG8gbGV0IFNlcnZlclByb2Nlc3Mga25vdyB0 aGUgc3BlY2lhbCByZXF1aXJlbWVudCBvZiBBbmRyb2lkLgorICAgICAgICBJZiBzZXQsIFNlcnZl clByb2Nlc3Mgd2lsbCBzZXQgX2NyYXNoZWQgdW5jb25kaXRpb25hbHkgd2hlbiB0aGVyZSBpcyBu byBkYXRhLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bV9hbmRyb2lkLnB5OgorICAgICAgICAoX3NlcnZlcl9wcm9jZXNzX2NvbnN0cnVjdG9y KToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZFBvcnQuX19pbml0X18pOgorICAgICAgICAoQ2hy b21pdW1BbmRyb2lkRHJpdmVyLl9zdGFydF9vbmNlKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5OgorICAgICAgICAoU2VydmVy UHJvY2Vzcy5fX2luaXRfXyk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLl93YWl0X2Zvcl9kYXRh X2FuZF91cGRhdGVfYnVmZmVyc191c2luZ19zZWxlY3QpOgorCiAyMDEyLTA4LTIzICBXZWkgSmlh ICA8d2ppYUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgY3JlYXRlIGRpZmZlcmVudCBXZWJLaXQ6 OldlYk1lZGlhUGxheWVyIGJhc2VkIG9uIFVSTApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5CmluZGV4 IDY0YmE2MDAzYjdjZWE3M2Y2NThiOGUzNzQwNDE1MDcyNTY4ZDhmODIuLmIyNTUzZTNjZjliZmVl NmZkZjRlNzdmYzdlNzFkZWViYjhlOGEwM2IgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKQEAg LTEzOCw2ICsxMzgsMTEgQEAgVEVTVF9SRVNPVVJDRVNfVE9fUFVTSCA9IFsKIF0KIAogCitkZWYg X3NlcnZlcl9wcm9jZXNzX2NvbnN0cnVjdG9yKHBvcnQsIHNlcnZlcl9uYW1lLCBjbWRfbGluZSwg ZW52PU5vbmUpOgorICAgIHJldHVybiBzZXJ2ZXJfcHJvY2Vzcy5TZXJ2ZXJQcm9jZXNzKHBvcnQs IHNlcnZlcl9uYW1lLCBjbWRfbGluZSwgZW52LAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHVuaXZlcnNhbF9uZXdsaW5lcz1UcnVlLCB0cmVhdF9ub19kYXRhX2FzX2Ny YXNoPVRydWUpCisKKwogY2xhc3MgQ2hyb21pdW1BbmRyb2lkUG9ydChjaHJvbWl1bS5DaHJvbWl1 bVBvcnQpOgogICAgIHBvcnRfbmFtZSA9ICdjaHJvbWl1bS1hbmRyb2lkJwogCkBAIC0xNTcsNiAr MTYyLDcgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkUG9ydChjaHJvbWl1bS5DaHJvbWl1bVBvcnQp OgogICAgICAgICBzZWxmLl92ZXJzaW9uID0gJ2ljZWNyZWFtc2FuZHdpY2gnCiAKICAgICAgICAg c2VsZi5faG9zdF9wb3J0ID0gZmFjdG9yeS5Qb3J0RmFjdG9yeShob3N0KS5nZXQoJ2Nocm9taXVt JywgKiprd2FyZ3MpCisgICAgICAgIHNlbGYuX3NlcnZlcl9wcm9jZXNzX2NvbnN0cnVjdG9yID0g X3NlcnZlcl9wcm9jZXNzX2NvbnN0cnVjdG9yCiAKICAgICAgICAgaWYgaGFzYXR0cihzZWxmLl9v cHRpb25zLCAnYWRiX2RldmljZScpOgogICAgICAgICAgICAgc2VsZi5fZGV2aWNlcyA9IHNlbGYu X29wdGlvbnMuYWRiX2RldmljZQpAQCAtNTgzLDcgKzU4OSw3IEBAIGNsYXNzIENocm9taXVtQW5k cm9pZERyaXZlcihkcml2ZXIuRHJpdmVyKToKICAgICAgICAgc3VwZXIoQ2hyb21pdW1BbmRyb2lk RHJpdmVyLCBzZWxmKS5fc3RhcnQocGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpCiAKICAgICAg ICAgX2xvZy5kZWJ1ZygnU3RhcnRpbmcgZm9yd2FyZGVyJykKLSAgICAgICAgc2VsZi5fZm9yd2Fy ZGVyX3Byb2Nlc3MgPSBzZXJ2ZXJfcHJvY2Vzcy5TZXJ2ZXJQcm9jZXNzKAorICAgICAgICBzZWxm Ll9mb3J3YXJkZXJfcHJvY2VzcyA9IHNlbGYuX3BvcnQuX3NlcnZlcl9wcm9jZXNzX2NvbnN0cnVj dG9yKAogICAgICAgICAgICAgc2VsZi5fcG9ydCwgJ0ZvcndhcmRlcicsIHNlbGYuX2FkYl9jb21t YW5kICsgWydzaGVsbCcsICclcyAtRCAlcycgJSAoREVWSUNFX0ZPUldBUkRFUl9QQVRILCBGT1JX QVJEX1BPUlRTKV0pCiAgICAgICAgIHNlbGYuX2ZvcndhcmRlcl9wcm9jZXNzLnN0YXJ0KCkKIApA QCAtNjA1LDE0ICs2MTEsMTQgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGRyaXZlci5E cml2ZXIpOgogCiAgICAgICAgICMgU3RhcnQgYSBwcm9jZXNzIHRvIHJlYWQgZnJvbSB0aGUgc3Rk b3V0IGZpZm8gb2YgdGhlIER1bXBSZW5kZXJUcmVlIGFwcCBhbmQgcHJpbnQgdG8gc3Rkb3V0Lgog ICAgICAgICBfbG9nLmRlYnVnKCdSZWRpcmVjdGluZyBzdGRvdXQgdG8gJyArIHNlbGYuX291dF9m aWZvX3BhdGgpCi0gICAgICAgIHNlbGYuX3JlYWRfc3Rkb3V0X3Byb2Nlc3MgPSBzZXJ2ZXJfcHJv Y2Vzcy5TZXJ2ZXJQcm9jZXNzKAotICAgICAgICAgICAgc2VsZi5fcG9ydCwgJ1JlYWRTdGRvdXQn LCBzZWxmLl9hZGJfY29tbWFuZCArIFsnc2hlbGwnLCAnY2F0Jywgc2VsZi5fb3V0X2ZpZm9fcGF0 aF0sIHVuaXZlcnNhbF9uZXdsaW5lcz1UcnVlKQorICAgICAgICBzZWxmLl9yZWFkX3N0ZG91dF9w cm9jZXNzID0gc2VsZi5fcG9ydC5fc2VydmVyX3Byb2Nlc3NfY29uc3RydWN0b3IoCisgICAgICAg ICAgICBzZWxmLl9wb3J0LCAnUmVhZFN0ZG91dCcsIHNlbGYuX2FkYl9jb21tYW5kICsgWydzaGVs bCcsICdjYXQnLCBzZWxmLl9vdXRfZmlmb19wYXRoXSkKICAgICAgICAgc2VsZi5fcmVhZF9zdGRv dXRfcHJvY2Vzcy5zdGFydCgpCiAKICAgICAgICAgIyBTdGFydCBhIHByb2Nlc3MgdG8gcmVhZCBm cm9tIHRoZSBzdGRlcnIgZmlmbyBvZiB0aGUgRHVtcFJlbmRlclRyZWUgYXBwIGFuZCBwcmludCB0 byBzdGRvdXQuCiAgICAgICAgIF9sb2cuZGVidWcoJ1JlZGlyZWN0aW5nIHN0ZGVyciB0byAnICsg c2VsZi5fZXJyX2ZpZm9fcGF0aCkKLSAgICAgICAgc2VsZi5fcmVhZF9zdGRlcnJfcHJvY2VzcyA9 IHNlcnZlcl9wcm9jZXNzLlNlcnZlclByb2Nlc3MoCi0gICAgICAgICAgICBzZWxmLl9wb3J0LCAn UmVhZFN0ZGVycicsIHNlbGYuX2FkYl9jb21tYW5kICsgWydzaGVsbCcsICdjYXQnLCBzZWxmLl9l cnJfZmlmb19wYXRoXSwgdW5pdmVyc2FsX25ld2xpbmVzPVRydWUpCisgICAgICAgIHNlbGYuX3Jl YWRfc3RkZXJyX3Byb2Nlc3MgPSBzZWxmLl9wb3J0Ll9zZXJ2ZXJfcHJvY2Vzc19jb25zdHJ1Y3Rv cigKKyAgICAgICAgICAgIHNlbGYuX3BvcnQsICdSZWFkU3RkZXJyJywgc2VsZi5fYWRiX2NvbW1h bmQgKyBbJ3NoZWxsJywgJ2NhdCcsIHNlbGYuX2Vycl9maWZvX3BhdGhdKQogICAgICAgICBzZWxm Ll9yZWFkX3N0ZGVycl9wcm9jZXNzLnN0YXJ0KCkKIAogICAgICAgICBfbG9nLmRlYnVnKCdSZWRp cmVjdGluZyBzdGRpbiB0byAnICsgc2VsZi5faW5fZmlmb19wYXRoKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvc2VydmVyX3Byb2Nlc3Mu cHkKaW5kZXggYjc3MjMyM2I1YjIzMDE0N2FjNzIxNTAyY2FkOGJhYmYwYTRhZDAxZS4uMWNmMTcz OTc1NWQ5NTJiZTcxOWFmOWIyNzg3MGVkYWM3MTUwMzA0NiAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5 CkBAIC02MCw3ICs2MCw3IEBAIGNsYXNzIFNlcnZlclByb2Nlc3Mob2JqZWN0KToKICAgICBpbmRl ZmluaXRlbHkuIFRoZSBjbGFzcyBhbHNvIGhhbmRsZXMgdHJhbnNwYXJlbnRseSByZXN0YXJ0aW5n IHByb2Nlc3NlcwogICAgIGFzIG5lY2Vzc2FyeSB0byBrZWVwIGlzc3VpbmcgY29tbWFuZHMuIiIi CiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcG9ydF9vYmosIG5hbWUsIGNtZCwgZW52PU5vbmUs IHVuaXZlcnNhbF9uZXdsaW5lcz1GYWxzZSk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnRf b2JqLCBuYW1lLCBjbWQsIGVudj1Ob25lLCB1bml2ZXJzYWxfbmV3bGluZXM9RmFsc2UsIHRyZWF0 X25vX2RhdGFfYXNfY3Jhc2g9RmFsc2UpOgogICAgICAgICBzZWxmLl9wb3J0ID0gcG9ydF9vYmoK ICAgICAgICAgc2VsZi5fbmFtZSA9IG5hbWUgICMgU2hvdWxkIGJlIHRoZSBjb21tYW5kIG5hbWUg KGUuZy4gRHVtcFJlbmRlclRyZWUsIEltYWdlRGlmZikKICAgICAgICAgc2VsZi5fY21kID0gY21k CkBAIC02OCw2ICs2OCw3IEBAIGNsYXNzIFNlcnZlclByb2Nlc3Mob2JqZWN0KToKICAgICAgICAg IyBTZXQgaWYgdGhlIHByb2Nlc3Mgb3V0cHV0cyBub24tc3RhbmRhcmQgbmV3bGluZXMgbGlrZSAn XHJcbicgb3IgJ1xyJy4KICAgICAgICAgIyBEb24ndCBzZXQgaWYgdGhlcmUgd2lsbCBiZSBiaW5h cnkgZGF0YSBvciB0aGUgZGF0YSBtdXN0IGJlIEFTQ0lJIGVuY29kZWQuCiAgICAgICAgIHNlbGYu X3VuaXZlcnNhbF9uZXdsaW5lcyA9IHVuaXZlcnNhbF9uZXdsaW5lcworICAgICAgICBzZWxmLl90 cmVhdF9ub19kYXRhX2FzX2NyYXNoID0gdHJlYXRfbm9fZGF0YV9hc19jcmFzaAogICAgICAgICBz ZWxmLl9ob3N0ID0gc2VsZi5fcG9ydC5ob3N0CiAgICAgICAgIHNlbGYuX3BpZCA9IE5vbmUKICAg ICAgICAgc2VsZi5fcmVzZXQoKQpAQCAtMjMwLDE3ICsyMzEsMTcgQEAgY2xhc3MgU2VydmVyUHJv Y2VzcyhvYmplY3QpOgogICAgICAgICAgICAgaWYgb3V0X2ZkIGluIHJlYWRfZmRzOgogICAgICAg ICAgICAgICAgIGRhdGEgPSBzZWxmLl9wcm9jLnN0ZG91dC5yZWFkKCkKICAgICAgICAgICAgICAg ICBpZiBub3QgZGF0YSBhbmQgbm90IHN0b3BwaW5nOgotICAgICAgICAgICAgICAgICAgICBpZiBz ZWxmLl9wcm9jLnBvbGwoKSBpcyBub3QgTm9uZToKKyAgICAgICAgICAgICAgICAgICAgaWYgc2Vs Zi5fdHJlYXRfbm9fZGF0YV9hc19jcmFzaCBvciBzZWxmLl9wcm9jLnBvbGwoKSBpcyBub3QgTm9u ZToKICAgICAgICAgICAgICAgICAgICAgICAgIF9sb2cud2FybmluZygndW5leHBlY3RlZCBFT0Yg b2Ygc3Rkb3V0LCAlcyBjcmFzaGVkJyAlIHNlbGYuX25hbWUpCiAgICAgICAgICAgICAgICAgICAg ICAgICBzZWxmLl9jcmFzaGVkID0gVHJ1ZQogICAgICAgICAgICAgICAgICAgICBlbHNlOgotICAg ICAgICAgICAgICAgICAgICAgICAgX2xvZy53YXJuaW5nKCd1bmV4cGVjdGVkIEVPRiBvZiBzdGRv dXQsICVzIHN0aWxsIGFsaXZlJyAlIHNlbGYuX25hbWUpCisgICAgICAgICAgICAgICAgICAgICAg ICBfbG9nLndhcm5pbmcoJ3VuZXhwZWN0ZWQgRU9GIG9mIHN0ZG91dCwgJXMgaXMgc3RpbGwgYWxp dmUnICUgc2VsZi5fbmFtZSkKICAgICAgICAgICAgICAgICBzZWxmLl9vdXRwdXQgKz0gZGF0YQog CiAgICAgICAgICAgICBpZiBlcnJfZmQgaW4gcmVhZF9mZHM6CiAgICAgICAgICAgICAgICAgZGF0 YSA9IHNlbGYuX3Byb2Muc3RkZXJyLnJlYWQoKQogICAgICAgICAgICAgICAgIGlmIG5vdCBkYXRh IGFuZCBub3Qgc3RvcHBpbmc6Ci0gICAgICAgICAgICAgICAgICAgIGlmIHNlbGYuX3Byb2MucG9s bCgpIGlzIG5vdCBOb25lOgorICAgICAgICAgICAgICAgICAgICBpZiBzZWxmLl90cmVhdF9ub19k YXRhX2FzX2NyYXNoIG9yIHNlbGYuX3Byb2MucG9sbCgpIGlzIG5vdCBOb25lOgogICAgICAgICAg ICAgICAgICAgICAgICAgX2xvZy53YXJuaW5nKCd1bmV4cGVjdGVkIEVPRiBvbiBzdGRlcnIsICVz IGNyYXNoZWQnICUgc2VsZi5fbmFtZSkKICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX2Ny YXNoZWQgPSBUcnVlCiAgICAgICAgICAgICAgICAgICAgIGVsc2U6Cg== 160449 2012-08-24 10:45:17 -0700 2012-08-24 11:55:29 -0700 Patch bug-94865-20120824104513.patch text/plain 6791 wangxianzhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NTk4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMmNiODYyZDUxOTg4OTg4NmUzY2YyNWRjYzI5YTFiNmYx N2UyOWU2OS4uMmUyMGYyZjRkMmNlZDRmYTllMmM1YTliYTllZTMzMGI2MGNkNjk2NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDEyLTA4LTI0ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIE1hbnkgJ1VuZXhwZWN0ZWQgRU9GIC4uLicg d2hlbiBhIHRlc3QgY3Jhc2hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTQ4NjUKKworICAgICAgICBSZXZpZXdlZCBieSBEaXJrIFByYW5rZS4KKwor ICAgICAgICBBbmRyb2lkIGRldGVjdHMgY3Jhc2ggb2YgdGVzdCBieSBjaGVja2luZyBpZiB0aGUg cmV0dXJuIHZhbHVlIG9mIHJlYWQoKSBpcyBOb25lLgorICAgICAgICBBZGRlZCBhIHBhcmFtZXRl ciAndHJlYXRfbm9fZGF0YV9hc19jcmFzaCcgdG8gbGV0IFNlcnZlclByb2Nlc3Mga25vdyB0aGUg c3BlY2lhbCByZXF1aXJlbWVudCBvZiBBbmRyb2lkLgorICAgICAgICBJZiBzZXQsIFNlcnZlclBy b2Nlc3Mgd2lsbCBzZXQgX2NyYXNoZWQgdW5jb25kaXRpb25hbHkgd2hlbiB0aGVyZSBpcyBubyBk YXRhLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bV9hbmRyb2lkLnB5OgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkUG9ydC5fX2luaXRfXyk6 CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWRQb3J0KToKKyAgICAgICAgKENocm9taXVtQW5kcm9p ZFBvcnQuX2FuZHJvaWRfc2VydmVyX3Byb2Nlc3NfY29uc3RydWN0b3IpOgorICAgICAgICAoQ2hy b21pdW1BbmRyb2lkRHJpdmVyLl9zdGFydF9vbmNlKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5OgorICAgICAgICAoU2VydmVy UHJvY2Vzcy5fX2luaXRfXyk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLl93YWl0X2Zvcl9kYXRh X2FuZF91cGRhdGVfYnVmZmVyc191c2luZ19zZWxlY3QpOgorCiAyMDEyLTA4LTI0ICBBcm5hdWQg UmVuZXZpZXIgIDxhLnJlbmV2aWVyQHNpc2Euc2Ftc3VuZy5jb20+CiAKICAgICAgICAgYnVpbGQt d2Via2l0IC0tZ3RrIGZhaWxzIHdpdGggQ2FuJ3QgZXhlYyAiIgpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lk LnB5CmluZGV4IDY0YmE2MDAzYjdjZWE3M2Y2NThiOGUzNzQwNDE1MDcyNTY4ZDhmODIuLjg4ZWVi NGQ3NWIyYmNkYmVlMDVkZjFiOWJmMjk2YjRlNDZjMGIwYWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJv aWQucHkKQEAgLTE1NywxMiArMTU3LDE4IEBAIGNsYXNzIENocm9taXVtQW5kcm9pZFBvcnQoY2hy b21pdW0uQ2hyb21pdW1Qb3J0KToKICAgICAgICAgc2VsZi5fdmVyc2lvbiA9ICdpY2VjcmVhbXNh bmR3aWNoJwogCiAgICAgICAgIHNlbGYuX2hvc3RfcG9ydCA9IGZhY3RvcnkuUG9ydEZhY3Rvcnko aG9zdCkuZ2V0KCdjaHJvbWl1bScsICoqa3dhcmdzKQorICAgICAgICBzZWxmLl9zZXJ2ZXJfcHJv Y2Vzc19jb25zdHJ1Y3RvciA9IHNlbGYuX2FuZHJvaWRfc2VydmVyX3Byb2Nlc3NfY29uc3RydWN0 b3IKIAogICAgICAgICBpZiBoYXNhdHRyKHNlbGYuX29wdGlvbnMsICdhZGJfZGV2aWNlJyk6CiAg ICAgICAgICAgICBzZWxmLl9kZXZpY2VzID0gc2VsZi5fb3B0aW9ucy5hZGJfZGV2aWNlCiAgICAg ICAgIGVsc2U6CiAgICAgICAgICAgICBzZWxmLl9kZXZpY2VzID0gW10KIAorICAgIEBzdGF0aWNt ZXRob2QKKyAgICBkZWYgX2FuZHJvaWRfc2VydmVyX3Byb2Nlc3NfY29uc3RydWN0b3IocG9ydCwg c2VydmVyX25hbWUsIGNtZF9saW5lLCBlbnY9Tm9uZSk6CisgICAgICAgIHJldHVybiBzZXJ2ZXJf cHJvY2Vzcy5TZXJ2ZXJQcm9jZXNzKHBvcnQsIHNlcnZlcl9uYW1lLCBjbWRfbGluZSwgZW52LAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bml2ZXJzYWxfbmV3 bGluZXM9VHJ1ZSwgdHJlYXRfbm9fZGF0YV9hc19jcmFzaD1UcnVlKQorCiAgICAgZGVmIGFkZGl0 aW9uYWxfZHJ0X2ZsYWcoc2VsZik6CiAgICAgICAgICMgVGhlIENocm9taXVtIHBvcnQgZm9yIEFu ZHJvaWQgYWx3YXlzIHVzZXMgdGhlIGhhcmR3YXJlIEdQVSBwYXRoLgogICAgICAgICByZXR1cm4g WyctLWVuY29kZS1iaW5hcnknLCAnLS1lbmFibGUtaGFyZHdhcmUtZ3B1J10KQEAgLTU4Myw3ICs1 ODksNyBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZlcik6CiAgICAg ICAgIHN1cGVyKENocm9taXVtQW5kcm9pZERyaXZlciwgc2VsZikuX3N0YXJ0KHBpeGVsX3Rlc3Rz LCBwZXJfdGVzdF9hcmdzKQogCiAgICAgICAgIF9sb2cuZGVidWcoJ1N0YXJ0aW5nIGZvcndhcmRl cicpCi0gICAgICAgIHNlbGYuX2ZvcndhcmRlcl9wcm9jZXNzID0gc2VydmVyX3Byb2Nlc3MuU2Vy dmVyUHJvY2VzcygKKyAgICAgICAgc2VsZi5fZm9yd2FyZGVyX3Byb2Nlc3MgPSBzZWxmLl9wb3J0 Ll9zZXJ2ZXJfcHJvY2Vzc19jb25zdHJ1Y3RvcigKICAgICAgICAgICAgIHNlbGYuX3BvcnQsICdG b3J3YXJkZXInLCBzZWxmLl9hZGJfY29tbWFuZCArIFsnc2hlbGwnLCAnJXMgLUQgJXMnICUgKERF VklDRV9GT1JXQVJERVJfUEFUSCwgRk9SV0FSRF9QT1JUUyldKQogICAgICAgICBzZWxmLl9mb3J3 YXJkZXJfcHJvY2Vzcy5zdGFydCgpCiAKQEAgLTYwNSwxNCArNjExLDE0IEBAIGNsYXNzIENocm9t aXVtQW5kcm9pZERyaXZlcihkcml2ZXIuRHJpdmVyKToKIAogICAgICAgICAjIFN0YXJ0IGEgcHJv Y2VzcyB0byByZWFkIGZyb20gdGhlIHN0ZG91dCBmaWZvIG9mIHRoZSBEdW1wUmVuZGVyVHJlZSBh cHAgYW5kIHByaW50IHRvIHN0ZG91dC4KICAgICAgICAgX2xvZy5kZWJ1ZygnUmVkaXJlY3Rpbmcg c3Rkb3V0IHRvICcgKyBzZWxmLl9vdXRfZmlmb19wYXRoKQotICAgICAgICBzZWxmLl9yZWFkX3N0 ZG91dF9wcm9jZXNzID0gc2VydmVyX3Byb2Nlc3MuU2VydmVyUHJvY2VzcygKLSAgICAgICAgICAg IHNlbGYuX3BvcnQsICdSZWFkU3Rkb3V0Jywgc2VsZi5fYWRiX2NvbW1hbmQgKyBbJ3NoZWxsJywg J2NhdCcsIHNlbGYuX291dF9maWZvX3BhdGhdLCB1bml2ZXJzYWxfbmV3bGluZXM9VHJ1ZSkKKyAg ICAgICAgc2VsZi5fcmVhZF9zdGRvdXRfcHJvY2VzcyA9IHNlbGYuX3BvcnQuX3NlcnZlcl9wcm9j ZXNzX2NvbnN0cnVjdG9yKAorICAgICAgICAgICAgc2VsZi5fcG9ydCwgJ1JlYWRTdGRvdXQnLCBz ZWxmLl9hZGJfY29tbWFuZCArIFsnc2hlbGwnLCAnY2F0Jywgc2VsZi5fb3V0X2ZpZm9fcGF0aF0p CiAgICAgICAgIHNlbGYuX3JlYWRfc3Rkb3V0X3Byb2Nlc3Muc3RhcnQoKQogCiAgICAgICAgICMg U3RhcnQgYSBwcm9jZXNzIHRvIHJlYWQgZnJvbSB0aGUgc3RkZXJyIGZpZm8gb2YgdGhlIER1bXBS ZW5kZXJUcmVlIGFwcCBhbmQgcHJpbnQgdG8gc3Rkb3V0LgogICAgICAgICBfbG9nLmRlYnVnKCdS ZWRpcmVjdGluZyBzdGRlcnIgdG8gJyArIHNlbGYuX2Vycl9maWZvX3BhdGgpCi0gICAgICAgIHNl bGYuX3JlYWRfc3RkZXJyX3Byb2Nlc3MgPSBzZXJ2ZXJfcHJvY2Vzcy5TZXJ2ZXJQcm9jZXNzKAot ICAgICAgICAgICAgc2VsZi5fcG9ydCwgJ1JlYWRTdGRlcnInLCBzZWxmLl9hZGJfY29tbWFuZCAr IFsnc2hlbGwnLCAnY2F0Jywgc2VsZi5fZXJyX2ZpZm9fcGF0aF0sIHVuaXZlcnNhbF9uZXdsaW5l cz1UcnVlKQorICAgICAgICBzZWxmLl9yZWFkX3N0ZGVycl9wcm9jZXNzID0gc2VsZi5fcG9ydC5f c2VydmVyX3Byb2Nlc3NfY29uc3RydWN0b3IoCisgICAgICAgICAgICBzZWxmLl9wb3J0LCAnUmVh ZFN0ZGVycicsIHNlbGYuX2FkYl9jb21tYW5kICsgWydzaGVsbCcsICdjYXQnLCBzZWxmLl9lcnJf Zmlmb19wYXRoXSkKICAgICAgICAgc2VsZi5fcmVhZF9zdGRlcnJfcHJvY2Vzcy5zdGFydCgpCiAK ICAgICAgICAgX2xvZy5kZWJ1ZygnUmVkaXJlY3Rpbmcgc3RkaW4gdG8gJyArIHNlbGYuX2luX2Zp Zm9fcGF0aCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvc2VydmVyX3Byb2Nlc3MucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5CmluZGV4IGI3NzIzMjNiNWIyMzAxNDdhYzcyMTUw MmNhZDhiYWJmMGE0YWQwMWUuLjFjZjE3Mzk3NTVkOTUyYmU3MTlhZjliMjc4NzBlZGFjNzE1MDMw NDYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv c2VydmVyX3Byb2Nlc3MucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weQpAQCAtNjAsNyArNjAsNyBAQCBjbGFzcyBTZXJ2ZXJQ cm9jZXNzKG9iamVjdCk6CiAgICAgaW5kZWZpbml0ZWx5LiBUaGUgY2xhc3MgYWxzbyBoYW5kbGVz IHRyYW5zcGFyZW50bHkgcmVzdGFydGluZyBwcm9jZXNzZXMKICAgICBhcyBuZWNlc3NhcnkgdG8g a2VlcCBpc3N1aW5nIGNvbW1hbmRzLiIiIgogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnRf b2JqLCBuYW1lLCBjbWQsIGVudj1Ob25lLCB1bml2ZXJzYWxfbmV3bGluZXM9RmFsc2UpOgorICAg IGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0X29iaiwgbmFtZSwgY21kLCBlbnY9Tm9uZSwgdW5pdmVy c2FsX25ld2xpbmVzPUZhbHNlLCB0cmVhdF9ub19kYXRhX2FzX2NyYXNoPUZhbHNlKToKICAgICAg ICAgc2VsZi5fcG9ydCA9IHBvcnRfb2JqCiAgICAgICAgIHNlbGYuX25hbWUgPSBuYW1lICAjIFNo b3VsZCBiZSB0aGUgY29tbWFuZCBuYW1lIChlLmcuIER1bXBSZW5kZXJUcmVlLCBJbWFnZURpZmYp CiAgICAgICAgIHNlbGYuX2NtZCA9IGNtZApAQCAtNjgsNiArNjgsNyBAQCBjbGFzcyBTZXJ2ZXJQ cm9jZXNzKG9iamVjdCk6CiAgICAgICAgICMgU2V0IGlmIHRoZSBwcm9jZXNzIG91dHB1dHMgbm9u LXN0YW5kYXJkIG5ld2xpbmVzIGxpa2UgJ1xyXG4nIG9yICdccicuCiAgICAgICAgICMgRG9uJ3Qg c2V0IGlmIHRoZXJlIHdpbGwgYmUgYmluYXJ5IGRhdGEgb3IgdGhlIGRhdGEgbXVzdCBiZSBBU0NJ SSBlbmNvZGVkLgogICAgICAgICBzZWxmLl91bml2ZXJzYWxfbmV3bGluZXMgPSB1bml2ZXJzYWxf bmV3bGluZXMKKyAgICAgICAgc2VsZi5fdHJlYXRfbm9fZGF0YV9hc19jcmFzaCA9IHRyZWF0X25v X2RhdGFfYXNfY3Jhc2gKICAgICAgICAgc2VsZi5faG9zdCA9IHNlbGYuX3BvcnQuaG9zdAogICAg ICAgICBzZWxmLl9waWQgPSBOb25lCiAgICAgICAgIHNlbGYuX3Jlc2V0KCkKQEAgLTIzMCwxNyAr MjMxLDE3IEBAIGNsYXNzIFNlcnZlclByb2Nlc3Mob2JqZWN0KToKICAgICAgICAgICAgIGlmIG91 dF9mZCBpbiByZWFkX2ZkczoKICAgICAgICAgICAgICAgICBkYXRhID0gc2VsZi5fcHJvYy5zdGRv dXQucmVhZCgpCiAgICAgICAgICAgICAgICAgaWYgbm90IGRhdGEgYW5kIG5vdCBzdG9wcGluZzoK LSAgICAgICAgICAgICAgICAgICAgaWYgc2VsZi5fcHJvYy5wb2xsKCkgaXMgbm90IE5vbmU6Cisg ICAgICAgICAgICAgICAgICAgIGlmIHNlbGYuX3RyZWF0X25vX2RhdGFfYXNfY3Jhc2ggb3Igc2Vs Zi5fcHJvYy5wb2xsKCkgaXMgbm90IE5vbmU6CiAgICAgICAgICAgICAgICAgICAgICAgICBfbG9n Lndhcm5pbmcoJ3VuZXhwZWN0ZWQgRU9GIG9mIHN0ZG91dCwgJXMgY3Jhc2hlZCcgJSBzZWxmLl9u YW1lKQogICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fY3Jhc2hlZCA9IFRydWUKICAgICAg ICAgICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICAgICAgICAgIF9sb2cud2Fybmlu ZygndW5leHBlY3RlZCBFT0Ygb2Ygc3Rkb3V0LCAlcyBzdGlsbCBhbGl2ZScgJSBzZWxmLl9uYW1l KQorICAgICAgICAgICAgICAgICAgICAgICAgX2xvZy53YXJuaW5nKCd1bmV4cGVjdGVkIEVPRiBv ZiBzdGRvdXQsICVzIGlzIHN0aWxsIGFsaXZlJyAlIHNlbGYuX25hbWUpCiAgICAgICAgICAgICAg ICAgc2VsZi5fb3V0cHV0ICs9IGRhdGEKIAogICAgICAgICAgICAgaWYgZXJyX2ZkIGluIHJlYWRf ZmRzOgogICAgICAgICAgICAgICAgIGRhdGEgPSBzZWxmLl9wcm9jLnN0ZGVyci5yZWFkKCkKICAg ICAgICAgICAgICAgICBpZiBub3QgZGF0YSBhbmQgbm90IHN0b3BwaW5nOgotICAgICAgICAgICAg ICAgICAgICBpZiBzZWxmLl9wcm9jLnBvbGwoKSBpcyBub3QgTm9uZToKKyAgICAgICAgICAgICAg ICAgICAgaWYgc2VsZi5fdHJlYXRfbm9fZGF0YV9hc19jcmFzaCBvciBzZWxmLl9wcm9jLnBvbGwo KSBpcyBub3QgTm9uZToKICAgICAgICAgICAgICAgICAgICAgICAgIF9sb2cud2FybmluZygndW5l eHBlY3RlZCBFT0Ygb24gc3RkZXJyLCAlcyBjcmFzaGVkJyAlIHNlbGYuX25hbWUpCiAgICAgICAg ICAgICAgICAgICAgICAgICBzZWxmLl9jcmFzaGVkID0gVHJ1ZQogICAgICAgICAgICAgICAgICAg ICBlbHNlOgo=