90500 2012-07-03 15:14:27 -0700 nrwt: fix mock port 2012-07-03 16:53:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric ojan tony webkit.review.bot oldest_to_newest 662504 0 dpranke 2012-07-03 15:14:27 -0700 nrwt: fix mock port 662505 1 150676 dpranke 2012-07-03 15:16:23 -0700 Created attachment 150676 Patch 662514 2 150679 dpranke 2012-07-03 15:26:51 -0700 Created attachment 150679 add in chromium_android fix 662538 3 150679 ojan 2012-07-03 16:00:18 -0700 Comment on attachment 150679 add in chromium_android fix Do we still have bots that run test_shell for running layout tests? 662570 4 dpranke 2012-07-03 16:43:49 -0700 (In reply to comment #3) > (From update of attachment 150679 [details]) > Do we still have bots that run test_shell for running layout tests? No, but the android port still uses it; until they finish upstreaming and can remove the code that still uses test_shell it doesn't hurt to leave this around. See bug 88542 and bug 88478. 662577 5 dpranke 2012-07-03 16:53:51 -0700 Committed r121812: <http://trac.webkit.org/changeset/121812> 150676 2012-07-03 15:16:23 -0700 2012-07-03 15:26:48 -0700 Patch bug-90500-20120703151622.patch text/plain 9918 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxNzEzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDc3M2UzYjY2ODM1ZmNiNTRlMjUxMTJlNTg5M2QwYWQz OWM3ZGJiYy4uZjcwNDJmMGQyOTY5NjgwZDFhZDhmZjZlNDIzNmVmZTcyMDhjZTAwZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5 IEBACisyMDEyLTA3LTAzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIG5yd3Q6IGZpeCBtb2NrIHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTkwNTAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhlIE1vY2tEUlQgY29kZSB3YXMgbmV2ZXIgdXBkYXRlZCB3aGVu IHdlIHN3aXRjaGVkIHRoZSBjaHJvbWl1bQorICAgICAgICBwb3J0cyB0byB1c2luZyAiZHJ0IG1v ZGUiIGJ5IGRlZmF1bHQuIFRoaXMgY2hhbmdlIHVwZGF0ZXMgdGhhdAorICAgICAgICBjb2RlLCBm aXhlcyBhIHR5cG8gaW4gdGhlIGNocm9taXVtIHBvcnQgdGhhdCB3ZW50IHVuZGV0ZWN0ZWQKKyAg ICAgICAgKGRlZmF1bHRfdGVzdF90aW1lb3V0X21zIC0+IGRlZmF1bHRfdGltZW91dF9tcyksIGFu ZCBhZGRzIHRlc3RzCisgICAgICAgIHRoYXQgYWN0dWFsbHkgZXhlcmNpc2Ugc29tZSBvZiB0aGUg bW9jayBwb3J0cy4gVGhlc2UgdGVzdHMgYXJlCisgICAgICAgIHVzZWZ1bCBpbiB0aGF0IHRoZXkg d2lsbCBleGVyY2lzZSB0aGUgcG9ydC1zcGVjaWZpYyBjb2RlIGluIGFuCisgICAgICAgIGVuZC10 by1lbmQtbWFubmVyLCBidXQgdGhleSBhcmUgYSBiaXQgc2xvdyBmb3Igc29tZSByZWFzb24gKD4x cworICAgICAgICBlYWNoKSB0aGF0IEkgbmVlZCB0byBsb29rIGludG8uCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5OgorICAgICAgICAo Q2hyb21pdW1Ecml2ZXIuc3RvcCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9tb2NrX2RydC5weToKKyAgICAgICAgKG1haW4pOgorICAgICAgICAocGFyc2Vf b3B0aW9ucyk6CisgICAgICAgIChNb2NrVGVzdFNoZWxsKToKKyAgICAgICAgKE1vY2tUZXN0U2hl bGwub3V0cHV0X2Zvcl90ZXN0KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L21vY2tfZHJ0X3VuaXR0ZXN0LnB5OgorICAgICAgICAoTW9ja0RSVFRlc3QuYXNz ZXJ0VGVzdCk6CisgICAgICAgIChNb2NrVGVzdFNoZWxsVGVzdCk6CisgICAgICAgIChNb2NrVGVz dFNoZWxsVGVzdC5tYWtlX2RydCk6CisgICAgICAgIChNb2NrVGVzdFNoZWxsVGVzdC50ZXN0X3Rl c3Rfc2hlbGxfcGFyc2Vfb3B0aW9ucyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHk6CisgICAgICAgIChQ b3J0VGVzdCk6CisgICAgICAgIChQb3J0VGVzdC5hc3NlcnRfbW9ja19wb3J0X3dvcmtzKToKKyAg ICAgICAgKFBvcnRUZXN0LnRlc3RfY2hyb21pdW1fbWFjX2xpb24pOgorICAgICAgICAoUG9ydFRl c3QudGVzdF9jaHJvbWl1bV9tYWNfbGlvbl9pbl90ZXN0X3NoZWxsX21vZGUpOgorICAgICAgICAo UG9ydFRlc3QudGVzdF9xdF9saW51eCk6CisgICAgICAgIChQb3J0VGVzdC50ZXN0X21hY19saW9u KToKKwogMjAxMi0wNy0wMiAgTGVhbmRybyBHcmFjaWEgR2lsICA8bGVhbmRyb2dyYWNpYUBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBJbXBsZW1lbnQgYSBMYXlvdXQgVGVzdCBm b3IgZWRpdGluZy9TdXJyb3VuZGluZ1RleHQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CmluZGV4IDMyZDM0MDE4Yzg1ZWZmOTg5 MGMyN2NhYzI3NWFlOTlkMmRjMzZhODAuLjZmMTVkNDMxNjRiMGJiYmI1OTQ3NGU2MDA4NGExNjEy OWZiZWQ5MWUgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY2hyb21pdW0ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9jaHJvbWl1bS5weQpAQCAtNjg3LDcgKzY4Nyw3IEBAIGNsYXNzIENocm9taXVtRHJp dmVyKFdlYktpdERyaXZlcik6CiAgICAgICAgICAgICBzZWxmLl9wcm9jLnN0ZGVyci5jbG9zZSgp CiAgICAgICAgIHRpbWVfb3V0X21zID0gc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCd0aW1lX291dF9t cycpCiAgICAgICAgIGlmIHRpbWVfb3V0X21zIGFuZCBub3Qgc2VsZi5fbm9fdGltZW91dDoKLSAg ICAgICAgICAgIHRpbWVvdXRfcmF0aW8gPSBmbG9hdCh0aW1lX291dF9tcykgLyBzZWxmLl9wb3J0 LmRlZmF1bHRfdGVzdF90aW1lb3V0X21zKCkKKyAgICAgICAgICAgIHRpbWVvdXRfcmF0aW8gPSBm bG9hdCh0aW1lX291dF9tcykgLyBzZWxmLl9wb3J0LmRlZmF1bHRfdGltZW91dF9tcygpCiAgICAg ICAgICAgICBraWxsX3RpbWVvdXRfc2Vjb25kcyA9IHNlbGYuS0lMTF9USU1FT1VUX0RFRkFVTFQg KiB0aW1lb3V0X3JhdGlvIGlmIHRpbWVvdXRfcmF0aW8gPiAxLjAgZWxzZSBzZWxmLktJTExfVElN RU9VVF9ERUZBVUxUCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBraWxsX3RpbWVvdXRfc2Vj b25kcyA9IHNlbGYuS0lMTF9USU1FT1VUX0RFRkFVTFQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnQucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21vY2tfZHJ0LnB5CmluZGV4IDA1OGRmN2IwNmEy ZTgzOGE0OWMzOWNiZWVlN2FlOTZiYWUzNjY5MzYuLmEyMTA2ZmRkOTU5YWFjOGE3YTZjZjcwY2Q1 MTI0ZDdkMzg5MjA2MzQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvbW9ja19kcnQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9tb2NrX2RydC5weQpAQCAtMzksNiArMzksNyBAQCBNb2NrRFJUIHRvIGNy YXNoKS4KIAogaW1wb3J0IGJhc2U2NAogaW1wb3J0IGxvZ2dpbmcKK2ltcG9ydCBvcHRwYXJzZQog aW1wb3J0IG9zCiBpbXBvcnQgc3lzCiAKQEAgLTUxLDcgKzUyLDYgQEAgaWYgc2NyaXB0X2RpciBu b3QgaW4gc3lzLnBhdGg6CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uc3lzdGVtaG9zdCBp bXBvcnQgU3lzdGVtSG9zdAogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydC5kcml2ZXIg aW1wb3J0IERyaXZlcklucHV0LCBEcml2ZXJPdXRwdXQsIERyaXZlclByb3h5CiBmcm9tIHdlYmtp dHB5LmxheW91dF90ZXN0cy5wb3J0LmZhY3RvcnkgaW1wb3J0IFBvcnRGYWN0b3J5Ci1mcm9tIHdl YmtpdHB5LnRvb2wubW9ja3Rvb2wgaW1wb3J0IE1vY2tPcHRpb25zCiAKIF9sb2cgPSBsb2dnaW5n LmdldExvZ2dlcihfX25hbWVfXykKIApAQCAtMTMwLDggKzEzMCw4IEBAIGRlZiBtYWluKGFyZ3Ys IGhvc3QsIHN0ZGluLCBzdGRvdXQsIHN0ZGVycik6CiAgICAgIiIiUnVuIHRoZSB0ZXN0cy4iIiIK IAogICAgIG9wdGlvbnMsIGFyZ3MgPSBwYXJzZV9vcHRpb25zKGFyZ3YpCi0gICAgaWYgb3B0aW9u cy5jaHJvbWl1bToKLSAgICAgICAgZHJ0ID0gTW9ja0Nocm9taXVtRFJUKG9wdGlvbnMsIGFyZ3Ms IGhvc3QsIHN0ZGluLCBzdGRvdXQsIHN0ZGVycikKKyAgICBpZiBvcHRpb25zLnRlc3Rfc2hlbGw6 CisgICAgICAgIGRydCA9IE1vY2tUZXN0U2hlbGwob3B0aW9ucywgYXJncywgaG9zdCwgc3RkaW4s IHN0ZG91dCwgc3RkZXJyKQogICAgIGVsc2U6CiAgICAgICAgIGRydCA9IE1vY2tEUlQob3B0aW9u cywgYXJncywgaG9zdCwgc3RkaW4sIHN0ZG91dCwgc3RkZXJyKQogICAgIHJldHVybiBkcnQucnVu KCkKQEAgLTE1MSwxNiArMTUxLDE1IEBAIGRlZiBwYXJzZV9vcHRpb25zKGFyZ3YpOgogCiAgICAg cGl4ZWxfdGVzdHMgPSBGYWxzZQogICAgIHBpeGVsX3BhdGggPSBOb25lCi0gICAgY2hyb21pdW0g PSBGYWxzZQotICAgIGlmIHBsYXRmb3JtLnN0YXJ0c3dpdGgoJ2Nocm9taXVtJyk6Ci0gICAgICAg IGNocm9taXVtID0gVHJ1ZQorICAgIHRlc3Rfc2hlbGwgPSAnLS10ZXN0LXNoZWxsJyBpbiBhcmd2 CisgICAgaWYgdGVzdF9zaGVsbDoKICAgICAgICAgZm9yIGFyZyBpbiBhcmd2OgogICAgICAgICAg ICAgaWYgYXJnLnN0YXJ0c3dpdGgoJy0tcGl4ZWwtdGVzdHMnKToKICAgICAgICAgICAgICAgICBw aXhlbF90ZXN0cyA9IFRydWUKICAgICAgICAgICAgICAgICBwaXhlbF9wYXRoID0gYXJnW2xlbign LS1waXhlbC10ZXN0cz0nKTpdCiAgICAgZWxzZToKICAgICAgICAgcGl4ZWxfdGVzdHMgPSAnLS1w aXhlbC10ZXN0cycgaW4gYXJndgotICAgIG9wdGlvbnMgPSBNb2NrT3B0aW9ucyhjaHJvbWl1bT1j aHJvbWl1bSwgcGxhdGZvcm09cGxhdGZvcm0sIHBpeGVsX3Rlc3RzPXBpeGVsX3Rlc3RzLCBwaXhl bF9wYXRoPXBpeGVsX3BhdGgpCisgICAgb3B0aW9ucyA9IG9wdHBhcnNlLlZhbHVlcyh7J3Rlc3Rf c2hlbGwnOiB0ZXN0X3NoZWxsLCAncGxhdGZvcm0nOiBwbGF0Zm9ybSwgJ3BpeGVsX3Rlc3RzJzog cGl4ZWxfdGVzdHMsICdwaXhlbF9wYXRoJzogcGl4ZWxfcGF0aH0pCiAgICAgcmV0dXJuIChvcHRp b25zLCBhcmd2KQogCiAKQEAgLTI1NSw3ICsyNTQsNyBAQCBjbGFzcyBNb2NrRFJUKG9iamVjdCk6 CiAgICAgICAgIHNlbGYuX3N0ZGVyci5mbHVzaCgpCiAKIAotY2xhc3MgTW9ja0Nocm9taXVtRFJU KE1vY2tEUlQpOgorY2xhc3MgTW9ja1Rlc3RTaGVsbChNb2NrRFJUKToKICAgICBkZWYgaW5wdXRf ZnJvbV9saW5lKHNlbGYsIGxpbmUpOgogICAgICAgICB2YWxzID0gbGluZS5zdHJpcCgpLnNwbGl0 KCkKICAgICAgICAgaWYgbGVuKHZhbHMpID09IDM6CkBAIC0yNzIsNyArMjcxLDcgQEAgY2xhc3Mg TW9ja0Nocm9taXVtRFJUKE1vY2tEUlQpOgogICAgICAgICBvcmlnaW5hbF90ZXN0X25hbWUgPSB0 ZXN0X2lucHV0LnRlc3RfbmFtZQogICAgICAgICBpZiAnLS1lbmFibGUtYWNjZWxlcmF0ZWQtMmQt Y2FudmFzJyBpbiBzZWxmLl9hcmdzIGFuZCAnY2FudmFzJyBpbiB0ZXN0X2lucHV0LnRlc3RfbmFt ZToKICAgICAgICAgICAgIHRlc3RfaW5wdXQudGVzdF9uYW1lID0gJ3BsYXRmb3JtL2Nocm9taXVt L3ZpcnR1YWwvZ3B1LycgKyB0ZXN0X2lucHV0LnRlc3RfbmFtZQotICAgICAgICBvdXRwdXQgPSBz dXBlcihNb2NrQ2hyb21pdW1EUlQsIHNlbGYpLm91dHB1dF9mb3JfdGVzdCh0ZXN0X2lucHV0LCBp c19yZWZ0ZXN0KQorICAgICAgICBvdXRwdXQgPSBzdXBlcihNb2NrVGVzdFNoZWxsLCBzZWxmKS5v dXRwdXRfZm9yX3Rlc3QodGVzdF9pbnB1dCwgaXNfcmVmdGVzdCkKICAgICAgICAgdGVzdF9pbnB1 dC50ZXN0X25hbWUgPSBvcmlnaW5hbF90ZXN0X25hbWUKICAgICAgICAgcmV0dXJuIG91dHB1dAog CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21v Y2tfZHJ0X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9tb2NrX2RydF91bml0dGVzdC5weQppbmRleCA1NzBhOWU0YWQ2NzU0YTcxZTk0MjZkM2E0 MDE3NGVlY2UxNmQ0ODA2Li4xNjU0ZTFjNDgxNzAwYTQwOGRjZWI3NTRjMjk2ODAyYTQ2ZWVjYWUx IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21v Y2tfZHJ0X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvbW9ja19kcnRfdW5pdHRlc3QucHkKQEAgLTE1MCw3ICsxNTAsNyBAQCBjbGFzcyBN b2NrRFJUVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICMgV2UgdXNlIHRoZSBTdHJp bmdJTy5idWZsaXN0IGhlcmUgaW5zdGVhZCBvZiBnZXR2YWx1ZSgpIGJlY2F1c2UKICAgICAgICAg IyB0aGUgU3RyaW5nSU8gbWlnaHQgYmUgYSBtaXggb2YgdW5pY29kZS9hc2NpaSBhbmQgOC1iaXQg c3RyaW5ncy4KICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzdGRvdXQuYnVmbGlzdCwgZHJ0X291 dHB1dCkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzdGRlcnIuZ2V0dmFsdWUoKSwgJycgaWYg b3B0aW9ucy5jaHJvbWl1bSBlbHNlICcjRU9GXG4nKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFs KHN0ZGVyci5nZXR2YWx1ZSgpLCAnJyBpZiBvcHRpb25zLnRlc3Rfc2hlbGwgZWxzZSAnI0VPRlxu JykKIAogICAgIGRlZiB0ZXN0X21haW4oc2VsZik6CiAgICAgICAgIGhvc3QgPSBNb2NrU3lzdGVt SG9zdCgpCkBAIC0yMDEsMjIgKzIwMSwyMSBAQCBjbGFzcyBNb2NrRFJUVGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0VGVzdCgncGFzc2VzL21pc21hdGNoLmh0bWwn LCBUcnVlLCBleHBlY3RlZF9jaGVja3N1bT0nbW9jay1jaGVja3N1bScsIGV4cGVjdGVkX3RleHQ9 J3JlZmVyZW5jZSB0ZXh0XG4nKQogCiAKLQotY2xhc3MgTW9ja0Nocm9taXVtRFJUVGVzdChNb2Nr RFJUVGVzdCk6CitjbGFzcyBNb2NrVGVzdFNoZWxsVGVzdChNb2NrRFJUVGVzdCk6CiAgICAgZGVm IGV4dHJhX2FyZ3Moc2VsZiwgcGl4ZWxfdGVzdHMpOgogICAgICAgICBpZiBwaXhlbF90ZXN0czoK ICAgICAgICAgICAgIHJldHVybiBbJy0tcGl4ZWwtdGVzdHM9L3RtcC9wbmdfcmVzdWx0MC5wbmcn XQogICAgICAgICByZXR1cm4gW10KIAogICAgIGRlZiBtYWtlX2RydChzZWxmLCBvcHRpb25zLCBh cmdzLCBob3N0LCBzdGRpbiwgc3Rkb3V0LCBzdGRlcnIpOgotICAgICAgICBvcHRpb25zLmNocm9t aXVtID0gVHJ1ZQorICAgICAgICBvcHRpb25zLnRlc3Rfc2hlbGwgPSBUcnVlCiAKICAgICAgICAg IyBXZSBoYXZlIHRvIHNldCB0aGVzZSBieSBoYW5kIGJlY2F1c2UgLS1wbGF0Zm9ybSB0ZXN0IHdv bid0IHRyaWdnZXIKICAgICAgICAgIyB0aGUgQ2hyb21pdW0gY29kZSBwYXRocy4KICAgICAgICAg b3B0aW9ucy5waXhlbF9wYXRoID0gJy90bXAvcG5nX3Jlc3VsdDAucG5nJwogICAgICAgICBvcHRp b25zLnBpeGVsX3Rlc3RzID0gVHJ1ZQogCi0gICAgICAgIHJldHVybiBtb2NrX2RydC5Nb2NrQ2hy b21pdW1EUlQob3B0aW9ucywgYXJncywgaG9zdCwgc3RkaW4sIHN0ZG91dCwgc3RkZXJyKQorICAg ICAgICByZXR1cm4gbW9ja19kcnQuTW9ja1Rlc3RTaGVsbChvcHRpb25zLCBhcmdzLCBob3N0LCBz dGRpbiwgc3Rkb3V0LCBzdGRlcnIpCiAKICAgICBkZWYgaW5wdXRfbGluZShzZWxmLCBwb3J0LCB0 ZXN0X25hbWUsIGNoZWNrc3VtPU5vbmUpOgogICAgICAgICB1cmwgPSBwb3J0LmNyZWF0ZV9kcml2 ZXIoMCkudGVzdF90b191cmkodGVzdF9uYW1lKQpAQCAtMjUxLDEwICsyNTAsMTAgQEAgY2xhc3Mg TW9ja0Nocm9taXVtRFJUVGVzdChNb2NrRFJUVGVzdCk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxzKGhvc3QuZmlsZXN5c3RlbS53cml0dGVuX2ZpbGVzLAogICAgICAgICAgICAgeycvdG1wL3Bu Z19yZXN1bHQwLnBuZyc6ICdpbWFnZV9jaGVja3N1bVx4OGEtcG5ndEVYdGNoZWNrc3VtXHgwMGlt YWdlX2NoZWNrc3VtLWNoZWNrc3VtJ30pCiAKLSAgICBkZWYgdGVzdF9jaHJvbWl1bV9wYXJzZV9v cHRpb25zKHNlbGYpOgotICAgICAgICBvcHRpb25zLCBhcmdzID0gbW9ja19kcnQucGFyc2Vfb3B0 aW9ucyhbJy0tcGxhdGZvcm0nLCAnY2hyb21pdW0tbWFjJywKKyAgICBkZWYgdGVzdF90ZXN0X3No ZWxsX3BhcnNlX29wdGlvbnMoc2VsZik6CisgICAgICAgIG9wdGlvbnMsIGFyZ3MgPSBtb2NrX2Ry dC5wYXJzZV9vcHRpb25zKFsnLS1wbGF0Zm9ybScsICdjaHJvbWl1bS1tYWMnLCAnLS10ZXN0LXNo ZWxsJywKICAgICAgICAgICAgICctLXBpeGVsLXRlc3RzPS90bXAvcG5nX3Jlc3VsdDAucG5nJ10p Ci0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShvcHRpb25zLmNocm9taXVtKQorICAgICAgICBzZWxm LmFzc2VydFRydWUob3B0aW9ucy50ZXN0X3NoZWxsKQogICAgICAgICBzZWxmLmFzc2VydFRydWUo b3B0aW9ucy5waXhlbF90ZXN0cykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMob3B0aW9ucy5w aXhlbF9wYXRoLCAnL3RtcC9wbmdfcmVzdWx0MC5wbmcnKQogCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9u dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRf dGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5CmluZGV4IDI4ZTFhMTQ1MTBiZGQ0OGI1Yjc3NGQ5Zjdk NzVhY2MwYzBlNjdhMDYuLjA0YmM1ZTUwMDQ5MjBlYmQ3ZTM3NDgzMTU0MTBkNTA2NTliYTA2OGYg MTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJr aXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5CkBAIC00Niw2 ICs0Niw3IEBAIGltcG9ydCB1bml0dGVzdAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtIGlt cG9ydCBvdXRwdXRjYXB0dXJlLCBwYXRoCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uY3Jh c2hsb2dzX3VuaXR0ZXN0IGltcG9ydCBtYWtlX21vY2tfY3Jhc2hfcmVwb3J0X2RhcndpbgogZnJv bSB3ZWJraXRweS5jb21tb24uc3lzdGVtLnN5c3RlbWhvc3QgaW1wb3J0IFN5c3RlbUhvc3QKK2Zy b20gd2Via2l0cHkuY29tbW9uLmhvc3QgaW1wb3J0IEhvc3QKIGZyb20gd2Via2l0cHkuY29tbW9u Lmhvc3RfbW9jayBpbXBvcnQgTW9ja0hvc3QKIAogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMg aW1wb3J0IHBvcnQKQEAgLTEwMTEsNSArMTAxMiwyMSBAQCBjbGFzcyBSZWJhc2VsaW5lVGVzdCh1 bml0dGVzdC5UZXN0Q2FzZSwgU3RyZWFtVGVzdGluZ01peGluKToKICAgICAgICAgICAgICJwbGF0 Zm9ybS90ZXN0LW1hYy1sZW9wYXJkL2ZhaWx1cmVzL2V4cGVjdGVkL21pc3NpbmdfaW1hZ2UiLCBb Ii50eHQiLCAiLnBuZyJdLCBlcnIpCiAKIAorY2xhc3MgUG9ydFRlc3QodW5pdHRlc3QuVGVzdENh c2UpOgorICAgIGRlZiBhc3NlcnRfbW9ja19wb3J0X3dvcmtzKHNlbGYsIHBvcnRfbmFtZSwgYXJn cz1bXSk6CisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwYXNzaW5nX3J1bihhcmdzICsgWyctLXBs YXRmb3JtJywgJ21vY2stJyArIHBvcnRfbmFtZSwgJ2Zhc3QvaGFybmVzcy9yZXN1bHRzLmh0bWwn XSwgdGVzdHNfaW5jbHVkZWQ9VHJ1ZSwgaG9zdD1Ib3N0KCkpKQorCisgICAgZGVmIHRlc3RfY2hy b21pdW1fbWFjX2xpb24oc2VsZik6CisgICAgICAgIHNlbGYuYXNzZXJ0X21vY2tfcG9ydF93b3Jr cygnY2hyb21pdW0tbWFjLWxpb24nKQorCisgICAgZGVmIHRlc3RfY2hyb21pdW1fbWFjX2xpb25f aW5fdGVzdF9zaGVsbF9tb2RlKHNlbGYpOgorICAgICAgICBzZWxmLmFzc2VydF9tb2NrX3BvcnRf d29ya3MoJ2Nocm9taXVtLW1hYy1saW9uJywgYXJncz1bJy0tYWRkaXRpb25hbC1kcnQtZmxhZz0t LXRlc3Qtc2hlbGwnXSkKKworICAgIGRlZiB0ZXN0X3F0X2xpbnV4KHNlbGYpOgorICAgICAgICBz ZWxmLmFzc2VydF9tb2NrX3BvcnRfd29ya3MoJ3F0LWxpbnV4JykKKworICAgIGRlZiB0ZXN0X21h Y19saW9uKHNlbGYpOgorICAgICAgICBzZWxmLmFzc2VydF9tb2NrX3BvcnRfd29ya3MoJ21hYy1s aW9uJykKKwogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICB1bml0dGVzdC5tYWluKCkK 150679 2012-07-03 15:26:51 -0700 2012-07-03 16:00:18 -0700 add in chromium_android fix bug-90500-20120703152650.patch text/plain 12828 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxNzEzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDc3M2UzYjY2ODM1ZmNiNTRlMjUxMTJlNTg5M2QwYWQz OWM3ZGJiYy4uNjk0YTYyNjFhYzI0MThiZWE0NWJjMzc2NzBkYTg3ZmY1OTUxNGI3NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQz IEBACisyMDEyLTA3LTAzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIG5yd3Q6IGZpeCBtb2NrIHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTkwNTAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhlIE1vY2tEUlQgY29kZSB3YXMgbmV2ZXIgdXBkYXRlZCB3aGVu IHdlIHN3aXRjaGVkIHRoZSBjaHJvbWl1bQorICAgICAgICBwb3J0cyB0byB1c2luZyAiZHJ0IG1v ZGUiIGJ5IGRlZmF1bHQuIFRoaXMgY2hhbmdlIHVwZGF0ZXMgdGhhdAorICAgICAgICBjb2RlLCBm aXhlcyBhIHR5cG8gaW4gdGhlIGNocm9taXVtIHBvcnQgdGhhdCB3ZW50IHVuZGV0ZWN0ZWQKKyAg ICAgICAgKGRlZmF1bHRfdGVzdF90aW1lb3V0X21zIC0+IGRlZmF1bHRfdGltZW91dF9tcyksIGFu ZCBhZGRzIHRlc3RzCisgICAgICAgIHRoYXQgYWN0dWFsbHkgZXhlcmNpc2Ugc29tZSBvZiB0aGUg bW9jayBwb3J0cy4gVGhlc2UgdGVzdHMgYXJlCisgICAgICAgIHVzZWZ1bCBpbiB0aGF0IHRoZXkg d2lsbCBleGVyY2lzZSB0aGUgcG9ydC1zcGVjaWZpYyBjb2RlIGluIGFuCisgICAgICAgIGVuZC10 by1lbmQtbWFubmVyLCBidXQgdGhleSBhcmUgYSBiaXQgc2xvdyBmb3Igc29tZSByZWFzb24gKD4x cworICAgICAgICBlYWNoKSB0aGF0IEkgbmVlZCB0byBsb29rIGludG8uCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5OgorICAgICAgICAo Q2hyb21pdW1Ecml2ZXIuc3RvcCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5OgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lk UG9ydC5kZWZhdWx0X3RpbWVvdXRfbXMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZF91bml0dGVzdC5weToKKyAgICAgICAgKFRl c3RDaHJvbWl1bUFuZHJvaWRQb3J0LnRlc3RfZGVmYXVsdF90aW1lb3V0X21zKToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21vY2tfZHJ0LnB5OgorICAgICAg ICAobWFpbik6CisgICAgICAgIChwYXJzZV9vcHRpb25zKToKKyAgICAgICAgKE1vY2tUZXN0U2hl bGwpOgorICAgICAgICAoTW9ja1Rlc3RTaGVsbC5vdXRwdXRfZm9yX3Rlc3QpOgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnRfdW5pdHRlc3QucHk6 CisgICAgICAgIChNb2NrRFJUVGVzdC5hc3NlcnRUZXN0KToKKyAgICAgICAgKE1vY2tUZXN0U2hl bGxUZXN0KToKKyAgICAgICAgKE1vY2tUZXN0U2hlbGxUZXN0Lm1ha2VfZHJ0KToKKyAgICAgICAg KE1vY2tUZXN0U2hlbGxUZXN0LnRlc3RfdGVzdF9zaGVsbF9wYXJzZV9vcHRpb25zKToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVn cmF0aW9udGVzdC5weToKKyAgICAgICAgKFBvcnRUZXN0KToKKyAgICAgICAgKFBvcnRUZXN0LmFz c2VydF9tb2NrX3BvcnRfd29ya3MpOgorICAgICAgICAoUG9ydFRlc3QudGVzdF9jaHJvbWl1bV9t YWNfbGlvbik6CisgICAgICAgIChQb3J0VGVzdC50ZXN0X2Nocm9taXVtX21hY19saW9uX2luX3Rl c3Rfc2hlbGxfbW9kZSk6CisgICAgICAgIChQb3J0VGVzdC50ZXN0X3F0X2xpbnV4KToKKyAgICAg ICAgKFBvcnRUZXN0LnRlc3RfbWFjX2xpb24pOgorCiAyMDEyLTA3LTAyICBMZWFuZHJvIEdyYWNp YSBHaWwgIDxsZWFuZHJvZ3JhY2lhQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1d IEltcGxlbWVudCBhIExheW91dCBUZXN0IGZvciBlZGl0aW5nL1N1cnJvdW5kaW5nVGV4dApkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0u cHkKaW5kZXggMzJkMzQwMThjODVlZmY5ODkwYzI3Y2FjMjc1YWU5OWQyZGMzNmE4MC4uNmYxNWQ0 MzE2NGIwYmJiYjU5NDc0ZTYwMDg0YTE2MTI5ZmJlZDkxZSAxMDA3NTUKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CkBAIC02ODcsNyAr Njg3LDcgQEAgY2xhc3MgQ2hyb21pdW1Ecml2ZXIoV2ViS2l0RHJpdmVyKToKICAgICAgICAgICAg IHNlbGYuX3Byb2Muc3RkZXJyLmNsb3NlKCkKICAgICAgICAgdGltZV9vdXRfbXMgPSBzZWxmLl9w b3J0LmdldF9vcHRpb24oJ3RpbWVfb3V0X21zJykKICAgICAgICAgaWYgdGltZV9vdXRfbXMgYW5k IG5vdCBzZWxmLl9ub190aW1lb3V0OgotICAgICAgICAgICAgdGltZW91dF9yYXRpbyA9IGZsb2F0 KHRpbWVfb3V0X21zKSAvIHNlbGYuX3BvcnQuZGVmYXVsdF90ZXN0X3RpbWVvdXRfbXMoKQorICAg ICAgICAgICAgdGltZW91dF9yYXRpbyA9IGZsb2F0KHRpbWVfb3V0X21zKSAvIHNlbGYuX3BvcnQu ZGVmYXVsdF90aW1lb3V0X21zKCkKICAgICAgICAgICAgIGtpbGxfdGltZW91dF9zZWNvbmRzID0g c2VsZi5LSUxMX1RJTUVPVVRfREVGQVVMVCAqIHRpbWVvdXRfcmF0aW8gaWYgdGltZW91dF9yYXRp byA+IDEuMCBlbHNlIHNlbGYuS0lMTF9USU1FT1VUX0RFRkFVTFQKICAgICAgICAgZWxzZToKICAg ICAgICAgICAgIGtpbGxfdGltZW91dF9zZWNvbmRzID0gc2VsZi5LSUxMX1RJTUVPVVRfREVGQVVM VApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bV9hbmRyb2lkLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5CmluZGV4IDhmMmFhODBlOWIyMmNhMjRiYmZiOTdkZmNj YmYxYzkyNDlhNzJkNjkuLjM2MmY0ODU4Yzg5YjhiYjdhMDZhOTFiNzk4MzM1MjAyYTE4NzI3YzAg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW1fYW5kcm9pZC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKQEAgLTE3OCw3ICsxNzgsNyBAQCBjbGFzcyBDaHJv bWl1bUFuZHJvaWRQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAgICAgICAgICAgICBzZWxm Ll9hZGJfY29tbWFuZCArPSBzaGxleC5zcGxpdChhZGJfYXJncykKICAgICAgICAgc2VsZi5fZHJ0 X3JldHJ5X2FmdGVyX2tpbGxlZCA9IDAKIAotICAgIGRlZiBkZWZhdWx0X3Rlc3RfdGltZW91dF9t cyhzZWxmKToKKyAgICBkZWYgZGVmYXVsdF90aW1lb3V0X21zKHNlbGYpOgogICAgICAgICAjIEFu ZHJvaWQgcGxhdGZvcm0gaGFzIGxlc3MgY29tcHV0aW5nIHBvd2VyIHRoYW4gZGVza3RvcCBwbGF0 Zm9ybXMuCiAgICAgICAgICMgVXNpbmcgMTAgc2Vjb25kcyBhbGxvd3MgdXMgdG8gcGFzcyBtb3N0 IHNsb3cgdGVzdHMgd2hpY2ggYXJlIG5vdAogICAgICAgICAjIG1hcmtlZCBhcyBzbG93IHRlc3Rz IG9uIGRlc2t0b3AgcGxhdGZvcm1zLgpAQCAtMjE0LDcgKzIxNCw3IEBAIGNsYXNzIENocm9taXVt QW5kcm9pZFBvcnQoY2hyb21pdW0uQ2hyb21pdW1Qb3J0KToKICAgICAgICAgcmV0dXJuIFRydWUK IAogICAgICMgRklYTUU6IFJlbW92ZSB0aGlzIGZ1bmN0aW9uIHdoZW4gY2hyb21pdW0tYW5kcm9p ZCBpcyBmdWxseSB1cHN0cmVhbS4KLSAgICBkZWYgZXhwZWN0YXRpb25zX2ZpbGVzKHNlbGYpOiAg IAorICAgIGRlZiBleHBlY3RhdGlvbnNfZmlsZXMoc2VsZik6CiAgICAgICAgIGFuZHJvaWRfZXhw ZWN0YXRpb25zX2ZpbGUgPSBzZWxmLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgnTGF5b3V0VGVzdHMn LCAncGxhdGZvcm0nLCAnY2hyb21pdW0nLCAndGVzdF9leHBlY3RhdGlvbnNfYW5kcm9pZC50eHQn KQogICAgICAgICByZXR1cm4gc3VwZXIoQ2hyb21pdW1BbmRyb2lkUG9ydCwgc2VsZikuZXhwZWN0 YXRpb25zX2ZpbGVzKCkgKyBbYW5kcm9pZF9leHBlY3RhdGlvbnNfZmlsZV0KIApkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRy b2lkX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9jaHJvbWl1bV9hbmRyb2lkX3VuaXR0ZXN0LnB5CmluZGV4IDlmNzI2MjljYmRiODAwYWRjNDkx NGNhYjkwZTY3MTk0ODUxOWJhNDAuLmJkNmZiZDllOWM4ZGM0YWEyZGRjNTY4YWIxZTIwMTc5ZTYy ZTAzMjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvY2hyb21pdW1fYW5kcm9pZF91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWRfdW5pdHRlc3QucHkKQEAgLTI2 LDYgKzI2LDcgQEAKICMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lO RyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYg QURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKK2ltcG9ydCBvcHRw YXJzZQogaW1wb3J0IFN0cmluZ0lPCiBpbXBvcnQgdW5pdHRlc3QKIApAQCAtNDksNiArNTAsMTAg QEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkUG9ydFRlc3QoY2hyb21pdW1fcG9ydF90ZXN0Y2FzZS5D aHJvbWl1bVBvcnRUZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0LmdldF9v cHRpb24oJ2VuYWJsZV9oYXJkd2FyZV9ncHUnKSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMo cG9ydC5iYXNlbGluZV9wYXRoKCksIHBvcnQuX3dlYmtpdF9iYXNlbGluZV9wYXRoKCdjaHJvbWl1 bS1hbmRyb2lkJykpCiAKKyAgICBkZWYgdGVzdF9kZWZhdWx0X3RpbWVvdXRfbXMoc2VsZik6Cisg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHNlbGYubWFrZV9wb3J0KG9wdGlvbnM9b3B0cGFyc2Uu VmFsdWVzKHsnY29uZmlndXJhdGlvbic6ICdSZWxlYXNlJ30pKS5kZWZhdWx0X3RpbWVvdXRfbXMo KSwgMTAwMDApCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHNlbGYubWFrZV9wb3J0KG9wdGlv bnM9b3B0cGFyc2UuVmFsdWVzKHsnY29uZmlndXJhdGlvbic6ICdEZWJ1Zyd9KSkuZGVmYXVsdF90 aW1lb3V0X21zKCksIDEwMDAwKQorCiAgICAgZGVmIHRlc3RfZXhwZWN0YXRpb25zX2ZpbGVzKHNl bGYpOgogICAgICAgICAjIEZJWE1FOiBvdmVycmlkZSB0aGlzIHRlc3QgdGVtcG9yYXJpbHkgd2hp bGUgd2UncmUgc3RpbGwgdXBzdHJlYW1pbmcgdGhlIGFuZHJvaWQgcG9ydCBhbmQKICAgICAgICAg IyB1c2luZyBhIGN1c3RvbSBleHBlY3RhdGlvbnMgZmlsZS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnQucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21vY2tfZHJ0LnB5CmluZGV4IDA1OGRmN2Iw NmEyZTgzOGE0OWMzOWNiZWVlN2FlOTZiYWUzNjY5MzYuLmEyMTA2ZmRkOTU5YWFjOGE3YTZjZjcw Y2Q1MTI0ZDdkMzg5MjA2MzQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9tb2NrX2RydC5weQpAQCAtMzksNiArMzksNyBAQCBNb2NrRFJUIHRv IGNyYXNoKS4KIAogaW1wb3J0IGJhc2U2NAogaW1wb3J0IGxvZ2dpbmcKK2ltcG9ydCBvcHRwYXJz ZQogaW1wb3J0IG9zCiBpbXBvcnQgc3lzCiAKQEAgLTUxLDcgKzUyLDYgQEAgaWYgc2NyaXB0X2Rp ciBub3QgaW4gc3lzLnBhdGg6CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uc3lzdGVtaG9z dCBpbXBvcnQgU3lzdGVtSG9zdAogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydC5kcml2 ZXIgaW1wb3J0IERyaXZlcklucHV0LCBEcml2ZXJPdXRwdXQsIERyaXZlclByb3h5CiBmcm9tIHdl YmtpdHB5LmxheW91dF90ZXN0cy5wb3J0LmZhY3RvcnkgaW1wb3J0IFBvcnRGYWN0b3J5Ci1mcm9t IHdlYmtpdHB5LnRvb2wubW9ja3Rvb2wgaW1wb3J0IE1vY2tPcHRpb25zCiAKIF9sb2cgPSBsb2dn aW5nLmdldExvZ2dlcihfX25hbWVfXykKIApAQCAtMTMwLDggKzEzMCw4IEBAIGRlZiBtYWluKGFy Z3YsIGhvc3QsIHN0ZGluLCBzdGRvdXQsIHN0ZGVycik6CiAgICAgIiIiUnVuIHRoZSB0ZXN0cy4i IiIKIAogICAgIG9wdGlvbnMsIGFyZ3MgPSBwYXJzZV9vcHRpb25zKGFyZ3YpCi0gICAgaWYgb3B0 aW9ucy5jaHJvbWl1bToKLSAgICAgICAgZHJ0ID0gTW9ja0Nocm9taXVtRFJUKG9wdGlvbnMsIGFy Z3MsIGhvc3QsIHN0ZGluLCBzdGRvdXQsIHN0ZGVycikKKyAgICBpZiBvcHRpb25zLnRlc3Rfc2hl bGw6CisgICAgICAgIGRydCA9IE1vY2tUZXN0U2hlbGwob3B0aW9ucywgYXJncywgaG9zdCwgc3Rk aW4sIHN0ZG91dCwgc3RkZXJyKQogICAgIGVsc2U6CiAgICAgICAgIGRydCA9IE1vY2tEUlQob3B0 aW9ucywgYXJncywgaG9zdCwgc3RkaW4sIHN0ZG91dCwgc3RkZXJyKQogICAgIHJldHVybiBkcnQu cnVuKCkKQEAgLTE1MSwxNiArMTUxLDE1IEBAIGRlZiBwYXJzZV9vcHRpb25zKGFyZ3YpOgogCiAg ICAgcGl4ZWxfdGVzdHMgPSBGYWxzZQogICAgIHBpeGVsX3BhdGggPSBOb25lCi0gICAgY2hyb21p dW0gPSBGYWxzZQotICAgIGlmIHBsYXRmb3JtLnN0YXJ0c3dpdGgoJ2Nocm9taXVtJyk6Ci0gICAg ICAgIGNocm9taXVtID0gVHJ1ZQorICAgIHRlc3Rfc2hlbGwgPSAnLS10ZXN0LXNoZWxsJyBpbiBh cmd2CisgICAgaWYgdGVzdF9zaGVsbDoKICAgICAgICAgZm9yIGFyZyBpbiBhcmd2OgogICAgICAg ICAgICAgaWYgYXJnLnN0YXJ0c3dpdGgoJy0tcGl4ZWwtdGVzdHMnKToKICAgICAgICAgICAgICAg ICBwaXhlbF90ZXN0cyA9IFRydWUKICAgICAgICAgICAgICAgICBwaXhlbF9wYXRoID0gYXJnW2xl bignLS1waXhlbC10ZXN0cz0nKTpdCiAgICAgZWxzZToKICAgICAgICAgcGl4ZWxfdGVzdHMgPSAn LS1waXhlbC10ZXN0cycgaW4gYXJndgotICAgIG9wdGlvbnMgPSBNb2NrT3B0aW9ucyhjaHJvbWl1 bT1jaHJvbWl1bSwgcGxhdGZvcm09cGxhdGZvcm0sIHBpeGVsX3Rlc3RzPXBpeGVsX3Rlc3RzLCBw aXhlbF9wYXRoPXBpeGVsX3BhdGgpCisgICAgb3B0aW9ucyA9IG9wdHBhcnNlLlZhbHVlcyh7J3Rl c3Rfc2hlbGwnOiB0ZXN0X3NoZWxsLCAncGxhdGZvcm0nOiBwbGF0Zm9ybSwgJ3BpeGVsX3Rlc3Rz JzogcGl4ZWxfdGVzdHMsICdwaXhlbF9wYXRoJzogcGl4ZWxfcGF0aH0pCiAgICAgcmV0dXJuIChv cHRpb25zLCBhcmd2KQogCiAKQEAgLTI1NSw3ICsyNTQsNyBAQCBjbGFzcyBNb2NrRFJUKG9iamVj dCk6CiAgICAgICAgIHNlbGYuX3N0ZGVyci5mbHVzaCgpCiAKIAotY2xhc3MgTW9ja0Nocm9taXVt RFJUKE1vY2tEUlQpOgorY2xhc3MgTW9ja1Rlc3RTaGVsbChNb2NrRFJUKToKICAgICBkZWYgaW5w dXRfZnJvbV9saW5lKHNlbGYsIGxpbmUpOgogICAgICAgICB2YWxzID0gbGluZS5zdHJpcCgpLnNw bGl0KCkKICAgICAgICAgaWYgbGVuKHZhbHMpID09IDM6CkBAIC0yNzIsNyArMjcxLDcgQEAgY2xh c3MgTW9ja0Nocm9taXVtRFJUKE1vY2tEUlQpOgogICAgICAgICBvcmlnaW5hbF90ZXN0X25hbWUg PSB0ZXN0X2lucHV0LnRlc3RfbmFtZQogICAgICAgICBpZiAnLS1lbmFibGUtYWNjZWxlcmF0ZWQt MmQtY2FudmFzJyBpbiBzZWxmLl9hcmdzIGFuZCAnY2FudmFzJyBpbiB0ZXN0X2lucHV0LnRlc3Rf bmFtZToKICAgICAgICAgICAgIHRlc3RfaW5wdXQudGVzdF9uYW1lID0gJ3BsYXRmb3JtL2Nocm9t aXVtL3ZpcnR1YWwvZ3B1LycgKyB0ZXN0X2lucHV0LnRlc3RfbmFtZQotICAgICAgICBvdXRwdXQg PSBzdXBlcihNb2NrQ2hyb21pdW1EUlQsIHNlbGYpLm91dHB1dF9mb3JfdGVzdCh0ZXN0X2lucHV0 LCBpc19yZWZ0ZXN0KQorICAgICAgICBvdXRwdXQgPSBzdXBlcihNb2NrVGVzdFNoZWxsLCBzZWxm KS5vdXRwdXRfZm9yX3Rlc3QodGVzdF9pbnB1dCwgaXNfcmVmdGVzdCkKICAgICAgICAgdGVzdF9p bnB1dC50ZXN0X25hbWUgPSBvcmlnaW5hbF90ZXN0X25hbWUKICAgICAgICAgcmV0dXJuIG91dHB1 dAogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L21vY2tfZHJ0X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9tb2NrX2RydF91bml0dGVzdC5weQppbmRleCA1NzBhOWU0YWQ2NzU0YTcxZTk0MjZk M2E0MDE3NGVlY2UxNmQ0ODA2Li4xNjU0ZTFjNDgxNzAwYTQwOGRjZWI3NTRjMjk2ODAyYTQ2ZWVj YWUxIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L21vY2tfZHJ0X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvbW9ja19kcnRfdW5pdHRlc3QucHkKQEAgLTE1MCw3ICsxNTAsNyBAQCBjbGFz cyBNb2NrRFJUVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICMgV2UgdXNlIHRoZSBT dHJpbmdJTy5idWZsaXN0IGhlcmUgaW5zdGVhZCBvZiBnZXR2YWx1ZSgpIGJlY2F1c2UKICAgICAg ICAgIyB0aGUgU3RyaW5nSU8gbWlnaHQgYmUgYSBtaXggb2YgdW5pY29kZS9hc2NpaSBhbmQgOC1i aXQgc3RyaW5ncy4KICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzdGRvdXQuYnVmbGlzdCwgZHJ0 X291dHB1dCkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzdGRlcnIuZ2V0dmFsdWUoKSwgJycg aWYgb3B0aW9ucy5jaHJvbWl1bSBlbHNlICcjRU9GXG4nKQorICAgICAgICBzZWxmLmFzc2VydEVx dWFsKHN0ZGVyci5nZXR2YWx1ZSgpLCAnJyBpZiBvcHRpb25zLnRlc3Rfc2hlbGwgZWxzZSAnI0VP RlxuJykKIAogICAgIGRlZiB0ZXN0X21haW4oc2VsZik6CiAgICAgICAgIGhvc3QgPSBNb2NrU3lz dGVtSG9zdCgpCkBAIC0yMDEsMjIgKzIwMSwyMSBAQCBjbGFzcyBNb2NrRFJUVGVzdCh1bml0dGVz dC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0VGVzdCgncGFzc2VzL21pc21hdGNoLmh0 bWwnLCBUcnVlLCBleHBlY3RlZF9jaGVja3N1bT0nbW9jay1jaGVja3N1bScsIGV4cGVjdGVkX3Rl eHQ9J3JlZmVyZW5jZSB0ZXh0XG4nKQogCiAKLQotY2xhc3MgTW9ja0Nocm9taXVtRFJUVGVzdChN b2NrRFJUVGVzdCk6CitjbGFzcyBNb2NrVGVzdFNoZWxsVGVzdChNb2NrRFJUVGVzdCk6CiAgICAg ZGVmIGV4dHJhX2FyZ3Moc2VsZiwgcGl4ZWxfdGVzdHMpOgogICAgICAgICBpZiBwaXhlbF90ZXN0 czoKICAgICAgICAgICAgIHJldHVybiBbJy0tcGl4ZWwtdGVzdHM9L3RtcC9wbmdfcmVzdWx0MC5w bmcnXQogICAgICAgICByZXR1cm4gW10KIAogICAgIGRlZiBtYWtlX2RydChzZWxmLCBvcHRpb25z LCBhcmdzLCBob3N0LCBzdGRpbiwgc3Rkb3V0LCBzdGRlcnIpOgotICAgICAgICBvcHRpb25zLmNo cm9taXVtID0gVHJ1ZQorICAgICAgICBvcHRpb25zLnRlc3Rfc2hlbGwgPSBUcnVlCiAKICAgICAg ICAgIyBXZSBoYXZlIHRvIHNldCB0aGVzZSBieSBoYW5kIGJlY2F1c2UgLS1wbGF0Zm9ybSB0ZXN0 IHdvbid0IHRyaWdnZXIKICAgICAgICAgIyB0aGUgQ2hyb21pdW0gY29kZSBwYXRocy4KICAgICAg ICAgb3B0aW9ucy5waXhlbF9wYXRoID0gJy90bXAvcG5nX3Jlc3VsdDAucG5nJwogICAgICAgICBv cHRpb25zLnBpeGVsX3Rlc3RzID0gVHJ1ZQogCi0gICAgICAgIHJldHVybiBtb2NrX2RydC5Nb2Nr Q2hyb21pdW1EUlQob3B0aW9ucywgYXJncywgaG9zdCwgc3RkaW4sIHN0ZG91dCwgc3RkZXJyKQor ICAgICAgICByZXR1cm4gbW9ja19kcnQuTW9ja1Rlc3RTaGVsbChvcHRpb25zLCBhcmdzLCBob3N0 LCBzdGRpbiwgc3Rkb3V0LCBzdGRlcnIpCiAKICAgICBkZWYgaW5wdXRfbGluZShzZWxmLCBwb3J0 LCB0ZXN0X25hbWUsIGNoZWNrc3VtPU5vbmUpOgogICAgICAgICB1cmwgPSBwb3J0LmNyZWF0ZV9k cml2ZXIoMCkudGVzdF90b191cmkodGVzdF9uYW1lKQpAQCAtMjUxLDEwICsyNTAsMTAgQEAgY2xh c3MgTW9ja0Nocm9taXVtRFJUVGVzdChNb2NrRFJUVGVzdCk6CiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWxzKGhvc3QuZmlsZXN5c3RlbS53cml0dGVuX2ZpbGVzLAogICAgICAgICAgICAgeycvdG1w L3BuZ19yZXN1bHQwLnBuZyc6ICdpbWFnZV9jaGVja3N1bVx4OGEtcG5ndEVYdGNoZWNrc3VtXHgw MGltYWdlX2NoZWNrc3VtLWNoZWNrc3VtJ30pCiAKLSAgICBkZWYgdGVzdF9jaHJvbWl1bV9wYXJz ZV9vcHRpb25zKHNlbGYpOgotICAgICAgICBvcHRpb25zLCBhcmdzID0gbW9ja19kcnQucGFyc2Vf b3B0aW9ucyhbJy0tcGxhdGZvcm0nLCAnY2hyb21pdW0tbWFjJywKKyAgICBkZWYgdGVzdF90ZXN0 X3NoZWxsX3BhcnNlX29wdGlvbnMoc2VsZik6CisgICAgICAgIG9wdGlvbnMsIGFyZ3MgPSBtb2Nr X2RydC5wYXJzZV9vcHRpb25zKFsnLS1wbGF0Zm9ybScsICdjaHJvbWl1bS1tYWMnLCAnLS10ZXN0 LXNoZWxsJywKICAgICAgICAgICAgICctLXBpeGVsLXRlc3RzPS90bXAvcG5nX3Jlc3VsdDAucG5n J10pCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShvcHRpb25zLmNocm9taXVtKQorICAgICAgICBz ZWxmLmFzc2VydFRydWUob3B0aW9ucy50ZXN0X3NoZWxsKQogICAgICAgICBzZWxmLmFzc2VydFRy dWUob3B0aW9ucy5waXhlbF90ZXN0cykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMob3B0aW9u cy5waXhlbF9wYXRoLCAnL3RtcC9wbmdfcmVzdWx0MC5wbmcnKQogCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0 aW9udGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJr aXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5CmluZGV4IDI4ZTFhMTQ1MTBiZGQ0OGI1Yjc3NGQ5 ZjdkNzVhY2MwYzBlNjdhMDYuLjA0YmM1ZTUwMDQ5MjBlYmQ3ZTM3NDgzMTU0MTBkNTA2NTliYTA2 OGYgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93 ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5CkBAIC00 Niw2ICs0Niw3IEBAIGltcG9ydCB1bml0dGVzdAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVt IGltcG9ydCBvdXRwdXRjYXB0dXJlLCBwYXRoCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0u Y3Jhc2hsb2dzX3VuaXR0ZXN0IGltcG9ydCBtYWtlX21vY2tfY3Jhc2hfcmVwb3J0X2Rhcndpbgog ZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLnN5c3RlbWhvc3QgaW1wb3J0IFN5c3RlbUhvc3QK K2Zyb20gd2Via2l0cHkuY29tbW9uLmhvc3QgaW1wb3J0IEhvc3QKIGZyb20gd2Via2l0cHkuY29t bW9uLmhvc3RfbW9jayBpbXBvcnQgTW9ja0hvc3QKIAogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVz dHMgaW1wb3J0IHBvcnQKQEAgLTEwMTEsNSArMTAxMiwyMSBAQCBjbGFzcyBSZWJhc2VsaW5lVGVz dCh1bml0dGVzdC5UZXN0Q2FzZSwgU3RyZWFtVGVzdGluZ01peGluKToKICAgICAgICAgICAgICJw bGF0Zm9ybS90ZXN0LW1hYy1sZW9wYXJkL2ZhaWx1cmVzL2V4cGVjdGVkL21pc3NpbmdfaW1hZ2Ui LCBbIi50eHQiLCAiLnBuZyJdLCBlcnIpCiAKIAorY2xhc3MgUG9ydFRlc3QodW5pdHRlc3QuVGVz dENhc2UpOgorICAgIGRlZiBhc3NlcnRfbW9ja19wb3J0X3dvcmtzKHNlbGYsIHBvcnRfbmFtZSwg YXJncz1bXSk6CisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwYXNzaW5nX3J1bihhcmdzICsgWyct LXBsYXRmb3JtJywgJ21vY2stJyArIHBvcnRfbmFtZSwgJ2Zhc3QvaGFybmVzcy9yZXN1bHRzLmh0 bWwnXSwgdGVzdHNfaW5jbHVkZWQ9VHJ1ZSwgaG9zdD1Ib3N0KCkpKQorCisgICAgZGVmIHRlc3Rf Y2hyb21pdW1fbWFjX2xpb24oc2VsZik6CisgICAgICAgIHNlbGYuYXNzZXJ0X21vY2tfcG9ydF93 b3JrcygnY2hyb21pdW0tbWFjLWxpb24nKQorCisgICAgZGVmIHRlc3RfY2hyb21pdW1fbWFjX2xp b25faW5fdGVzdF9zaGVsbF9tb2RlKHNlbGYpOgorICAgICAgICBzZWxmLmFzc2VydF9tb2NrX3Bv cnRfd29ya3MoJ2Nocm9taXVtLW1hYy1saW9uJywgYXJncz1bJy0tYWRkaXRpb25hbC1kcnQtZmxh Zz0tLXRlc3Qtc2hlbGwnXSkKKworICAgIGRlZiB0ZXN0X3F0X2xpbnV4KHNlbGYpOgorICAgICAg ICBzZWxmLmFzc2VydF9tb2NrX3BvcnRfd29ya3MoJ3F0LWxpbnV4JykKKworICAgIGRlZiB0ZXN0 X21hY19saW9uKHNlbGYpOgorICAgICAgICBzZWxmLmFzc2VydF9tb2NrX3BvcnRfd29ya3MoJ21h Yy1saW9uJykKKwogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICB1bml0dGVzdC5tYWlu KCkK