63673 2011-06-29 17:19:35 -0700 Refactor WebKitDriver.run_test into smaller pieces 2011-06-29 19:28:52 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 56729 1 eric eric abarth dpranke webkit.review.bot oldest_to_newest 430021 0 eric 2011-06-29 17:19:35 -0700 Refactor WebKitDriver.run_test into smaller pieces 430023 1 99189 eric 2011-06-29 17:20:35 -0700 Created attachment 99189 Patch 430027 2 99191 eric 2011-06-29 17:31:23 -0700 Created attachment 99191 Patch 430087 3 eric 2011-06-29 18:48:52 -0700 Committed r90078: <http://trac.webkit.org/changeset/90078> 430114 4 webkit.review.bot 2011-06-29 19:28:52 -0700 The commit-queue encountered the following flaky tests while processing attachment 99191: http/tests/local/fileapi/file-last-modified.html bug 63294 (author: jianli@chromium.org) The commit-queue is continuing to process your patch. 99189 2011-06-29 17:20:35 -0700 2011-06-29 17:31:19 -0700 Patch bug-63673-20110629172033.patch text/plain 6264 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTAwNjYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkNDZiYzY5YTMwN2U0MWZlM2ZhOTc3ZTE5NTkzMjU0OTFj ZjVhMWE1Li44YzA5MTdhYWRiZTczYTU3MWQzNWZkNDM3OWQzOGM3YzIzMjAxOWUxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMDYtMjkgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZmFjdG9yIFdlYktpdERy aXZlci5ydW5fdGVzdCBpbnRvIHNtYWxsZXIgcGllY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzY3MworCisgICAgICAgIFRoZXJlIGlzIG5vIGZ1 bmN0aW9uYWwgY2hhbmdlIGhlcmUuICBKdXN0IG1vdmluZyBjb2RlIGFyb3VuZC4KKyAgICAgICAg VGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgYWRkaW5nIHN1cHBvcnQgZm9yICNDUkFTSEVEIGFu ZCAjQ1JBU0hFRCAtIFdlYlByb2Nlc3MKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5OgorCiAyMDExLTA2LTI3ICBFcmljIFNlaWRlbCAgPGVy aWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0 LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkK aW5kZXggYWM0NDdkNzZkYjg4OTRlYjhlYjQ4MjQwZTVhYjQyZjZmN2MyODRkYy4uNWYyZjgzNWVl YTIwZGQ4ZWQzNDc5ODIzOTI0NWViMGI2NDM5ZDZjYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKQEAgLTQwOSw4ICs0MDksNyBA QCBjbGFzcyBXZWJLaXREcml2ZXIoYmFzZS5Ecml2ZXIpOgogICAgICAgICBlbnZpcm9ubWVudFsn RFlMRF9GUkFNRVdPUktfUEFUSCddID0gc2VsZi5fcG9ydC5fYnVpbGRfcGF0aCgpCiAgICAgICAg ICMgRklYTUU6IFdlJ3JlIGFzc3VtaW5nIHRoYXQgV2ViS2l0VGVzdFJ1bm5lciBjaGVja3MgdGhp cyBEdW1wUmVuZGVyVHJlZS1uYW1lZCBlbnZpcm9ubWVudCB2YXJpYWJsZS4KICAgICAgICAgZW52 aXJvbm1lbnRbJ0RVTVBSRU5ERVJUUkVFX1RFTVAnXSA9IHN0cihzZWxmLl9kcml2ZXJfdGVtcGRp cikKLSAgICAgICAgc2VsZi5fc2VydmVyX3Byb2Nlc3MgPSBzZXJ2ZXJfcHJvY2Vzcy5TZXJ2ZXJQ cm9jZXNzKHNlbGYuX3BvcnQsCi0gICAgICAgICAgICBzZWxmLl9wb3J0LmRyaXZlcl9uYW1lKCks IHNlbGYuY21kX2xpbmUoKSwgZW52aXJvbm1lbnQpCisgICAgICAgIHNlbGYuX3NlcnZlcl9wcm9j ZXNzID0gc2VydmVyX3Byb2Nlc3MuU2VydmVyUHJvY2VzcyhzZWxmLl9wb3J0LCBzZWxmLl9wb3J0 LmRyaXZlcl9uYW1lKCksIHNlbGYuY21kX2xpbmUoKSwgZW52aXJvbm1lbnQpCiAKICAgICBkZWYg cG9sbChzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX3NlcnZlcl9wcm9jZXNzLnBvbGwoKQpA QCAtNDIwLDQzICs0MTksNDkgQEAgY2xhc3MgV2ViS2l0RHJpdmVyKGJhc2UuRHJpdmVyKToKICAg ICAgICAgc2VsZi5fc2VydmVyX3Byb2Nlc3Muc3RhcnQoKQogICAgICAgICByZXR1cm4KIAotICAg ICMgRklYTUU6IFRoaXMgZnVuY3Rpb24gaXMgaHVnZS4KLSAgICBkZWYgcnVuX3Rlc3Qoc2VsZiwg ZHJpdmVyX2lucHV0KToKKyAgICBkZWYgZGV0ZWN0ZWRfY3Jhc2goc2VsZik6CisgICAgICAgICMg RklYTUU6IFdlIGNhbid0IGp1c3QgY2hlY2sgc2VsZi5fc2VydmVyX3Byb2Nlc3MuY3Jhc2hlZCBm b3IgdHdvIHJlYXNvbnM6CisgICAgICAgICMgMS4gV2ViS2l0VGVzdFJ1bm5lciB3aWxsIHByaW50 ICIjQ1JBU0hFRCAtIFdlYlByb2Nlc3MiIGFuZCB0aGVuIGV4aXQgaWYgdGhlIFdlYlByb2Nlc3Mg Y3Jhc2hlcy4KKyAgICAgICAgIyAyLiBBZGFtIFJvYmVuIHRlbGxzIG1lIFdpbmRvd3MgRHVtcFJl bmRlclRyZWUgY2FuIHByaW50ICIjQ1JBU0hFRCIgeWV0IHN0aWxsIGV4aXQgY2xlYW5seS4KKyAg ICAgICAgcmV0dXJuIHNlbGYuX3NlcnZlcl9wcm9jZXNzLmNyYXNoZWQKKworICAgIGRlZiBfY29t bWFuZF9mcm9tX2RyaXZlcl9pbnB1dChzZWxmLCBkcml2ZXJfaW5wdXQpOgogICAgICAgICB1cmkg PSBzZWxmLl9wb3J0LmZpbGVuYW1lX3RvX3VyaShkcml2ZXJfaW5wdXQuZmlsZW5hbWUpCi0gICAg ICAgIGlmIHVyaS5zdGFydHN3aXRoKCJmaWxlOi8vLyIpOgotICAgICAgICAgICAgY29tbWFuZCA9 IHVyaVs3Ol0KLSAgICAgICAgZWxzZToKLSAgICAgICAgICAgIGNvbW1hbmQgPSB1cmkKKyAgICAg ICAgY29tbWFuZCA9IHVyaVs3Ol0gaWYgdXJpLnN0YXJ0c3dpdGgoImZpbGU6Ly8vIikgZWxzZSB1 cmkKIAogICAgICAgICBpZiBkcml2ZXJfaW5wdXQuaW1hZ2VfaGFzaDoKKyAgICAgICAgICAgICMg RklYTUU6IFdoeSB0aGUgbGVhZGluZyBxdW90ZT8KICAgICAgICAgICAgIGNvbW1hbmQgKz0gIici ICsgZHJpdmVyX2lucHV0LmltYWdlX2hhc2gKLSAgICAgICAgY29tbWFuZCArPSAiXG4iCisgICAg ICAgIHJldHVybiBjb21tYW5kICsgIlxuIgogCi0gICAgICAgIHN0YXJ0X3RpbWUgPSB0aW1lLnRp bWUoKQotICAgICAgICBzZWxmLl9zZXJ2ZXJfcHJvY2Vzcy53cml0ZShjb21tYW5kKQorICAgIGRl ZiBfcmVhZF9maXJzdF9ibG9jayhzZWxmLCBkZWFkbGluZSk6CisgICAgICAgICIiIlJlYWRzIGEg YmxvY2sgZnJvbSB0aGUgc2VydmVyX3Byb2Nlc3MgYW5kIHJldHVybnMgKHRleHRfY29udGVudCwg YXVkaW9fY29udGVudCkuIiIiCisgICAgICAgIGlmIHNlbGYuZGV0ZWN0ZWRfY3Jhc2goKToKKyAg ICAgICAgICAgIHJldHVybgogCi0gICAgICAgIHRleHQgPSBOb25lCi0gICAgICAgIGltYWdlID0g Tm9uZQotICAgICAgICBhY3R1YWxfaW1hZ2VfaGFzaCA9IE5vbmUKLSAgICAgICAgYXVkaW8gPSBO b25lCi0gICAgICAgIGRlYWRsaW5lID0gdGltZS50aW1lKCkgKyBpbnQoZHJpdmVyX2lucHV0LnRp bWVvdXQpIC8gMTAwMC4wCisgICAgICAgIGJsb2NrID0gc2VsZi5fcmVhZF9ibG9jayhkZWFkbGlu ZSkKKyAgICAgICAgaWYgYmxvY2suY29udGVudF90eXBlID09ICdhdWRpby93YXYnOgorICAgICAg ICAgICAgcmV0dXJuIChOb25lLCBibG9jay5kZWNvZGVkX2NvbnRlbnQpCiAKLSAgICAgICAgIyBG aXJzdCBibG9jayBpcyBlaXRoZXIgdGV4dCBvciBhdWRpbwotICAgICAgICBpZiBub3Qgc2VsZi5f c2VydmVyX3Byb2Nlc3MuY3Jhc2hlZDoKLSAgICAgICAgICAgIGJsb2NrID0gc2VsZi5fcmVhZF9i bG9jayhkZWFkbGluZSkKLSAgICAgICAgICAgIGlmIGJsb2NrLmNvbnRlbnRfdHlwZSA9PSAnYXVk aW8vd2F2JzoKLSAgICAgICAgICAgICAgICBhdWRpbyA9IGJsb2NrLmRlY29kZWRfY29udGVudAot ICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICB0ZXh0ID0gYmxvY2suZGVjb2RlZF9j b250ZW50CisgICAgICAgIHJldHVybiAoYmxvY2suZGVjb2RlZF9jb250ZW50LCBOb25lKQogCi0g ICAgICAgICMgTm93IHJlYWQgYW4gb3B0aW9uYWwgc2Vjb25kIGJsb2NrIG9mIGltYWdlIGRhdGEK LSAgICAgICAgaWYgbm90IHNlbGYuX3NlcnZlcl9wcm9jZXNzLmNyYXNoZWQ6Ci0gICAgICAgICAg ICBibG9jayA9IHNlbGYuX3JlYWRfYmxvY2soZGVhZGxpbmUpCi0gICAgICAgICAgICBpZiBibG9j ay5jb250ZW50IGFuZCBibG9jay5jb250ZW50X3R5cGUgPT0gJ2ltYWdlL3BuZyc6Ci0gICAgICAg ICAgICAgICAgaW1hZ2UgPSBibG9jay5kZWNvZGVkX2NvbnRlbnQKLSAgICAgICAgICAgICAgICBh Y3R1YWxfaW1hZ2VfaGFzaCA9IGJsb2NrLmNvbnRlbnRfaGFzaAotICAgICAgICAgICAgZWxpZiBi bG9jay5jb250ZW50X2hhc2g6Ci0gICAgICAgICAgICAgICAgYWN0dWFsX2ltYWdlX2hhc2ggPSBi bG9jay5jb250ZW50X2hhc2gKKyAgICBkZWYgX3JlYWRfb3B0aW9uYWxfaW1hZ2VfYmxvY2soc2Vs ZiwgZGVhZGxpbmUpOgorICAgICAgICBpZiBzZWxmLmRldGVjdGVkX2NyYXNoKCk6CisgICAgICAg ICAgICByZXR1cm4KKworICAgICAgICBibG9jayA9IHNlbGYuX3JlYWRfYmxvY2soZGVhZGxpbmUp CisgICAgICAgIGlmIGJsb2NrLmNvbnRlbnQgYW5kIGJsb2NrLmNvbnRlbnRfdHlwZSA9PSAnaW1h Z2UvcG5nJzoKKyAgICAgICAgICAgIHJldHVybiAoYmxvY2suZGVjb2RlZF9jb250ZW50LCBibG9j ay5jb250ZW50X2hhc2gpCisgICAgICAgIHJldHVybiAoTm9uZSwgYmxvY2suY29udGVudF9oYXNo KQorCisgICAgZGVmIHJ1bl90ZXN0KHNlbGYsIGRyaXZlcl9pbnB1dCk6CisgICAgICAgIGNvbW1h bmQgPSBzZWxmLl9jb21tYW5kX2Zyb21fZHJpdmVyX2lucHV0KGRyaXZlcl9pbnB1dCkKKyAgICAg ICAgc3RhcnRfdGltZSA9IHRpbWUudGltZSgpCisgICAgICAgIGRlYWRsaW5lID0gdGltZS50aW1l KCkgKyBpbnQoZHJpdmVyX2lucHV0LnRpbWVvdXQpIC8gMTAwMC4wCisKKyAgICAgICAgc2VsZi5f c2VydmVyX3Byb2Nlc3Mud3JpdGUoY29tbWFuZCkKKyAgICAgICAgdGV4dCwgYXVkaW8gPSBzZWxm Ll9yZWFkX2ZpcnN0X2Jsb2NrKGRlYWRsaW5lKSAgIyBGaXJzdCBibG9jayBpcyBlaXRoZXIgdGV4 dCBvciBhdWRpbworICAgICAgICBpbWFnZSwgYWN0dWFsX2ltYWdlX2hhc2ggPSBzZWxmLl9yZWFk X29wdGlvbmFsX2ltYWdlX2Jsb2NrKGRlYWRsaW5lKSAgIyBUaGUgc2Vjb25kIChvcHRpb25hbCkg YmxvY2sgaXMgaW1hZ2UgZGF0YS4KIAogICAgICAgICBlcnJvcl9saW5lcyA9IHNlbGYuX3NlcnZl cl9wcm9jZXNzLmVycm9yLnNwbGl0bGluZXMoKQogICAgICAgICAjIEZJWE1FOiBUaGlzIGlzIGEg aGFjay4gIEl0IGlzIHVuY2xlYXIgd2h5IHNvbWV0aW1lcwpAQCAtNDY2LDEwICs0NzEsMTAgQEAg Y2xhc3MgV2ViS2l0RHJpdmVyKGJhc2UuRHJpdmVyKToKICAgICAgICAgICAgIGVycm9yX2xpbmVz LnBvcCgpICAjIFJlbW92ZSB0aGUgZXhwZWN0ZWQgIiNFT0YiCiAgICAgICAgIGVycm9yID0gIlxu Ii5qb2luKGVycm9yX2xpbmVzKQogCi0gICAgICAgICMgRklYTUU6IFRoaXMgc2VlbXMgbGlrZSB0 aGUgd3Jvbmcgc2VjdGlvbiBvZiBjb2RlIHRvIGJlIGRvaW5nIHRoaXMgcmVzZXQgaW4uCisgICAg ICAgICMgRklYTUU6IFRoaXMgc2VlbXMgbGlrZSB0aGUgd3Jvbmcgc2VjdGlvbiBvZiBjb2RlIHRv IGJlIHJlc2V0dGluZyBfc2VydmVyX3Byb2Nlc3MuZXJyb3IuCiAgICAgICAgIHNlbGYuX3NlcnZl cl9wcm9jZXNzLmVycm9yID0gIiIKICAgICAgICAgcmV0dXJuIGJhc2UuRHJpdmVyT3V0cHV0KHRl eHQsIGltYWdlLCBhY3R1YWxfaW1hZ2VfaGFzaCwgYXVkaW8sCi0gICAgICAgICAgICBjcmFzaD1z ZWxmLl9zZXJ2ZXJfcHJvY2Vzcy5jcmFzaGVkLCB0ZXN0X3RpbWU9dGltZS50aW1lKCkgLSBzdGFy dF90aW1lLAorICAgICAgICAgICAgY3Jhc2g9c2VsZi5kZXRlY3RlZF9jcmFzaCgpLCB0ZXN0X3Rp bWU9dGltZS50aW1lKCkgLSBzdGFydF90aW1lLAogICAgICAgICAgICAgdGltZW91dD1zZWxmLl9z ZXJ2ZXJfcHJvY2Vzcy50aW1lZF9vdXQsIGVycm9yPWVycm9yKQogCiAgICAgZGVmIF9yZWFkX2Js b2NrKHNlbGYsIGRlYWRsaW5lKToKQEAgLTQ4OCw3ICs0OTMsNyBAQCBjbGFzcyBXZWJLaXREcml2 ZXIoYmFzZS5Ecml2ZXIpOgogICAgICAgICB0aW1lb3V0ID0gZGVhZGxpbmUgLSB0aW1lLnRpbWUo KQogICAgICAgICBsaW5lID0gc2VsZi5fc2VydmVyX3Byb2Nlc3MucmVhZF9saW5lKHRpbWVvdXQp CiAgICAgICAgIGVvZiA9IEZhbHNlCi0gICAgICAgIHdoaWxlIChub3Qgc2VsZi5fc2VydmVyX3By b2Nlc3MudGltZWRfb3V0IGFuZCBub3Qgc2VsZi5fc2VydmVyX3Byb2Nlc3MuY3Jhc2hlZCBhbmQg bm90IGVvZik6CisgICAgICAgIHdoaWxlIChub3Qgc2VsZi5fc2VydmVyX3Byb2Nlc3MudGltZWRf b3V0IGFuZCBub3Qgc2VsZi5kZXRlY3RlZF9jcmFzaCgpIGFuZCBub3QgZW9mKToKICAgICAgICAg ICAgIGNob21wZWRfbGluZSA9IGxpbmUucnN0cmlwKCkKICAgICAgICAgICAgIGlmIGNob21wZWRf bGluZS5lbmRzd2l0aCgiI0VPRiIpOgogICAgICAgICAgICAgICAgIGVvZiA9IFRydWUK 99191 2011-06-29 17:31:23 -0700 2011-06-29 18:43:40 -0700 Patch bug-63673-20110629173122.patch text/plain 6381 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTAwNjYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkNDZiYzY5YTMwN2U0MWZlM2ZhOTc3ZTE5NTkzMjU0OTFj ZjVhMWE1Li44YzA5MTdhYWRiZTczYTU3MWQzNWZkNDM3OWQzOGM3YzIzMjAxOWUxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMDYtMjkgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZmFjdG9yIFdlYktpdERy aXZlci5ydW5fdGVzdCBpbnRvIHNtYWxsZXIgcGllY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzY3MworCisgICAgICAgIFRoZXJlIGlzIG5vIGZ1 bmN0aW9uYWwgY2hhbmdlIGhlcmUuICBKdXN0IG1vdmluZyBjb2RlIGFyb3VuZC4KKyAgICAgICAg VGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgYWRkaW5nIHN1cHBvcnQgZm9yICNDUkFTSEVEIGFu ZCAjQ1JBU0hFRCAtIFdlYlByb2Nlc3MKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5OgorCiAyMDExLTA2LTI3ICBFcmljIFNlaWRlbCAgPGVy aWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0 LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkK aW5kZXggYWM0NDdkNzZkYjg4OTRlYjhlYjQ4MjQwZTVhYjQyZjZmN2MyODRkYy4uOTIzNDk0YThm ZGM5OGU1NTVkZDRhMjY1NDRkOWI5YTJhZTQ1MzA3MiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKQEAgLTQwOSw4ICs0MDksNyBA QCBjbGFzcyBXZWJLaXREcml2ZXIoYmFzZS5Ecml2ZXIpOgogICAgICAgICBlbnZpcm9ubWVudFsn RFlMRF9GUkFNRVdPUktfUEFUSCddID0gc2VsZi5fcG9ydC5fYnVpbGRfcGF0aCgpCiAgICAgICAg ICMgRklYTUU6IFdlJ3JlIGFzc3VtaW5nIHRoYXQgV2ViS2l0VGVzdFJ1bm5lciBjaGVja3MgdGhp cyBEdW1wUmVuZGVyVHJlZS1uYW1lZCBlbnZpcm9ubWVudCB2YXJpYWJsZS4KICAgICAgICAgZW52 aXJvbm1lbnRbJ0RVTVBSRU5ERVJUUkVFX1RFTVAnXSA9IHN0cihzZWxmLl9kcml2ZXJfdGVtcGRp cikKLSAgICAgICAgc2VsZi5fc2VydmVyX3Byb2Nlc3MgPSBzZXJ2ZXJfcHJvY2Vzcy5TZXJ2ZXJQ cm9jZXNzKHNlbGYuX3BvcnQsCi0gICAgICAgICAgICBzZWxmLl9wb3J0LmRyaXZlcl9uYW1lKCks IHNlbGYuY21kX2xpbmUoKSwgZW52aXJvbm1lbnQpCisgICAgICAgIHNlbGYuX3NlcnZlcl9wcm9j ZXNzID0gc2VydmVyX3Byb2Nlc3MuU2VydmVyUHJvY2VzcyhzZWxmLl9wb3J0LCBzZWxmLl9wb3J0 LmRyaXZlcl9uYW1lKCksIHNlbGYuY21kX2xpbmUoKSwgZW52aXJvbm1lbnQpCiAKICAgICBkZWYg cG9sbChzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX3NlcnZlcl9wcm9jZXNzLnBvbGwoKQpA QCAtNDIwLDQzICs0MTksNDkgQEAgY2xhc3MgV2ViS2l0RHJpdmVyKGJhc2UuRHJpdmVyKToKICAg ICAgICAgc2VsZi5fc2VydmVyX3Byb2Nlc3Muc3RhcnQoKQogICAgICAgICByZXR1cm4KIAotICAg ICMgRklYTUU6IFRoaXMgZnVuY3Rpb24gaXMgaHVnZS4KLSAgICBkZWYgcnVuX3Rlc3Qoc2VsZiwg ZHJpdmVyX2lucHV0KToKKyAgICBkZWYgZGV0ZWN0ZWRfY3Jhc2goc2VsZik6CisgICAgICAgICMg RklYTUU6IFdlIGNhbid0IGp1c3QgY2hlY2sgc2VsZi5fc2VydmVyX3Byb2Nlc3MuY3Jhc2hlZCBm b3IgdHdvIHJlYXNvbnM6CisgICAgICAgICMgMS4gV2ViS2l0VGVzdFJ1bm5lciB3aWxsIHByaW50 ICIjQ1JBU0hFRCAtIFdlYlByb2Nlc3MiIGFuZCB0aGVuIGV4aXQgaWYgdGhlIFdlYlByb2Nlc3Mg Y3Jhc2hlcy4KKyAgICAgICAgIyAyLiBBZGFtIFJvYmVuIHRlbGxzIG1lIFdpbmRvd3MgRHVtcFJl bmRlclRyZWUgY2FuIHByaW50ICIjQ1JBU0hFRCIgeWV0IHN0aWxsIGV4aXQgY2xlYW5seS4KKyAg ICAgICAgcmV0dXJuIHNlbGYuX3NlcnZlcl9wcm9jZXNzLmNyYXNoZWQKKworICAgIGRlZiBfY29t bWFuZF9mcm9tX2RyaXZlcl9pbnB1dChzZWxmLCBkcml2ZXJfaW5wdXQpOgogICAgICAgICB1cmkg PSBzZWxmLl9wb3J0LmZpbGVuYW1lX3RvX3VyaShkcml2ZXJfaW5wdXQuZmlsZW5hbWUpCi0gICAg ICAgIGlmIHVyaS5zdGFydHN3aXRoKCJmaWxlOi8vLyIpOgotICAgICAgICAgICAgY29tbWFuZCA9 IHVyaVs3Ol0KLSAgICAgICAgZWxzZToKLSAgICAgICAgICAgIGNvbW1hbmQgPSB1cmkKKyAgICAg ICAgY29tbWFuZCA9IHVyaVs3Ol0gaWYgdXJpLnN0YXJ0c3dpdGgoImZpbGU6Ly8vIikgZWxzZSB1 cmkKIAogICAgICAgICBpZiBkcml2ZXJfaW5wdXQuaW1hZ2VfaGFzaDoKKyAgICAgICAgICAgICMg RklYTUU6IFdoeSB0aGUgbGVhZGluZyBxdW90ZT8KICAgICAgICAgICAgIGNvbW1hbmQgKz0gIici ICsgZHJpdmVyX2lucHV0LmltYWdlX2hhc2gKLSAgICAgICAgY29tbWFuZCArPSAiXG4iCisgICAg ICAgIHJldHVybiBjb21tYW5kICsgIlxuIgogCi0gICAgICAgIHN0YXJ0X3RpbWUgPSB0aW1lLnRp bWUoKQotICAgICAgICBzZWxmLl9zZXJ2ZXJfcHJvY2Vzcy53cml0ZShjb21tYW5kKQorICAgIGRl ZiBfcmVhZF9maXJzdF9ibG9jayhzZWxmLCBkZWFkbGluZSk6CisgICAgICAgICIiIlJlYWRzIGEg YmxvY2sgZnJvbSB0aGUgc2VydmVyX3Byb2Nlc3MgYW5kIHJldHVybnMgKHRleHRfY29udGVudCwg YXVkaW9fY29udGVudCkuIiIiCisgICAgICAgIGlmIHNlbGYuZGV0ZWN0ZWRfY3Jhc2goKToKKyAg ICAgICAgICAgIHJldHVybiAoTm9uZSwgTm9uZSkKIAotICAgICAgICB0ZXh0ID0gTm9uZQotICAg ICAgICBpbWFnZSA9IE5vbmUKLSAgICAgICAgYWN0dWFsX2ltYWdlX2hhc2ggPSBOb25lCi0gICAg ICAgIGF1ZGlvID0gTm9uZQotICAgICAgICBkZWFkbGluZSA9IHRpbWUudGltZSgpICsgaW50KGRy aXZlcl9pbnB1dC50aW1lb3V0KSAvIDEwMDAuMAorICAgICAgICBibG9jayA9IHNlbGYuX3JlYWRf YmxvY2soZGVhZGxpbmUpCisgICAgICAgIGlmIGJsb2NrLmNvbnRlbnRfdHlwZSA9PSAnYXVkaW8v d2F2JzoKKyAgICAgICAgICAgIHJldHVybiAoTm9uZSwgYmxvY2suZGVjb2RlZF9jb250ZW50KQor ICAgICAgICByZXR1cm4gKGJsb2NrLmRlY29kZWRfY29udGVudCwgTm9uZSkKIAotICAgICAgICAj IEZpcnN0IGJsb2NrIGlzIGVpdGhlciB0ZXh0IG9yIGF1ZGlvCi0gICAgICAgIGlmIG5vdCBzZWxm Ll9zZXJ2ZXJfcHJvY2Vzcy5jcmFzaGVkOgotICAgICAgICAgICAgYmxvY2sgPSBzZWxmLl9yZWFk X2Jsb2NrKGRlYWRsaW5lKQotICAgICAgICAgICAgaWYgYmxvY2suY29udGVudF90eXBlID09ICdh dWRpby93YXYnOgotICAgICAgICAgICAgICAgIGF1ZGlvID0gYmxvY2suZGVjb2RlZF9jb250ZW50 Ci0gICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgIHRleHQgPSBibG9jay5kZWNvZGVk X2NvbnRlbnQKKyAgICBkZWYgX3JlYWRfb3B0aW9uYWxfaW1hZ2VfYmxvY2soc2VsZiwgZGVhZGxp bmUpOgorICAgICAgICAiIiJSZWFkcyBhIGJsb2NrIGZyb20gdGhlIHNlcnZlcl9wcm9jZXNzIGFu ZCByZXR1cm5zIChpbWFnZSwgYWN0dWFsX2ltYWdlX2hhc2gpLiIiIgorICAgICAgICBpZiBzZWxm LmRldGVjdGVkX2NyYXNoKCk6CisgICAgICAgICAgICByZXR1cm4gKE5vbmUsIE5vbmUpCiAKLSAg ICAgICAgIyBOb3cgcmVhZCBhbiBvcHRpb25hbCBzZWNvbmQgYmxvY2sgb2YgaW1hZ2UgZGF0YQot ICAgICAgICBpZiBub3Qgc2VsZi5fc2VydmVyX3Byb2Nlc3MuY3Jhc2hlZDoKLSAgICAgICAgICAg IGJsb2NrID0gc2VsZi5fcmVhZF9ibG9jayhkZWFkbGluZSkKLSAgICAgICAgICAgIGlmIGJsb2Nr LmNvbnRlbnQgYW5kIGJsb2NrLmNvbnRlbnRfdHlwZSA9PSAnaW1hZ2UvcG5nJzoKLSAgICAgICAg ICAgICAgICBpbWFnZSA9IGJsb2NrLmRlY29kZWRfY29udGVudAotICAgICAgICAgICAgICAgIGFj dHVhbF9pbWFnZV9oYXNoID0gYmxvY2suY29udGVudF9oYXNoCi0gICAgICAgICAgICBlbGlmIGJs b2NrLmNvbnRlbnRfaGFzaDoKLSAgICAgICAgICAgICAgICBhY3R1YWxfaW1hZ2VfaGFzaCA9IGJs b2NrLmNvbnRlbnRfaGFzaAorICAgICAgICBibG9jayA9IHNlbGYuX3JlYWRfYmxvY2soZGVhZGxp bmUpCisgICAgICAgIGlmIGJsb2NrLmNvbnRlbnQgYW5kIGJsb2NrLmNvbnRlbnRfdHlwZSA9PSAn aW1hZ2UvcG5nJzoKKyAgICAgICAgICAgIHJldHVybiAoYmxvY2suZGVjb2RlZF9jb250ZW50LCBi bG9jay5jb250ZW50X2hhc2gpCisgICAgICAgIHJldHVybiAoTm9uZSwgYmxvY2suY29udGVudF9o YXNoKQorCisgICAgZGVmIHJ1bl90ZXN0KHNlbGYsIGRyaXZlcl9pbnB1dCk6CisgICAgICAgIGNv bW1hbmQgPSBzZWxmLl9jb21tYW5kX2Zyb21fZHJpdmVyX2lucHV0KGRyaXZlcl9pbnB1dCkKKyAg ICAgICAgc3RhcnRfdGltZSA9IHRpbWUudGltZSgpCisgICAgICAgIGRlYWRsaW5lID0gdGltZS50 aW1lKCkgKyBpbnQoZHJpdmVyX2lucHV0LnRpbWVvdXQpIC8gMTAwMC4wCisKKyAgICAgICAgc2Vs Zi5fc2VydmVyX3Byb2Nlc3Mud3JpdGUoY29tbWFuZCkKKyAgICAgICAgdGV4dCwgYXVkaW8gPSBz ZWxmLl9yZWFkX2ZpcnN0X2Jsb2NrKGRlYWRsaW5lKSAgIyBGaXJzdCBibG9jayBpcyBlaXRoZXIg dGV4dCBvciBhdWRpbworICAgICAgICBpbWFnZSwgYWN0dWFsX2ltYWdlX2hhc2ggPSBzZWxmLl9y ZWFkX29wdGlvbmFsX2ltYWdlX2Jsb2NrKGRlYWRsaW5lKSAgIyBUaGUgc2Vjb25kIChvcHRpb25h bCkgYmxvY2sgaXMgaW1hZ2UgZGF0YS4KIAogICAgICAgICBlcnJvcl9saW5lcyA9IHNlbGYuX3Nl cnZlcl9wcm9jZXNzLmVycm9yLnNwbGl0bGluZXMoKQogICAgICAgICAjIEZJWE1FOiBUaGlzIGlz IGEgaGFjay4gIEl0IGlzIHVuY2xlYXIgd2h5IHNvbWV0aW1lcwpAQCAtNDY2LDEwICs0NzEsMTAg QEAgY2xhc3MgV2ViS2l0RHJpdmVyKGJhc2UuRHJpdmVyKToKICAgICAgICAgICAgIGVycm9yX2xp bmVzLnBvcCgpICAjIFJlbW92ZSB0aGUgZXhwZWN0ZWQgIiNFT0YiCiAgICAgICAgIGVycm9yID0g IlxuIi5qb2luKGVycm9yX2xpbmVzKQogCi0gICAgICAgICMgRklYTUU6IFRoaXMgc2VlbXMgbGlr ZSB0aGUgd3Jvbmcgc2VjdGlvbiBvZiBjb2RlIHRvIGJlIGRvaW5nIHRoaXMgcmVzZXQgaW4uCisg ICAgICAgICMgRklYTUU6IFRoaXMgc2VlbXMgbGlrZSB0aGUgd3Jvbmcgc2VjdGlvbiBvZiBjb2Rl IHRvIGJlIHJlc2V0dGluZyBfc2VydmVyX3Byb2Nlc3MuZXJyb3IuCiAgICAgICAgIHNlbGYuX3Nl cnZlcl9wcm9jZXNzLmVycm9yID0gIiIKICAgICAgICAgcmV0dXJuIGJhc2UuRHJpdmVyT3V0cHV0 KHRleHQsIGltYWdlLCBhY3R1YWxfaW1hZ2VfaGFzaCwgYXVkaW8sCi0gICAgICAgICAgICBjcmFz aD1zZWxmLl9zZXJ2ZXJfcHJvY2Vzcy5jcmFzaGVkLCB0ZXN0X3RpbWU9dGltZS50aW1lKCkgLSBz dGFydF90aW1lLAorICAgICAgICAgICAgY3Jhc2g9c2VsZi5kZXRlY3RlZF9jcmFzaCgpLCB0ZXN0 X3RpbWU9dGltZS50aW1lKCkgLSBzdGFydF90aW1lLAogICAgICAgICAgICAgdGltZW91dD1zZWxm Ll9zZXJ2ZXJfcHJvY2Vzcy50aW1lZF9vdXQsIGVycm9yPWVycm9yKQogCiAgICAgZGVmIF9yZWFk X2Jsb2NrKHNlbGYsIGRlYWRsaW5lKToKQEAgLTQ4OCw3ICs0OTMsNyBAQCBjbGFzcyBXZWJLaXRE cml2ZXIoYmFzZS5Ecml2ZXIpOgogICAgICAgICB0aW1lb3V0ID0gZGVhZGxpbmUgLSB0aW1lLnRp bWUoKQogICAgICAgICBsaW5lID0gc2VsZi5fc2VydmVyX3Byb2Nlc3MucmVhZF9saW5lKHRpbWVv dXQpCiAgICAgICAgIGVvZiA9IEZhbHNlCi0gICAgICAgIHdoaWxlIChub3Qgc2VsZi5fc2VydmVy X3Byb2Nlc3MudGltZWRfb3V0IGFuZCBub3Qgc2VsZi5fc2VydmVyX3Byb2Nlc3MuY3Jhc2hlZCBh bmQgbm90IGVvZik6CisgICAgICAgIHdoaWxlIChub3Qgc2VsZi5fc2VydmVyX3Byb2Nlc3MudGlt ZWRfb3V0IGFuZCBub3Qgc2VsZi5kZXRlY3RlZF9jcmFzaCgpIGFuZCBub3QgZW9mKToKICAgICAg ICAgICAgIGNob21wZWRfbGluZSA9IGxpbmUucnN0cmlwKCkKICAgICAgICAgICAgIGlmIGNob21w ZWRfbGluZS5lbmRzd2l0aCgiI0VPRiIpOgogICAgICAgICAgICAgICAgIGVvZiA9IFRydWUK