74551 2011-12-14 15:51:07 -0800 webkitpy: cleanup prior to systemhostifying the layout_test/port* classes 2011-12-15 19:02:43 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 74138 74556 74562 74566 1 dpranke dpranke abarth eric ojan tony webkit.review.bot oldest_to_newest 521385 0 dpranke 2011-12-14 15:51:07 -0800 webkitpy: cleanup prior to systemhostifying the layout_test/port* classes 521393 1 119312 dpranke 2011-12-14 15:53:57 -0800 Created attachment 119312 Patch 521423 2 119312 abarth 2011-12-14 16:13:43 -0800 Comment on attachment 119312 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119312&action=review > Tools/Scripts/webkitpy/layout_tests/controllers/manager_worker_broker.py:57 > +from webkitpy.common.host_mock import MockHost Generally speaking, production code shouldn't import testing code, including mocks. > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:40 > +from webkitpy.common.host_mock import MockHost Same here. 522089 3 abarth 2011-12-15 11:15:10 -0800 Dirk, any thoughts on Comment #2? I noticed you changed the review flag from - to ?, which I took to mean you disagreed with my review, but I didn't see a comment explaining your point of view. 522127 4 dpranke 2011-12-15 12:10:34 -0800 (In reply to comment #3) > Dirk, any thoughts on Comment #2? I noticed you changed the review flag from - to ?, which I took to mean you disagreed with my review, but I didn't see a comment explaining your point of view. Oh, that's bizarre. I could have sworn I submitted a comment before setting this back to ?. At any rate, my comment was something along this lines of ... NRWT was designed intentionally to be able to run --platform test from the command line (to make debugging easier); in order to do that, we need to be able to create a mock host instead of a real host in both the main code and in manager_worker_broker where we're launching subprocesses. We were already doing this in the code; it's just that we were doing this in port/test.py by creating a MockHost inside the Port class. All of this refactoring will make it so that the port classes can't create Hosts (they shouldn't be able to, anyway), so I needed to fix this properly. I'm open to other ways of getting this functionality, but the only way I can think of is to create a separate test-run-webkit-tests that duplicates this main, and that seems like a silly overhead. That said, I don't want this particular issue to sideline the rest of this patch, so I can delete those four lines from this patch and split it out into a separate issue if that'll clear up the rest of this. 522149 5 abarth 2011-12-15 12:42:14 -0800 > That said, I don't want this particular issue to sideline the rest of this patch, so I can delete those four lines from this patch and split it out into a separate issue if that'll clear up the rest of this. That sounds like a good way to proceed. 522203 6 119492 dpranke 2011-12-15 13:32:40 -0800 Created attachment 119492 remove MockHost() calls from run_webkit_tests.py for now 522214 7 119492 eric 2011-12-15 13:45:50 -0800 Comment on attachment 119492 remove MockHost() calls from run_webkit_tests.py for now OK. 522443 8 dpranke 2011-12-15 19:02:43 -0800 Committed r103012: <http://trac.webkit.org/changeset/103012> 119312 2011-12-14 15:53:57 -0800 2011-12-15 13:32:37 -0800 Patch bug-74551-20111214155356.patch text/plain 8843 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNzI3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDliMzFmZmJiMzkwM2QzNDMxZWZjZWIzZWQwZTE5OTFh Mjk4NWM1MS4uZTNhNWY5NWIyMTJmNjcxOTRhMmM5N2VjZWM0ODBlMDA1ZmM3YTNlYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMz IEBACisyMDExLTEyLTE0ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIHdlYmtpdHB5OiBjbGVhbnVwIHByaW9yIHRvIHN5c3RlbWhvc3RpZnlpbmcgdGhlIGxh eW91dF90ZXN0L3BvcnQqIGNsYXNzZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTc0NTUxCisKKyAgICAgICAgVGhpcyBpcyBzb21lIG1pbm9yIGNsZWFu dXAgcHJpb3IgdG8gbWFraW5nIGFsbCBvZiB0aGUgaG9zdC9wb3J0CisgICAgICAgIGNoYW5nZXMg ZGVzY3JpYmVkIGluIGJ1ZyA3NDEzOC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL2hvc3RfbW9jay5weToKKyAgICAgICAgKE1vY2tIb3N0Ll9faW5pdF9fKToKKyAgICAgICAg ICAtIG1ha2Ugc3VyZSB0aGUgc2NtIG9iamVjdCBpcyBpbml0aWFsaXplZCB3aXRoIHRoZSBzYW1l IG1vY2sKKyAgICAgICAgICAgIGV4ZWN1dGl2ZSBhbmQgZmlsZXN5c3RlbSBvYmplY3RzLgorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW1fbW9jay5w eToKKyAgICAgICAgKE1vY2tGaWxlU3lzdGVtLmNsZWFyX3dyaXR0ZW5fZmlsZXMpOgorICAgICAg ICAgIC0gYWRkIGEgcm91dGluZSB0aGF0IHdpbGwgYmUgdXNlZnVsIGluIHRlc3RpbmcuCisgICAg ICAgIChNb2NrRmlsZVN5c3RlbS5tYXliZV9tYWtlX2RpcmVjdG9yeSk6CisgICAgICAgIChNb2Nr RmlsZVN5c3RlbS53cml0ZV9iaW5hcnlfZmlsZSk6CisgICAgICAgICAgLSBmaXggYnVncyB0byBt YWtlIHN1cmUgZGlyZWN0b3JpZXMgYXJlIGNyZWF0ZWQgcHJvcGVybHkuCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl93b3JrZXJfYnJv a2VyLnB5OgorICAgICAgICAoX1Byb2Nlc3MucnVuKToKKyAgICAgICAgICAtIGNyZWF0ZSBNb2Nr SG9zdCgpIHdoZXJlIG5lY2Vzc2FyeSwgYWRkIGNsYXJpZnlpbmcgY29tbWVudHMuCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tb2NrX2RydC5weToKKyAgICAg ICAgKE1vY2tEUlRQb3J0Ll9faW5pdF9fKToKKyAgICAgICAgKE1vY2tEUlQuX19pbml0X18pOgor ICAgICAgICAgIC0gY3JlYXRlIE1vY2tIb3N0KCkgd2hlcmUgbmVjZXNzYXJ5LCBhZGQgY2xhcmlm eWluZyBjb21tZW50cy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9y dW5fd2Via2l0X3Rlc3RzLnB5OgorICAgICAgICAobWFpbik6CisgICAgICAgICAgLSBjcmVhdGUg YSBNb2NrSG9zdCgpIHdoZW4gcnVubmluZyB0aGUgJ3Rlc3QnIHBvcnQuCisKIDIwMTEtMTItMTMg IFJvYmluIER1bm4gIDxyb2JpbkBhbGxkdW5uLmNvbT4KIAogICAgICAgICBbd3hdIEFkZCBhIFVS TCBhcmd1bWVudCB0byB3eFdlYlZpZXcgY29uc3RydWN0b3IuCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9ob3N0X21vY2sucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9ob3N0X21vY2sucHkKaW5kZXggZTZkNjMyNWJhNjAzMmRhYWVkZGQ2YWQ1YmQ0 MzQ1NWIyYTk4YjEzNi4uZDdkMzM2NGMzZjZmYmRlMjBmMmRjZmY0YjAyYThhM2YyODE1NWYzYSAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vaG9zdF9tb2NrLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2hvc3RfbW9jay5weQpAQCAtNDQsNyAr NDQsNyBAQCBjbGFzcyBNb2NrSG9zdChNb2NrU3lzdGVtSG9zdCk6CiAgICAgICAgIHNlbGYud2Vi ID0gTW9ja1dlYigpCiAKICAgICAgICAgc2VsZi5fY2hlY2tvdXQgPSBNb2NrQ2hlY2tvdXQoKQot ICAgICAgICBzZWxmLl9zY20gPSBNb2NrU0NNKCkKKyAgICAgICAgc2VsZi5fc2NtID0gTW9ja1ND TShmaWxlc3lzdGVtPXNlbGYuZmlsZXN5c3RlbSwgZXhlY3V0aXZlPXNlbGYuZXhlY3V0aXZlKQog ICAgICAgICAjIFZhcmlvdXMgcGllY2VzIG9mIGNvZGUgKHdyb25nbHkpIGNhbGwgZmlsZXN5c3Rl bS5jaGRpcihjaGVja291dF9yb290KS4KICAgICAgICAgIyBNYWtpbmcgdGhlIGNoZWNrb3V0X3Jv b3QgZXhpc3QgaW4gdGhlIG1vY2sgZmlsZXN5c3RlbSBtYWtlcyB0aGF0IGNoZGlyIG5vdCByYWlz ZS4KICAgICAgICAgc2VsZi5maWxlc3lzdGVtLm1heWJlX21ha2VfZGlyZWN0b3J5KHNlbGYuX3Nj bS5jaGVja291dF9yb290KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vc3lzdGVtL2ZpbGVzeXN0ZW1fbW9jay5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL3N5c3RlbS9maWxlc3lzdGVtX21vY2sucHkKaW5kZXggZDhjZGQyNTYwYTRjNzRlODcwNjk1 ZTM4MDg5ZWQzYTY2MDkyMzNiZC4uMzJmZDEwNzFhNzAwYzY3YzI4NjI1NjIzNjNhNGYwNTYwNTI0 OGIzMyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2Zp bGVzeXN0ZW1fbW9jay5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0 ZW0vZmlsZXN5c3RlbV9tb2NrLnB5CkBAIC02NCw2ICs2NCwxMCBAQCBjbGFzcyBNb2NrRmlsZVN5 c3RlbShvYmplY3QpOgogCiAgICAgc2VwID0gcHJvcGVydHkoX2dldF9zZXAsIGRvYz0icGF0aG5h bWUgc2VwYXJhdG9yIikKIAorICAgIGRlZiBjbGVhcl93cml0dGVuX2ZpbGVzKHNlbGYpOgorICAg ICAgICAjIFRoaXMgZnVuY3Rpb24gY2FuIGJlIHVzZWQgdG8gdHJhY2sgd2hhdCBpcyB3cml0dGVu IGJldHdlZW4gc3RlcHMgaW4gYSB0ZXN0LgorICAgICAgICBzZWxmLndyaXR0ZW5fZmlsZXMgPSB7 fQorCiAgICAgZGVmIF9yYWlzZV9ub3RfZm91bmQoc2VsZiwgcGF0aCk6CiAgICAgICAgIHJhaXNl IElPRXJyb3IoZXJybm8uRU5PRU5ULCBwYXRoLCBvcy5zdHJlcnJvcihlcnJuby5FTk9FTlQpKQog CkBAIC0yNDMsOCArMjQ3LDkgQEAgY2xhc3MgTW9ja0ZpbGVTeXN0ZW0ob2JqZWN0KToKIAogICAg IGRlZiBtYXliZV9tYWtlX2RpcmVjdG9yeShzZWxmLCAqcGF0aCk6CiAgICAgICAgIG5vcm1fcGF0 aCA9IHNlbGYubm9ybXBhdGgoc2VsZi5qb2luKCpwYXRoKSkKLSAgICAgICAgaWYgbm90IHNlbGYu aXNkaXIobm9ybV9wYXRoKToKKyAgICAgICAgd2hpbGUgbm9ybV9wYXRoIGFuZCBub3Qgc2VsZi5p c2Rpcihub3JtX3BhdGgpOgogICAgICAgICAgICAgc2VsZi5kaXJzLmFkZChub3JtX3BhdGgpCisg ICAgICAgICAgICBub3JtX3BhdGggPSBzZWxmLmRpcm5hbWUobm9ybV9wYXRoKQogCiAgICAgZGVm IG1vdmUoc2VsZiwgc291cmNlLCBkZXN0aW5hdGlvbik6CiAgICAgICAgIGlmIHNlbGYuZmlsZXNb c291cmNlXSBpcyBOb25lOgpAQCAtMjc1LDYgKzI4MCw3IEBAIGNsYXNzIE1vY2tGaWxlU3lzdGVt KG9iamVjdCk6CiAgICAgICAgIHJldHVybiBzZWxmLmZpbGVzW3BhdGhdCiAKICAgICBkZWYgd3Jp dGVfYmluYXJ5X2ZpbGUoc2VsZiwgcGF0aCwgY29udGVudHMpOgorICAgICAgICAjIEZJWE1FOiBz aG91bGQgdGhpcyBhc3NlcnQgaWYgZGlybmFtZShwYXRoKSBkb2Vzbid0IGV4aXN0PwogICAgICAg ICBzZWxmLmZpbGVzW3BhdGhdID0gY29udGVudHMKICAgICAgICAgc2VsZi53cml0dGVuX2ZpbGVz W3BhdGhdID0gY29udGVudHMKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl93b3JrZXJfYnJva2VyLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl93b3JrZXJf YnJva2VyLnB5CmluZGV4IDBkY2FiZWI4NWM2NGM3YWQ5M2UzN2IxM2JmNDg0MzA1ZGQ1N2M5ZjMu LjE0ZTZlZGI4ZmJiYWQ0OGExOWI0ZjFhMjhmZTkyMDE1YWI1ODU5MWIgMTAwNzU1Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfd29y a2VyX2Jyb2tlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9j b250cm9sbGVycy9tYW5hZ2VyX3dvcmtlcl9icm9rZXIucHkKQEAgLTUyLDcgKzUyLDEwIEBAIHRy eToKIGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAgICBtdWx0aXByb2Nlc3NpbmcgPSBOb25lCiAKLWZy b20gd2Via2l0cHkuY29tbW9uLmhvc3QgaW1wb3J0IEhvc3QgICMgRklYTUU6IFRoaXMgc2hvdWxk IG5vdCBiZSBuZWVkZWQhCisjIFRoZXNlIGFyZSBuZWVkZWQgd2hlbiB3b3JrZXJzIGFyZSBsYXVu Y2hlZCBpbiBuZXcgY2hpbGQgcHJvY2Vzc2VzLgorZnJvbSB3ZWJraXRweS5jb21tb24uaG9zdCBp bXBvcnQgSG9zdAorZnJvbSB3ZWJraXRweS5jb21tb24uaG9zdF9tb2NrIGltcG9ydCBNb2NrSG9z dAorCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5jb250cm9sbGVycyBpbXBvcnQgbWVzc2Fn ZV9icm9rZXIKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnZpZXdzIGltcG9ydCBwcmludGlu ZwogCkBAIC0yNTIsMTEgKzI1NSwxNiBAQCBpZiBtdWx0aXByb2Nlc3Npbmc6CiAgICAgICAgICAg ICBzZWxmLl9jbGllbnQgPSBjbGllbnQKIAogICAgICAgICBkZWYgcnVuKHNlbGYpOgotICAgICAg ICAgICAgb3B0aW9ucyA9IHNlbGYuX29wdGlvbnMKLSAgICAgICAgICAgICMgRklYTUU6IFRoaXMg c2hvdWxkIGdldCB0aGUgSG9zdCBmcm9tIHRoZSBvd25lciBvZiB0aGlzIG9iamVjdAotICAgICAg ICAgICAgIyBzbyB0aGlzIGZ1bmN0aW9uIGNhbiBiZSBwcm9wZXJseSBtb2NrZWQhCi0gICAgICAg ICAgICBob3N0ID0gSG9zdCgpCisgICAgICAgICAgICAjIFdlIG5lZWQgdG8gY3JlYXRlIGEgbmV3 IEhvc3Qgb2JqZWN0IGhlcmUgYmVjYXVzZSB0aGlzIGlzCisgICAgICAgICAgICAjIHJ1bm5pbmcg aW4gYSBuZXcgcHJvY2VzcyBhbmQgd2UgY2FuJ3QgcmVxdWlyZSB0aGUgcGFyZW50J3MKKyAgICAg ICAgICAgICMgSG9zdCB0byBiZSBwaWNrbGVhYmxlIGFuZCBwYXNzZWQgdG8gdGhlIGNoaWxkLgor ICAgICAgICAgICAgaWYgc2VsZi5fcGxhdGZvcm1fbmFtZS5zdGFydHN3aXRoKCd0ZXN0Jyk6Cisg ICAgICAgICAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkKKyAgICAgICAgICAgIGVsc2U6CisgICAg ICAgICAgICAgICAgaG9zdCA9IEhvc3QoKQogICAgICAgICAgICAgaG9zdC5faW5pdGlhbGl6ZV9z Y20oKQorCisgICAgICAgICAgICBvcHRpb25zID0gc2VsZi5fb3B0aW9ucwogICAgICAgICAgICAg cG9ydF9vYmogPSBob3N0LnBvcnRfZmFjdG9yeS5nZXQoc2VsZi5fcGxhdGZvcm1fbmFtZSwgb3B0 aW9ucykKIAogICAgICAgICAgICAgIyBUaGUgdW5peCBtdWx0aXByb2Nlc3NpbmcgaW1wbGVtZW50 YXRpb24gY2xvbmVzIHRoZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9tb2NrX2RydC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvbW9ja19kcnQucHkKaW5kZXggMWJhNWE2ZDk0NmU4OTkxMzdkMzdhZmFlNGE2 ZTdhZWMzNGMzM2RmOS4uZTQ1ZmI5MjM0Mzg3MWZlMTM2YWVjMDA0ZWRkNTQ2ZDJmMjM2MGQyMiAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tb2Nr X2RydC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21v Y2tfZHJ0LnB5CkBAIC0zMCwxNiArMzAsMjEgQEAKICIiIgogVGhpcyBpcyBhbiBpbXBsZW1lbnRh dGlvbiBvZiB0aGUgUG9ydCBpbnRlcmZhY2UgdGhhdCBvdmVycmlkZXMgb3RoZXIKIHBvcnRzIGFu ZCBjaGFuZ2VzIHRoZSBEcml2ZXIgYmluYXJ5IHRvICJNb2NrRFJUIi4KKworVGhlIE1vY2tEUlQg b2JqZWN0cyBlbXVsYXRlIHdoYXQgYSByZWFsIERSVCB3b3VsZCBkby4gSW4gcGFydGljdWxhciwg dGhleQorcmV0dXJuIHRoZSBvdXRwdXQgYSByZWFsIERSVCB3b3VsZCByZXR1cm4gZm9yIGEgZ2l2 ZW4gdGVzdCwgYXNzdW1pbmcgdGhhdAordGVzdCBhY3R1YWxseSBwYXNzZXMgKGV4Y2VwdCBmb3Ig cmVmdGVzdHMsIHdoaWNoIGN1cnJlbnRseSBjYXVzZSB0aGUKK01vY2tEUlQgdG8gY3Jhc2gpLgog IiIiCiAKIGltcG9ydCBiYXNlNjQKIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgc3lzCiAKLWZyb20g d2Via2l0cHkuY29tbW9uLmhvc3QgaW1wb3J0IEhvc3QKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5 c3RlbS5zeXN0ZW1ob3N0IGltcG9ydCBTeXN0ZW1Ib3N0Citmcm9tIHdlYmtpdHB5LmxheW91dF90 ZXN0cy5wb3J0LmZhY3RvcnkgaW1wb3J0IFBvcnRGYWN0b3J5CiBmcm9tIHdlYmtpdHB5LnRvb2wu bW9ja3Rvb2wgaW1wb3J0IE1vY2tPcHRpb25zCiAKLQogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2Vy KF9fbmFtZV9fKQogCiAKQEAgLTUxLDcgKzU2LDcgQEAgY2xhc3MgTW9ja0RSVFBvcnQob2JqZWN0 KToKICAgICAgICAgaWYgJ3BvcnRfbmFtZScgaW4ga3dhcmdzOgogICAgICAgICAgICAga3dhcmdz Wydwb3J0X25hbWUnXSA9IGt3YXJnc1sncG9ydF9uYW1lJ11bbGVuKHByZWZpeCk6XQogICAgICAg ICBzZWxmLl9ob3N0ID0gaG9zdAotICAgICAgICBzZWxmLl9fZGVsZWdhdGUgPSBob3N0LnBvcnRf ZmFjdG9yeS5nZXQoKiprd2FyZ3MpCisgICAgICAgIHNlbGYuX19kZWxlZ2F0ZSA9IFBvcnRGYWN0 b3J5KGhvc3QpLmdldCgqKmt3YXJncykKICAgICAgICAgc2VsZi5fX3JlYWxfbmFtZSA9IHByZWZp eCArIHNlbGYuX19kZWxlZ2F0ZS5uYW1lKCkKIAogICAgIGRlZiByZWFsX25hbWUoc2VsZik6CkBA IC0xODAsNyArMTg1LDcgQEAgY2xhc3MgTW9ja0RSVChvYmplY3QpOgogICAgICAgICBwb3J0X25h bWUgPSBOb25lCiAgICAgICAgIGlmIG9wdGlvbnMucGxhdGZvcm06CiAgICAgICAgICAgICBwb3J0 X25hbWUgPSBvcHRpb25zLnBsYXRmb3JtCi0gICAgICAgIHNlbGYuX3BvcnQgPSBzZWxmLl9ob3N0 LnBvcnRfZmFjdG9yeS5nZXQocG9ydF9uYW1lLCBvcHRpb25zPW9wdGlvbnMpCisgICAgICAgIHNl bGYuX3BvcnQgPSBQb3J0RmFjdG9yeShob3N0KS5nZXQocG9ydF9uYW1lPXBvcnRfbmFtZSwgb3B0 aW9ucz1vcHRpb25zKQogCiAgICAgZGVmIHJ1bihzZWxmKToKICAgICAgICAgd2hpbGUgVHJ1ZToK QEAgLTI3Nyw3ICsyODIsNiBAQCBjbGFzcyBNb2NrQ2hyb21pdW1EUlQoTW9ja0RSVCk6CiAKIAog aWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKLSAgICAjIEZJWE1FOiBXaHkgaXMgdGhpcyB1c2lu ZyBhIHJlYWwgSG9zdCBvYmplY3QgaW5zdGVhZCBvZiBNb2NrSG9zdD8KLSAgICBob3N0ID0gSG9z dCgpCi0gICAgaG9zdC5faW5pdGlhbGl6ZV9zY20oKQotICAgIHN5cy5leGl0KG1haW4oc3lzLmFy Z3ZbMTpdLCBob3N0LCBzeXMuc3RkaW4sIHN5cy5zdGRvdXQsIHN5cy5zdGRlcnIpKQorICAgICMg Tm90ZSB0aGF0IHRoZSBNb2NrIGluIE1vY2tEUlQgcmVmZXJzIHRvIHRoZSBmYWN0IHRoYXQgaXQg aXMgZW11bGF0aW5nIGEKKyAgICAjIHJlYWwgRFJULCBhbmQgYXMgc3VjaCwgaXQgbmVlZHMgYWNj ZXNzIHRvIGEgcmVhbCBTeXN0ZW1Ib3N0LCBub3QgYSBNb2NrU3lzdGVtSG9zdC4KKyAgICBzeXMu ZXhpdChtYWluKHN5cy5hcmd2WzE6XSwgU3lzdGVtSG9zdCgpLCBzeXMuc3RkaW4sIHN5cy5zdGRv dXQsIHN5cy5zdGRlcnIpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKaW5kZXggN2U2OWY1MWJhNThlYzQ2MjRiNTA1 ZjMxOWExZDgyMTk3ZGI1ODE2Ny4uZjQ4NGU1ZWZmZDdkODMwNmRiNDQzNmVkMmI5MDA3OGU3M2Fm OWE0OCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVu X3dlYmtpdF90ZXN0cy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzLnB5CkBAIC0zNyw2ICszNyw3IEBAIGltcG9ydCBzaWduYWwKIGlt cG9ydCBzeXMKIAogZnJvbSB3ZWJraXRweS5jb21tb24uaG9zdCBpbXBvcnQgSG9zdAorZnJvbSB3 ZWJraXRweS5jb21tb24uaG9zdF9tb2NrIGltcG9ydCBNb2NrSG9zdAogZnJvbSB3ZWJraXRweS5s YXlvdXRfdGVzdHMuY29udHJvbGxlcnMubWFuYWdlciBpbXBvcnQgTWFuYWdlciwgV29ya2VyRXhj ZXB0aW9uCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy52aWV3cyBpbXBvcnQgcHJpbnRpbmcK IApAQCAtNDEyLDcgKzQxMywxMCBAQCBkZWYgcGFyc2VfYXJncyhhcmdzPU5vbmUpOgogCiBkZWYg bWFpbigpOgogICAgIG9wdGlvbnMsIGFyZ3MgPSBwYXJzZV9hcmdzKCkKLSAgICBob3N0ID0gSG9z dCgpCisgICAgaWYgb3B0aW9ucy5wbGF0Zm9ybS5zdGFydHN3aXRoKCd0ZXN0Jyk6CisgICAgICAg IGhvc3QgPSBNb2NrSG9zdCgpCisgICAgZWxzZToKKyAgICAgICAgaG9zdCA9IEhvc3QoKQogICAg IGhvc3QuX2luaXRpYWxpemVfc2NtKCkKICAgICBwb3J0ID0gaG9zdC5wb3J0X2ZhY3RvcnkuZ2V0 KG9wdGlvbnMucGxhdGZvcm0sIG9wdGlvbnMpCiAgICAgcmV0dXJuIHJ1bihwb3J0LCBvcHRpb25z LCBhcmdzKQo= 119492 2011-12-15 13:32:40 -0800 2011-12-15 13:45:50 -0800 remove MockHost() calls from run_webkit_tests.py for now bug-74551-20111215133239.patch text/plain 7481 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNzI3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDliMzFmZmJiMzkwM2QzNDMxZWZjZWIzZWQwZTE5OTFh Mjk4NWM1MS4uYmNiNmJmMDBmOGNmM2QwMDZiZjM3ODMyOTZhYzQ5MzBkM2M4MGIxNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMw IEBACisyMDExLTEyLTE0ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIHdlYmtpdHB5OiBjbGVhbnVwIHByaW9yIHRvIHN5c3RlbWhvc3RpZnlpbmcgdGhlIGxh eW91dF90ZXN0L3BvcnQqIGNsYXNzZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTc0NTUxCisKKyAgICAgICAgVGhpcyBpcyBzb21lIG1pbm9yIGNsZWFu dXAgcHJpb3IgdG8gbWFraW5nIGFsbCBvZiB0aGUgaG9zdC9wb3J0CisgICAgICAgIGNoYW5nZXMg ZGVzY3JpYmVkIGluIGJ1ZyA3NDEzOC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL2hvc3RfbW9jay5weToKKyAgICAgICAgKE1vY2tIb3N0Ll9faW5pdF9fKToKKyAgICAgICAg ICAtIG1ha2Ugc3VyZSB0aGUgc2NtIG9iamVjdCBpcyBpbml0aWFsaXplZCB3aXRoIHRoZSBzYW1l IG1vY2sKKyAgICAgICAgICAgIGV4ZWN1dGl2ZSBhbmQgZmlsZXN5c3RlbSBvYmplY3RzLgorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW1fbW9jay5w eToKKyAgICAgICAgKE1vY2tGaWxlU3lzdGVtLmNsZWFyX3dyaXR0ZW5fZmlsZXMpOgorICAgICAg ICAgIC0gYWRkIGEgcm91dGluZSB0aGF0IHdpbGwgYmUgdXNlZnVsIGluIHRlc3RpbmcuCisgICAg ICAgIChNb2NrRmlsZVN5c3RlbS5tYXliZV9tYWtlX2RpcmVjdG9yeSk6CisgICAgICAgIChNb2Nr RmlsZVN5c3RlbS53cml0ZV9iaW5hcnlfZmlsZSk6CisgICAgICAgICAgLSBmaXggYnVncyB0byBt YWtlIHN1cmUgZGlyZWN0b3JpZXMgYXJlIGNyZWF0ZWQgcHJvcGVybHkuCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl93b3JrZXJfYnJv a2VyLnB5OgorICAgICAgICAoX1Byb2Nlc3MucnVuKToKKyAgICAgICAgICAtIGFkZCBjbGFyaWZ5 aW5nIGNvbW1lbnRzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvbW9ja19kcnQucHk6CisgICAgICAgIChNb2NrRFJUUG9ydC5fX2luaXRfXyk6CisgICAgICAg IChNb2NrRFJULl9faW5pdF9fKToKKyAgICAgICAgICAtIGFkZCBjbGFyaWZ5aW5nIGNvbW1lbnRz LgorCiAyMDExLTEyLTEzICBSb2JpbiBEdW5uICA8cm9iaW5AYWxsZHVubi5jb20+CiAKICAgICAg ICAgW3d4XSBBZGQgYSBVUkwgYXJndW1lbnQgdG8gd3hXZWJWaWV3IGNvbnN0cnVjdG9yLgpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vaG9zdF9tb2NrLnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vaG9zdF9tb2NrLnB5CmluZGV4IGU2ZDYzMjViYTYw MzJkYWFlZGRkNmFkNWJkNDM0NTViMmE5OGIxMzYuLmQ3ZDMzNjRjM2Y2ZmJkZTIwZjJkY2ZmNGIw MmE4YTNmMjgxNTVmM2EgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L2hvc3RfbW9jay5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9ob3N0X21v Y2sucHkKQEAgLTQ0LDcgKzQ0LDcgQEAgY2xhc3MgTW9ja0hvc3QoTW9ja1N5c3RlbUhvc3QpOgog ICAgICAgICBzZWxmLndlYiA9IE1vY2tXZWIoKQogCiAgICAgICAgIHNlbGYuX2NoZWNrb3V0ID0g TW9ja0NoZWNrb3V0KCkKLSAgICAgICAgc2VsZi5fc2NtID0gTW9ja1NDTSgpCisgICAgICAgIHNl bGYuX3NjbSA9IE1vY2tTQ00oZmlsZXN5c3RlbT1zZWxmLmZpbGVzeXN0ZW0sIGV4ZWN1dGl2ZT1z ZWxmLmV4ZWN1dGl2ZSkKICAgICAgICAgIyBWYXJpb3VzIHBpZWNlcyBvZiBjb2RlICh3cm9uZ2x5 KSBjYWxsIGZpbGVzeXN0ZW0uY2hkaXIoY2hlY2tvdXRfcm9vdCkuCiAgICAgICAgICMgTWFraW5n IHRoZSBjaGVja291dF9yb290IGV4aXN0IGluIHRoZSBtb2NrIGZpbGVzeXN0ZW0gbWFrZXMgdGhh dCBjaGRpciBub3QgcmFpc2UuCiAgICAgICAgIHNlbGYuZmlsZXN5c3RlbS5tYXliZV9tYWtlX2Rp cmVjdG9yeShzZWxmLl9zY20uY2hlY2tvdXRfcm9vdCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtX21vY2sucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbV9tb2NrLnB5CmluZGV4IGQ4Y2Rk MjU2MGE0Yzc0ZTg3MDY5NWUzODA4OWVkM2E2NjA5MjMzYmQuLjMyZmQxMDcxYTcwMGM2N2MyODYy NTYyMzYzYTRmMDU2MDUyNDhiMzMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL3N5c3RlbS9maWxlc3lzdGVtX21vY2sucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW1fbW9jay5weQpAQCAtNjQsNiArNjQsMTAgQEAg Y2xhc3MgTW9ja0ZpbGVTeXN0ZW0ob2JqZWN0KToKIAogICAgIHNlcCA9IHByb3BlcnR5KF9nZXRf c2VwLCBkb2M9InBhdGhuYW1lIHNlcGFyYXRvciIpCiAKKyAgICBkZWYgY2xlYXJfd3JpdHRlbl9m aWxlcyhzZWxmKToKKyAgICAgICAgIyBUaGlzIGZ1bmN0aW9uIGNhbiBiZSB1c2VkIHRvIHRyYWNr IHdoYXQgaXMgd3JpdHRlbiBiZXR3ZWVuIHN0ZXBzIGluIGEgdGVzdC4KKyAgICAgICAgc2VsZi53 cml0dGVuX2ZpbGVzID0ge30KKwogICAgIGRlZiBfcmFpc2Vfbm90X2ZvdW5kKHNlbGYsIHBhdGgp OgogICAgICAgICByYWlzZSBJT0Vycm9yKGVycm5vLkVOT0VOVCwgcGF0aCwgb3Muc3RyZXJyb3Io ZXJybm8uRU5PRU5UKSkKIApAQCAtMjQzLDggKzI0Nyw5IEBAIGNsYXNzIE1vY2tGaWxlU3lzdGVt KG9iamVjdCk6CiAKICAgICBkZWYgbWF5YmVfbWFrZV9kaXJlY3Rvcnkoc2VsZiwgKnBhdGgpOgog ICAgICAgICBub3JtX3BhdGggPSBzZWxmLm5vcm1wYXRoKHNlbGYuam9pbigqcGF0aCkpCi0gICAg ICAgIGlmIG5vdCBzZWxmLmlzZGlyKG5vcm1fcGF0aCk6CisgICAgICAgIHdoaWxlIG5vcm1fcGF0 aCBhbmQgbm90IHNlbGYuaXNkaXIobm9ybV9wYXRoKToKICAgICAgICAgICAgIHNlbGYuZGlycy5h ZGQobm9ybV9wYXRoKQorICAgICAgICAgICAgbm9ybV9wYXRoID0gc2VsZi5kaXJuYW1lKG5vcm1f cGF0aCkKIAogICAgIGRlZiBtb3ZlKHNlbGYsIHNvdXJjZSwgZGVzdGluYXRpb24pOgogICAgICAg ICBpZiBzZWxmLmZpbGVzW3NvdXJjZV0gaXMgTm9uZToKQEAgLTI3NSw2ICsyODAsNyBAQCBjbGFz cyBNb2NrRmlsZVN5c3RlbShvYmplY3QpOgogICAgICAgICByZXR1cm4gc2VsZi5maWxlc1twYXRo XQogCiAgICAgZGVmIHdyaXRlX2JpbmFyeV9maWxlKHNlbGYsIHBhdGgsIGNvbnRlbnRzKToKKyAg ICAgICAgIyBGSVhNRTogc2hvdWxkIHRoaXMgYXNzZXJ0IGlmIGRpcm5hbWUocGF0aCkgZG9lc24n dCBleGlzdD8KICAgICAgICAgc2VsZi5maWxlc1twYXRoXSA9IGNvbnRlbnRzCiAgICAgICAgIHNl bGYud3JpdHRlbl9maWxlc1twYXRoXSA9IGNvbnRlbnRzCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfd29ya2VyX2Jy b2tlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJz L21hbmFnZXJfd29ya2VyX2Jyb2tlci5weQppbmRleCAwZGNhYmViODVjNjRjN2FkOTNlMzdiMTNi ZjQ4NDMwNWRkNTdjOWYzLi4wYTRmMmQzMTM3NTkzYWJmYjRiZDZmZGQ4YWFlMmQxMGYzN2M0Yzdm IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9s bGVycy9tYW5hZ2VyX3dvcmtlcl9icm9rZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl93b3JrZXJfYnJva2VyLnB5CkBAIC01 Miw3ICs1Miw5IEBAIHRyeToKIGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAgICBtdWx0aXByb2Nlc3Np bmcgPSBOb25lCiAKLWZyb20gd2Via2l0cHkuY29tbW9uLmhvc3QgaW1wb3J0IEhvc3QgICMgRklY TUU6IFRoaXMgc2hvdWxkIG5vdCBiZSBuZWVkZWQhCisjIFRoZXNlIGFyZSBuZWVkZWQgd2hlbiB3 b3JrZXJzIGFyZSBsYXVuY2hlZCBpbiBuZXcgY2hpbGQgcHJvY2Vzc2VzLgorZnJvbSB3ZWJraXRw eS5jb21tb24uaG9zdCBpbXBvcnQgSG9zdAorCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5j b250cm9sbGVycyBpbXBvcnQgbWVzc2FnZV9icm9rZXIKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rl c3RzLnZpZXdzIGltcG9ydCBwcmludGluZwogCkBAIC0yNTIsMTEgKzI1NCwxMyBAQCBpZiBtdWx0 aXByb2Nlc3Npbmc6CiAgICAgICAgICAgICBzZWxmLl9jbGllbnQgPSBjbGllbnQKIAogICAgICAg ICBkZWYgcnVuKHNlbGYpOgotICAgICAgICAgICAgb3B0aW9ucyA9IHNlbGYuX29wdGlvbnMKLSAg ICAgICAgICAgICMgRklYTUU6IFRoaXMgc2hvdWxkIGdldCB0aGUgSG9zdCBmcm9tIHRoZSBvd25l ciBvZiB0aGlzIG9iamVjdAotICAgICAgICAgICAgIyBzbyB0aGlzIGZ1bmN0aW9uIGNhbiBiZSBw cm9wZXJseSBtb2NrZWQhCisgICAgICAgICAgICAjIFdlIG5lZWQgdG8gY3JlYXRlIGEgbmV3IEhv c3Qgb2JqZWN0IGhlcmUgYmVjYXVzZSB0aGlzIGlzCisgICAgICAgICAgICAjIHJ1bm5pbmcgaW4g YSBuZXcgcHJvY2VzcyBhbmQgd2UgY2FuJ3QgcmVxdWlyZSB0aGUgcGFyZW50J3MKKyAgICAgICAg ICAgICMgSG9zdCB0byBiZSBwaWNrbGVhYmxlIGFuZCBwYXNzZWQgdG8gdGhlIGNoaWxkLgogICAg ICAgICAgICAgaG9zdCA9IEhvc3QoKQogICAgICAgICAgICAgaG9zdC5faW5pdGlhbGl6ZV9zY20o KQorCisgICAgICAgICAgICBvcHRpb25zID0gc2VsZi5fb3B0aW9ucwogICAgICAgICAgICAgcG9y dF9vYmogPSBob3N0LnBvcnRfZmFjdG9yeS5nZXQoc2VsZi5fcGxhdGZvcm1fbmFtZSwgb3B0aW9u cykKIAogICAgICAgICAgICAgIyBUaGUgdW5peCBtdWx0aXByb2Nlc3NpbmcgaW1wbGVtZW50YXRp b24gY2xvbmVzIHRoZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9tb2NrX2RydC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvbW9ja19kcnQucHkKaW5kZXggMWJhNWE2ZDk0NmU4OTkxMzdkMzdhZmFlNGE2ZTdh ZWMzNGMzM2RmOS4uZTQ1ZmI5MjM0Mzg3MWZlMTM2YWVjMDA0ZWRkNTQ2ZDJmMjM2MGQyMiAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tb2NrX2Ry dC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21vY2tf ZHJ0LnB5CkBAIC0zMCwxNiArMzAsMjEgQEAKICIiIgogVGhpcyBpcyBhbiBpbXBsZW1lbnRhdGlv biBvZiB0aGUgUG9ydCBpbnRlcmZhY2UgdGhhdCBvdmVycmlkZXMgb3RoZXIKIHBvcnRzIGFuZCBj aGFuZ2VzIHRoZSBEcml2ZXIgYmluYXJ5IHRvICJNb2NrRFJUIi4KKworVGhlIE1vY2tEUlQgb2Jq ZWN0cyBlbXVsYXRlIHdoYXQgYSByZWFsIERSVCB3b3VsZCBkby4gSW4gcGFydGljdWxhciwgdGhl eQorcmV0dXJuIHRoZSBvdXRwdXQgYSByZWFsIERSVCB3b3VsZCByZXR1cm4gZm9yIGEgZ2l2ZW4g dGVzdCwgYXNzdW1pbmcgdGhhdAordGVzdCBhY3R1YWxseSBwYXNzZXMgKGV4Y2VwdCBmb3IgcmVm dGVzdHMsIHdoaWNoIGN1cnJlbnRseSBjYXVzZSB0aGUKK01vY2tEUlQgdG8gY3Jhc2gpLgogIiIi CiAKIGltcG9ydCBiYXNlNjQKIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgc3lzCiAKLWZyb20gd2Vi a2l0cHkuY29tbW9uLmhvc3QgaW1wb3J0IEhvc3QKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3Rl bS5zeXN0ZW1ob3N0IGltcG9ydCBTeXN0ZW1Ib3N0Citmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0 cy5wb3J0LmZhY3RvcnkgaW1wb3J0IFBvcnRGYWN0b3J5CiBmcm9tIHdlYmtpdHB5LnRvb2wubW9j a3Rvb2wgaW1wb3J0IE1vY2tPcHRpb25zCiAKLQogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9f bmFtZV9fKQogCiAKQEAgLTUxLDcgKzU2LDcgQEAgY2xhc3MgTW9ja0RSVFBvcnQob2JqZWN0KToK ICAgICAgICAgaWYgJ3BvcnRfbmFtZScgaW4ga3dhcmdzOgogICAgICAgICAgICAga3dhcmdzWydw b3J0X25hbWUnXSA9IGt3YXJnc1sncG9ydF9uYW1lJ11bbGVuKHByZWZpeCk6XQogICAgICAgICBz ZWxmLl9ob3N0ID0gaG9zdAotICAgICAgICBzZWxmLl9fZGVsZWdhdGUgPSBob3N0LnBvcnRfZmFj dG9yeS5nZXQoKiprd2FyZ3MpCisgICAgICAgIHNlbGYuX19kZWxlZ2F0ZSA9IFBvcnRGYWN0b3J5 KGhvc3QpLmdldCgqKmt3YXJncykKICAgICAgICAgc2VsZi5fX3JlYWxfbmFtZSA9IHByZWZpeCAr IHNlbGYuX19kZWxlZ2F0ZS5uYW1lKCkKIAogICAgIGRlZiByZWFsX25hbWUoc2VsZik6CkBAIC0x ODAsNyArMTg1LDcgQEAgY2xhc3MgTW9ja0RSVChvYmplY3QpOgogICAgICAgICBwb3J0X25hbWUg PSBOb25lCiAgICAgICAgIGlmIG9wdGlvbnMucGxhdGZvcm06CiAgICAgICAgICAgICBwb3J0X25h bWUgPSBvcHRpb25zLnBsYXRmb3JtCi0gICAgICAgIHNlbGYuX3BvcnQgPSBzZWxmLl9ob3N0LnBv cnRfZmFjdG9yeS5nZXQocG9ydF9uYW1lLCBvcHRpb25zPW9wdGlvbnMpCisgICAgICAgIHNlbGYu X3BvcnQgPSBQb3J0RmFjdG9yeShob3N0KS5nZXQocG9ydF9uYW1lPXBvcnRfbmFtZSwgb3B0aW9u cz1vcHRpb25zKQogCiAgICAgZGVmIHJ1bihzZWxmKToKICAgICAgICAgd2hpbGUgVHJ1ZToKQEAg LTI3Nyw3ICsyODIsNiBAQCBjbGFzcyBNb2NrQ2hyb21pdW1EUlQoTW9ja0RSVCk6CiAKIAogaWYg X19uYW1lX18gPT0gJ19fbWFpbl9fJzoKLSAgICAjIEZJWE1FOiBXaHkgaXMgdGhpcyB1c2luZyBh IHJlYWwgSG9zdCBvYmplY3QgaW5zdGVhZCBvZiBNb2NrSG9zdD8KLSAgICBob3N0ID0gSG9zdCgp Ci0gICAgaG9zdC5faW5pdGlhbGl6ZV9zY20oKQotICAgIHN5cy5leGl0KG1haW4oc3lzLmFyZ3Zb MTpdLCBob3N0LCBzeXMuc3RkaW4sIHN5cy5zdGRvdXQsIHN5cy5zdGRlcnIpKQorICAgICMgTm90 ZSB0aGF0IHRoZSBNb2NrIGluIE1vY2tEUlQgcmVmZXJzIHRvIHRoZSBmYWN0IHRoYXQgaXQgaXMg ZW11bGF0aW5nIGEKKyAgICAjIHJlYWwgRFJULCBhbmQgYXMgc3VjaCwgaXQgbmVlZHMgYWNjZXNz IHRvIGEgcmVhbCBTeXN0ZW1Ib3N0LCBub3QgYSBNb2NrU3lzdGVtSG9zdC4KKyAgICBzeXMuZXhp dChtYWluKHN5cy5hcmd2WzE6XSwgU3lzdGVtSG9zdCgpLCBzeXMuc3RkaW4sIHN5cy5zdGRvdXQs IHN5cy5zdGRlcnIpKQo=