180426 2017-12-05 08:40:27 -0800 [GTK] WebDriver: run-webdriver-tests is leaking a DumpRenderTree directory in tmp 2017-12-11 00:32:24 -0800 1 1 1 Unclassified WebKit WebDriver WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk, InRadar P2 Normal --- 1 cgarcia webkit-unassigned bburg bugs-noreply ews-watchlist glenn mcatanzaro webkit-bug-importer oldest_to_newest 1378169 0 cgarcia 2017-12-05 08:40:27 -0800 This happens when running the tests with Xvfb driver, because _setup_environ_for_test() is called twice and the DTR is created there every time. Only the last directory created is cleaned up by the driver destructor. The DRT temp directory is only needed for layout tests, so we could even avoid its creation by moving it to the start() method like other drivers do (included the base driver implementation). Since API and WebDriver tests don't call start(), the directory is not even created, and the required env vars are not set either in that case. 1378172 1 328454 cgarcia 2017-12-05 08:46:32 -0800 Created attachment 328454 Patch 1380137 2 cgarcia 2017-12-11 00:31:48 -0800 Committed r225740: <https://trac.webkit.org/changeset/225740> 1380138 3 webkit-bug-importer 2017-12-11 00:32:24 -0800 <rdar://problem/35962796> 328454 2017-12-05 08:46:32 -0800 2017-12-05 09:56:47 -0800 Patch wd-drt-tmp-leaked.diff text/plain 14758 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlMzc4 ZTkxMTJjZS4uY2M5NTBiYmZhZDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOSBAQAorMjAxNy0xMi0wNSAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gV2ViRHJpdmVy OiBydW4td2ViZHJpdmVyLXRlc3RzIGlzIGxlYWtpbmcgYSBEdW1wUmVuZGVyVHJlZSBkaXJlY3Rv cnkgaW4gdG1wCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xODA0MjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGlzIGhhcHBlbnMgd2hlbiBydW5uaW5nIHRoZSB0ZXN0cyB3aXRoIFh2ZmIgZHJpdmVyLCBi ZWNhdXNlIF9zZXR1cF9lbnZpcm9uX2Zvcl90ZXN0KCkgaXMgY2FsbGVkIHR3aWNlIGFuZCB0aGUK KyAgICAgICAgRFRSIHRlbXAgZGlyZWN0b3J5IGlzIGNyZWF0ZWQgdGhlcmUgZXZlcnkgdGltZS4g T25seSB0aGUgbGFzdCBkaXJlY3RvcnkgY3JlYXRlZCBpcyBjbGVhbmVkIHVwIGJ5IHRoZSBkcml2 ZXIKKyAgICAgICAgZGVzdHJ1Y3Rvci4gVGhlIERSVCB0ZW1wIGRpcmVjdG9yeSBpcyBvbmx5IG5l ZWRlZCBmb3IgbGF5b3V0IHRlc3RzLCBzbyB3ZSBjb3VsZCBldmVuIGF2b2lkIGl0cyBjcmVhdGlv biBieQorICAgICAgICBtb3ZpbmcgaXQgdG8gdGhlIHN0YXJ0KCkgbWV0aG9kIGxpa2Ugb3RoZXIg ZHJpdmVycyBkbyAoaW5jbHVkZWQgdGhlIGJhc2UgZHJpdmVyIGltcGxlbWVudGF0aW9uKS4gU2lu Y2UgQVBJIGFuZAorICAgICAgICBXZWJEcml2ZXIgdGVzdHMgZG9uJ3QgY2FsbCBzdGFydCgpLCB0 aGUgZGlyZWN0b3J5IGlzIG5vdCBldmVuIGNyZWF0ZWQsIGFuZCB0aGUgcmVxdWlyZWQgZW52IHZh cnMgYXJlIG5vdCBzZXQKKyAgICAgICAgZWl0aGVyIGluIHRoYXQgY2FzZS4gV2VzdG9uIGRyaXZl ciB3YXMgYmVoYXZpbmcgZGlmZmVyZW50bHkgZm9yIHNvbWUgcmVhc29uLCBpdCdzIG5vdyBjb25z aXN0ZW50IHdpdGggYWxsIG90aGVyCisgICAgICAgIGRyaXZlcnMuCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L3BvcnQvaGVhZGxlc3Nkcml2ZXIucHk6CisgICAgICAgIChIZWFkbGVzc0Ry aXZlci5fc2V0dXBfZW52aXJvbl9mb3JfdGVzdCk6IERvIG5vdCBzZXQgRFVNUFJFTkRFUlRSRUVf VEVNUCBhbmQgWERHX0NBQ0hFX0hPTUUgaWYgX2RyaXZlcl90ZW1wZGlyIGlzIE5vbmUuCisgICAg ICAgIChIZWFkbGVzc0RyaXZlci5fc3RhcnQpOiBVc2UgUG9ydC5fZHJpdmVyX3RlbXBkaXIoKSB0 byBjcmVhdGUgdGhlIGRyaXZlciB0ZW1wIGRpcmVjdG9yeS4KKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3BvcnQvd2F5bGFuZGRyaXZlci5weToKKyAgICAgICAgKFdheWxhbmREcml2ZXIuX3Nl dHVwX2Vudmlyb25fZm9yX3Rlc3QpOiBEbyBub3Qgc2V0IERVTVBSRU5ERVJUUkVFX1RFTVAgYW5k IFhER19DQUNIRV9IT01FIGlmIF9kcml2ZXJfdGVtcGRpciBpcyBOb25lLgorICAgICAgICAoV2F5 bGFuZERyaXZlci5fc3RhcnQpOiBVc2UgUG9ydC5fZHJpdmVyX3RlbXBkaXIoKSB0byBjcmVhdGUg dGhlIGRyaXZlciB0ZW1wIGRpcmVjdG9yeS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Bv cnQvd2VzdG9uZHJpdmVyLnB5OgorICAgICAgICAoV2VzdG9uRHJpdmVyLl9zZXR1cF9lbnZpcm9u X2Zvcl90ZXN0KTogRG8gbm90IHNldCBEVU1QUkVOREVSVFJFRV9URU1QIGFuZCBYREdfQ0FDSEVf SE9NRSBpZiBfZHJpdmVyX3RlbXBkaXIgaXMgTm9uZS4KKyAgICAgICAgKFdlc3RvbkRyaXZlci5f c3RhcnQpOiBVc2UgUG9ydC5fZHJpdmVyX3RlbXBkaXIoKSB0byBjcmVhdGUgdGhlIGRyaXZlciB0 ZW1wIGRpcmVjdG9yeS4KKyAgICAgICAgKFdlc3RvbkRyaXZlci5zdG9wKTogRG8gbm90IGRlbGV0 ZSB0aGUgdGVtcCBkaXJlY3RvcnksIGl0J3MgZG9uZSBieSB0aGUgcGFyZW50IGNsYXNzLgorICAg ICAgICAoV2VzdG9uRHJpdmVyLl9lbnN1cmVfZHJpdmVyX3RtcGRpcl9zdWJkaXJlY3RvcnkpOiBE ZWxldGVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC93ZXN0b25kcml2ZXJfdW5p dHRlc3QucHk6CisgICAgICAgIChXZXN0b25Ecml2ZXJUZXN0Lm1ha2VfZHJpdmVyKToKKyAgICAg ICAgKFdlc3RvbkRyaXZlclRlc3QudGVzdF9zdG9wKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3BvcnQveG9yZ2RyaXZlci5weToKKyAgICAgICAgKFhvcmdEcml2ZXIuX3NldHVwX2Vudmly b25fZm9yX3Rlc3QpOiBEbyBub3Qgc2V0IERVTVBSRU5ERVJUUkVFX1RFTVAgYW5kIFhER19DQUNI RV9IT01FIGlmIF9kcml2ZXJfdGVtcGRpciBpcyBOb25lLgorICAgICAgICAoWG9yZ0RyaXZlci5f c3RhcnQpOiBVc2UgUG9ydC5fZHJpdmVyX3RlbXBkaXIoKSB0byBjcmVhdGUgdGhlIGRyaXZlciB0 ZW1wIGRpcmVjdG9yeS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQveHZmYmRyaXZl ci5weToKKyAgICAgICAgKFh2ZmJEcml2ZXIuX3NldHVwX2Vudmlyb25fZm9yX3Rlc3QpOiBEbyBu b3Qgc2V0IERVTVBSRU5ERVJUUkVFX1RFTVAgYW5kIFhER19DQUNIRV9IT01FIGlmIF9kcml2ZXJf dGVtcGRpciBpcyBOb25lLgorICAgICAgICAoWHZmYkRyaXZlci5fc3RhcnQpOiBVc2UgUG9ydC5f ZHJpdmVyX3RlbXBkaXIoKSB0byBjcmVhdGUgdGhlIGRyaXZlciB0ZW1wIGRpcmVjdG9yeS4KKwog MjAxNy0xMi0wNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAK ICAgICAgICAgV2ViRHJpdmVyOiBhZGQgc3VwcG9ydCBmb3IgdGVzdCBleHBlY3RhdGlvbnMKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9oZWFkbGVzc2RyaXZlci5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9oZWFkbGVzc2RyaXZlci5weQppbmRleCA5Y2U1 N2MyODMxYy4uZTQ2ODRhMzBmNDkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC9oZWFkbGVzc2RyaXZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv aGVhZGxlc3Nkcml2ZXIucHkKQEAgLTQxLDEzICs0MSwxNCBAQCBjbGFzcyBIZWFkbGVzc0RyaXZl cihEcml2ZXIpOgogICAgICAgICBkcml2ZXJfZW52aXJvbm1lbnQgPSBzZWxmLl9wb3J0LnNldHVw X2Vudmlyb25fZm9yX3NlcnZlcihzZWxmLl9zZXJ2ZXJfbmFtZSkKICAgICAgICAgZHJpdmVyX2Vu dmlyb25tZW50WydXUEVfVVNFX0hFQURMRVNTX1ZJRVdfQkFDS0VORCddID0gIjEiCiAgICAgICAg IGRyaXZlcl9lbnZpcm9ubWVudFsnTE9DQUxfUkVTT1VSQ0VfUk9PVCddID0gc2VsZi5fcG9ydC5s YXlvdXRfdGVzdHNfZGlyKCkKLSAgICAgICAgZHJpdmVyX2Vudmlyb25tZW50WydEVU1QUkVOREVS VFJFRV9URU1QJ10gPSBzdHIoc2VsZi5fZHJpdmVyX3RlbXBkaXIpCi0gICAgICAgIGRyaXZlcl9l bnZpcm9ubWVudFsnWERHX0NBQ0hFX0hPTUUnXSA9IHNlbGYuX3BvcnQuaG9zdC5maWxlc3lzdGVt LmpvaW4oc3RyKHNlbGYuX2RyaXZlcl90ZW1wZGlyKSwgJ2FwcGNhY2hlJykKKyAgICAgICAgaWYg c2VsZi5fZHJpdmVyX3RlbXBkaXIgaXMgbm90IE5vbmU6CisgICAgICAgICAgICBkcml2ZXJfZW52 aXJvbm1lbnRbJ0RVTVBSRU5ERVJUUkVFX1RFTVAnXSA9IHN0cihzZWxmLl9kcml2ZXJfdGVtcGRp cikKKyAgICAgICAgICAgIGRyaXZlcl9lbnZpcm9ubWVudFsnWERHX0NBQ0hFX0hPTUUnXSA9IHNl bGYuX3BvcnQuaG9zdC5maWxlc3lzdGVtLmpvaW4oc3RyKHNlbGYuX2RyaXZlcl90ZW1wZGlyKSwg J2FwcGNhY2hlJykKICAgICAgICAgcmV0dXJuIGRyaXZlcl9lbnZpcm9ubWVudAogCiAgICAgZGVm IF9zdGFydChzZWxmLCBwaXhlbF90ZXN0cywgcGVyX3Rlc3RfYXJncyk6CiAgICAgICAgIHN1cGVy KEhlYWRsZXNzRHJpdmVyLCBzZWxmKS5zdG9wKCkKLSAgICAgICAgc2VsZi5fZHJpdmVyX3RlbXBk aXIgPSBzZWxmLl9wb3J0Lmhvc3QuZmlsZXN5c3RlbS5ta2R0ZW1wKHByZWZpeD0nJXMtJyAlIHNl bGYuX3NlcnZlcl9uYW1lKQorICAgICAgICBzZWxmLl9kcml2ZXJfdGVtcGRpciA9IHNlbGYuX3Bv cnQuX2RyaXZlcl90ZW1wZGlyKHNlbGYuX3RhcmdldF9ob3N0KQogICAgICAgICBzZWxmLl9jcmFz aGVkX3Byb2Nlc3NfbmFtZSA9IE5vbmUKICAgICAgICAgc2VsZi5fY3Jhc2hlZF9waWQgPSBOb25l CiAgICAgICAgIHNlbGYuX3NlcnZlcl9wcm9jZXNzID0gc2VsZi5fcG9ydC5fc2VydmVyX3Byb2Nl c3NfY29uc3RydWN0b3Ioc2VsZi5fcG9ydCwgc2VsZi5fc2VydmVyX25hbWUsIHNlbGYuY21kX2xp bmUocGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpLCBzZWxmLl9zZXR1cF9lbnZpcm9uX2Zvcl90 ZXN0KCkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2F5bGFuZGRy aXZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93YXlsYW5kZHJpdmVyLnB5Cmlu ZGV4IDkxNzgwY2I1YjBhLi43MDIzODk1M2YzOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9wb3J0L3dheWxhbmRkcml2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L3dheWxhbmRkcml2ZXIucHkKQEAgLTUwLDEzICs1MCwxNCBAQCBjbGFzcyBXYXlsYW5k RHJpdmVyKERyaXZlcik6CiAgICAgICAgIHNlbGYuX3BvcnQuX2NvcHlfdmFsdWVfZnJvbV9lbnZp cm9uX2lmX3NldChkcml2ZXJfZW52aXJvbm1lbnQsICdXQVlMQU5EX1NPQ0tFVCcpCiAgICAgICAg IGRyaXZlcl9lbnZpcm9ubWVudFsnR0RLX0JBQ0tFTkQnXSA9ICd3YXlsYW5kJwogICAgICAgICBk cml2ZXJfZW52aXJvbm1lbnRbJ0xPQ0FMX1JFU09VUkNFX1JPT1QnXSA9IHNlbGYuX3BvcnQubGF5 b3V0X3Rlc3RzX2RpcigpCi0gICAgICAgIGRyaXZlcl9lbnZpcm9ubWVudFsnRFVNUFJFTkRFUlRS RUVfVEVNUCddID0gc3RyKHNlbGYuX2RyaXZlcl90ZW1wZGlyKQotICAgICAgICBkcml2ZXJfZW52 aXJvbm1lbnRbJ1hER19DQUNIRV9IT01FJ10gPSBzZWxmLl9wb3J0Lmhvc3QuZmlsZXN5c3RlbS5q b2luKHN0cihzZWxmLl9kcml2ZXJfdGVtcGRpciksICdhcHBjYWNoZScpCisgICAgICAgIGlmIHNl bGYuX2RyaXZlcl90ZW1wZGlyIGlzIG5vdCBOb25lOgorICAgICAgICAgICAgZHJpdmVyX2Vudmly b25tZW50WydEVU1QUkVOREVSVFJFRV9URU1QJ10gPSBzdHIoc2VsZi5fZHJpdmVyX3RlbXBkaXIp CisgICAgICAgICAgICBkcml2ZXJfZW52aXJvbm1lbnRbJ1hER19DQUNIRV9IT01FJ10gPSBzZWxm Ll9wb3J0Lmhvc3QuZmlsZXN5c3RlbS5qb2luKHN0cihzZWxmLl9kcml2ZXJfdGVtcGRpciksICdh cHBjYWNoZScpCiAgICAgICAgIHJldHVybiBkcml2ZXJfZW52aXJvbm1lbnQKIAogICAgIGRlZiBf c3RhcnQoc2VsZiwgcGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpOgogICAgICAgICBzdXBlcihX YXlsYW5kRHJpdmVyLCBzZWxmKS5zdG9wKCkKLSAgICAgICAgc2VsZi5fZHJpdmVyX3RlbXBkaXIg PSBzZWxmLl9wb3J0Lmhvc3QuZmlsZXN5c3RlbS5ta2R0ZW1wKHByZWZpeD0nJXMtJyAlIHNlbGYu X3NlcnZlcl9uYW1lKQorICAgICAgICBzZWxmLl9kcml2ZXJfdGVtcGRpciA9IHNlbGYuX3BvcnQu X2RyaXZlcl90ZW1wZGlyKHNlbGYuX3RhcmdldF9ob3N0KQogICAgICAgICBzZWxmLl9jcmFzaGVk X3Byb2Nlc3NfbmFtZSA9IE5vbmUKICAgICAgICAgc2VsZi5fY3Jhc2hlZF9waWQgPSBOb25lCiAg ICAgICAgIHNlbGYuX3NlcnZlcl9wcm9jZXNzID0gc2VsZi5fcG9ydC5fc2VydmVyX3Byb2Nlc3Nf Y29uc3RydWN0b3Ioc2VsZi5fcG9ydCwgc2VsZi5fc2VydmVyX25hbWUsIHNlbGYuY21kX2xpbmUo cGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpLCBzZWxmLl9zZXR1cF9lbnZpcm9uX2Zvcl90ZXN0 KCkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2VzdG9uZHJpdmVy LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dlc3RvbmRyaXZlci5weQppbmRleCAx Njg0OTZjMjUwYi4uNWFkN2U5MzE2ZDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvcG9ydC93ZXN0b25kcml2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0 L3dlc3RvbmRyaXZlci5weQpAQCAtNTUsNyArNTUsNiBAQCBjbGFzcyBXZXN0b25Ecml2ZXIoRHJp dmVyKToKICAgICAgICAgc2VsZi5feHZmYmRyaXZlciA9IFh2ZmJEcml2ZXIoKmFyZ3MsICoqa3dh cmdzKQogCiAgICAgZGVmIF9zZXR1cF9lbnZpcm9uX2Zvcl90ZXN0KHNlbGYpOgotICAgICAgICBz ZWxmLl9kcml2ZXJfZGlyZWN0b3J5ID0gc2VsZi5fcG9ydC5ob3N0LmZpbGVzeXN0ZW0ubWtkdGVt cChwcmVmaXg9JyVzLScgJSBzZWxmLl9zZXJ2ZXJfbmFtZSkKICAgICAgICAgZHJpdmVyX2Vudmly b25tZW50ID0gc2VsZi5fcG9ydC5zZXR1cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIoc2VsZi5fc2VydmVy X25hbWUpCiAgICAgICAgIGRyaXZlcl9lbnZpcm9ubWVudFsnRElTUExBWSddID0gIjolZCIgJSBz ZWxmLl94dmZiZHJpdmVyLl94dmZiX3J1bihkcml2ZXJfZW52aXJvbm1lbnQpCiAgICAgICAgIHdl c3Rvbl9zb2NrZXQgPSAnV0tUZXN0aW5nLXdlc3Rvbi0lMDMyeCcgJSByYW5kb20uZ2V0cmFuZGJp dHMoMTI4KQpAQCAtNjksMTAgKzY4LDExIEBAIGNsYXNzIFdlc3RvbkRyaXZlcihEcml2ZXIpOgog ICAgICAgICB0aW1lLnNsZWVwKHNlbGYuX3N0YXJ0dXBfZGVsYXlfc2VjcykKIAogICAgICAgICBk cml2ZXJfZW52aXJvbm1lbnRbJ0xPQ0FMX1JFU09VUkNFX1JPT1QnXSA9IHNlbGYuX3BvcnQubGF5 b3V0X3Rlc3RzX2RpcigpCi0gICAgICAgICMgQ3VycmVudGx5IG9uIFdlYktpdDIsIHRoZXJlIGlz IG5vIEFQSSBmb3Igc2V0dGluZyB0aGUgYXBwbGljYXRpb24gY2FjaGUgZGlyZWN0b3J5LgotICAg ICAgICAjIEVhY2ggd29ya2VyIHNob3VsZCBoYXZlIGl0cyBvd24gYW5kIGl0IHNob3VsZCBiZSBj bGVhbmVkIGFmdGVyd2FyZHMsIHdoZW4gdGhlIHdvcmtlciBzdG9wcy4KLSAgICAgICAgZHJpdmVy X2Vudmlyb25tZW50WydYREdfQ0FDSEVfSE9NRSddID0gc2VsZi5fZW5zdXJlX2RyaXZlcl90bXBk aXJfc3ViZGlyZWN0b3J5KCdhcHBjYWNoZScpCi0gICAgICAgIGRyaXZlcl9lbnZpcm9ubWVudFsn RFVNUFJFTkRFUlRSRUVfVEVNUCddID0gc2VsZi5fZW5zdXJlX2RyaXZlcl90bXBkaXJfc3ViZGly ZWN0b3J5KCdkcnQtdGVtcCcpCisgICAgICAgIGlmIHNlbGYuX2RyaXZlcl90ZW1wZGlyIGlzIG5v dCBOb25lOgorICAgICAgICAgICAgIyBDdXJyZW50bHkgb24gV2ViS2l0MiwgdGhlcmUgaXMgbm8g QVBJIGZvciBzZXR0aW5nIHRoZSBhcHBsaWNhdGlvbiBjYWNoZSBkaXJlY3RvcnkuCisgICAgICAg ICAgICAjIEVhY2ggd29ya2VyIHNob3VsZCBoYXZlIGl0cyBvd24gYW5kIGl0IHNob3VsZCBiZSBj bGVhbmVkIGFmdGVyd2FyZHMsIHdoZW4gdGhlIHdvcmtlciBzdG9wcy4KKyAgICAgICAgICAgIGRy aXZlcl9lbnZpcm9ubWVudFsnWERHX0NBQ0hFX0hPTUUnXSA9IHNlbGYuX3BvcnQuaG9zdC5maWxl c3lzdGVtLmpvaW4oc3RyKHNlbGYuX2RyaXZlcl90ZW1wZGlyKSwgJ2FwcGNhY2hlJykKKyAgICAg ICAgICAgIGRyaXZlcl9lbnZpcm9ubWVudFsnRFVNUFJFTkRFUlRSRUVfVEVNUCddID0gc3RyKHNl bGYuX2RyaXZlcl90ZW1wZGlyKQogICAgICAgICBkcml2ZXJfZW52aXJvbm1lbnRbJ1dBWUxBTkRf RElTUExBWSddID0gd2VzdG9uX3NvY2tldAogICAgICAgICBkcml2ZXJfZW52aXJvbm1lbnRbJ0dE S19CQUNLRU5EJ10gPSAnd2F5bGFuZCcKICAgICAgICAgaWYgZHJpdmVyX2Vudmlyb25tZW50Lmdl dCgnRElTUExBWScpOgpAQCAtODEsNiArODEsNyBAQCBjbGFzcyBXZXN0b25Ecml2ZXIoRHJpdmVy KToKIAogICAgIGRlZiBfc3RhcnQoc2VsZiwgcGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpOgog ICAgICAgICBzZWxmLnN0b3AoKQorICAgICAgICBzZWxmLl9kcml2ZXJfdGVtcGRpciA9IHNlbGYu X3BvcnQuX2RyaXZlcl90ZW1wZGlyKHNlbGYuX3RhcmdldF9ob3N0KQogICAgICAgICBzZWxmLl9j cmFzaGVkX3Byb2Nlc3NfbmFtZSA9IE5vbmUKICAgICAgICAgc2VsZi5fY3Jhc2hlZF9waWQgPSBO b25lCiAgICAgICAgIHNlbGYuX3NlcnZlcl9wcm9jZXNzID0gc2VsZi5fcG9ydC5fc2VydmVyX3By b2Nlc3NfY29uc3RydWN0b3Ioc2VsZi5fcG9ydCwgc2VsZi5fc2VydmVyX25hbWUsIHNlbGYuY21k X2xpbmUocGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpLCBzZWxmLl9zZXR1cF9lbnZpcm9uX2Zv cl90ZXN0KCkpCkBAIC05MiwxMSArOTMsNCBAQCBjbGFzcyBXZXN0b25Ecml2ZXIoRHJpdmVyKToK ICAgICAgICAgICAgICMgVGhlIFdlc3RvbiBwcm9jZXNzIGlzIHRlcm1pbmF0ZWQgaW5zdGVhZCBv ZiBraWxsZWQsIGdpdmluZyB0aGUgV2VzdG9uIGEgY2hhbmNlIHRvIGNsZWFuIHVwIGFmdGVyIGl0 c2VsZi4KICAgICAgICAgICAgIHNlbGYuX3dlc3Rvbl9wcm9jZXNzLnRlcm1pbmF0ZSgpCiAgICAg ICAgICAgICBzZWxmLl93ZXN0b25fcHJvY2VzcyA9IE5vbmUKLSAgICAgICAgaWYgZ2V0YXR0cihz ZWxmLCAnX2RyaXZlcl9kaXJlY3RvcnknLCBOb25lKToKLSAgICAgICAgICAgIHNlbGYuX3BvcnQu aG9zdC5maWxlc3lzdGVtLnJtdHJlZShzdHIoc2VsZi5fZHJpdmVyX2RpcmVjdG9yeSkpCiAKLSAg ICBkZWYgX2Vuc3VyZV9kcml2ZXJfdG1wZGlyX3N1YmRpcmVjdG9yeShzZWxmLCBzdWJkaXJlY3Rv cnkpOgotICAgICAgICBhc3NlcnQgZ2V0YXR0cihzZWxmLCAnX2RyaXZlcl9kaXJlY3RvcnknLCBO b25lKQotICAgICAgICBkaXJlY3RvcnlfcGF0aCA9IHNlbGYuX3BvcnQuaG9zdC5maWxlc3lzdGVt LmpvaW4oc3RyKHNlbGYuX2RyaXZlcl9kaXJlY3RvcnkpLCBzdWJkaXJlY3RvcnkpCi0gICAgICAg IHNlbGYuX3BvcnQuaG9zdC5maWxlc3lzdGVtLm1heWJlX21ha2VfZGlyZWN0b3J5KGRpcmVjdG9y eV9wYXRoKQotICAgICAgICByZXR1cm4gZGlyZWN0b3J5X3BhdGgKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC93ZXN0b25kcml2ZXJfdW5pdHRlc3QucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvd2VzdG9uZHJpdmVyX3VuaXR0ZXN0LnB5CmluZGV4IDYzNjE2 MzBiMDY3Li5iYzcxYWI5NDYyYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9w b3J0L3dlc3RvbmRyaXZlcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvd2VzdG9uZHJpdmVyX3VuaXR0ZXN0LnB5CkBAIC01MCw4ICs1MCw4IEBAIGNsYXNzIFdl c3Rvblh2ZmJEcml2ZXJEaXNwbGF5VGVzdCgpOgogCiAKIGNsYXNzIFdlc3RvbkRyaXZlclRlc3Qo dW5pdHRlc3QuVGVzdENhc2UpOgotICAgIGRlZiBtYWtlX2RyaXZlcihzZWxmLCBmaWxlc3lzdGVt PU5vbmUpOgotICAgICAgICBwb3J0ID0gUG9ydChNb2NrU3lzdGVtSG9zdChsb2dfZXhlY3V0aXZl PVRydWUsIGZpbGVzeXN0ZW09ZmlsZXN5c3RlbSksICd3ZXN0b25kcml2ZXJ0ZXN0cG9ydCcsIG9w dGlvbnM9TW9ja09wdGlvbnMoY29uZmlndXJhdGlvbj0nUmVsZWFzZScpKQorICAgIGRlZiBtYWtl X2RyaXZlcihzZWxmKToKKyAgICAgICAgcG9ydCA9IFBvcnQoTW9ja1N5c3RlbUhvc3QobG9nX2V4 ZWN1dGl2ZT1UcnVlKSwgJ3dlc3RvbmRyaXZlcnRlc3Rwb3J0Jywgb3B0aW9ucz1Nb2NrT3B0aW9u cyhjb25maWd1cmF0aW9uPSdSZWxlYXNlJykpCiAgICAgICAgIHBvcnQuX2NvbmZpZy5idWlsZF9k aXJlY3RvcnkgPSBsYW1iZGEgY29uZmlndXJhdGlvbjogIi9tb2NrX2J1aWxkIgogICAgICAgICBw b3J0Ll9zZXJ2ZXJfcHJvY2Vzc19jb25zdHJ1Y3RvciA9IE1vY2tTZXJ2ZXJQcm9jZXNzCiAKQEAg LTg1LDEzICs4NSwxMCBAQCBjbGFzcyBXZXN0b25Ecml2ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNl KToKICAgICAgICAgICAgIGRlZiB0ZXJtaW5hdGUoc2VsZik6CiAgICAgICAgICAgICAgICAgX2xv Zy5pbmZvKCJNT0NLIEZha2VXZXN0b25Qcm9jZXNzLnRlcm1pbmF0ZSIpCiAKLSAgICAgICAgZmls ZXN5c3RlbSA9IE1vY2tGaWxlU3lzdGVtKGRpcnM9WycvdG1wL3dlc3Rvbi1kcml2ZXItZGlyZWN0 b3J5J10pCi0gICAgICAgIGRyaXZlciA9IHNlbGYubWFrZV9kcml2ZXIoZmlsZXN5c3RlbSkKKyAg ICAgICAgZHJpdmVyID0gc2VsZi5tYWtlX2RyaXZlcigpCiAgICAgICAgIGRyaXZlci5fd2VzdG9u X3Byb2Nlc3MgPSBGYWtlV2VzdG9uUHJvY2VzcygpCi0gICAgICAgIGRyaXZlci5fZHJpdmVyX2Rp cmVjdG9yeSA9ICcvdG1wL3dlc3Rvbi1kcml2ZXItZGlyZWN0b3J5JwogCiAgICAgICAgIGV4cGVj dGVkX2xvZ3MgPSAiTU9DSyBGYWtlV2VzdG9uUHJvY2Vzcy50ZXJtaW5hdGVcbiIKICAgICAgICAg T3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIGRyaXZlci5zdG9wLCBbXSwgZXhw ZWN0ZWRfbG9ncz1leHBlY3RlZF9sb2dzKQogCiAgICAgICAgIHNlbGYuYXNzZXJ0SXNOb25lKGRy aXZlci5fd2VzdG9uX3Byb2Nlc3MpCi0gICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoZHJpdmVyLl9w b3J0Ll9maWxlc3lzdGVtLmV4aXN0cyhkcml2ZXIuX2RyaXZlcl9kaXJlY3RvcnkpKQpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3hvcmdkcml2ZXIucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQveG9yZ2RyaXZlci5weQppbmRleCA0ZDc3ODJjNzg4YS4uNTMz Mzk1NzI4MzkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC94b3JnZHJp dmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC94b3JnZHJpdmVyLnB5CkBA IC01MCwxOCArNTAsMTkgQEAgY2xhc3MgWG9yZ0RyaXZlcihEcml2ZXIpOgogICAgICAgICBzZWxm Ll9wb3J0Ll9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQoc2VydmVyX2Vudmlyb25tZW50 LCAnWEFVVEhPUklUWScpCiAgICAgICAgIHNlcnZlcl9lbnZpcm9ubWVudFsnR0RLX0JBQ0tFTkQn XSA9ICd4MTEnCiAgICAgICAgIHNlcnZlcl9lbnZpcm9ubWVudFsnTE9DQUxfUkVTT1VSQ0VfUk9P VCddID0gc2VsZi5fcG9ydC5sYXlvdXRfdGVzdHNfZGlyKCkKLSAgICAgICAgc2VydmVyX2Vudmly b25tZW50WydEVU1QUkVOREVSVFJFRV9URU1QJ10gPSBzdHIoc2VsZi5fZHJpdmVyX3RlbXBkaXIp Ci0gICAgICAgICMgQ3VycmVudGx5IG9uIFdlYktpdDIsIHRoZXJlIGlzIG5vIEFQSSBmb3Igc2V0 dGluZyB0aGUgYXBwbGljYXRpb24KLSAgICAgICAgIyBjYWNoZSBkaXJlY3RvcnkuIEVhY2ggd29y a2VyIHNob3VsZCBoYXZlIGl0J3Mgb3duIGFuZCBpdCBzaG91bGQgYmUKLSAgICAgICAgIyBjbGVh bmVkIGFmdGVyd2FyZHMsIHNvIHdlIHNldCBpdCB0byBpbnNpZGUgdGhlIHRlbXBvcmFyeSBmb2xk ZXIgYnkKLSAgICAgICAgIyBwcmVwZW5kaW5nIFhER19DQUNIRV9IT01FIHdpdGggRFVNUFJFTkRF UlRSRUVfVEVNUC4KLSAgICAgICAgc2VydmVyX2Vudmlyb25tZW50WydYREdfQ0FDSEVfSE9NRSdd ID0gc2VsZi5fcG9ydC5ob3N0LmZpbGVzeXN0ZW0uam9pbihzdHIoc2VsZi5fZHJpdmVyX3RlbXBk aXIpLCAnYXBwY2FjaGUnKQorICAgICAgICBpZiBzZWxmLl9kcml2ZXJfdGVtcGRpciBpcyBub3Qg Tm9uZToKKyAgICAgICAgICAgIHNlcnZlcl9lbnZpcm9ubWVudFsnRFVNUFJFTkRFUlRSRUVfVEVN UCddID0gc3RyKHNlbGYuX2RyaXZlcl90ZW1wZGlyKQorICAgICAgICAgICAgIyBDdXJyZW50bHkg b24gV2ViS2l0MiwgdGhlcmUgaXMgbm8gQVBJIGZvciBzZXR0aW5nIHRoZSBhcHBsaWNhdGlvbgor ICAgICAgICAgICAgIyBjYWNoZSBkaXJlY3RvcnkuIEVhY2ggd29ya2VyIHNob3VsZCBoYXZlIGl0 J3Mgb3duIGFuZCBpdCBzaG91bGQgYmUKKyAgICAgICAgICAgICMgY2xlYW5lZCBhZnRlcndhcmRz LCBzbyB3ZSBzZXQgaXQgdG8gaW5zaWRlIHRoZSB0ZW1wb3JhcnkgZm9sZGVyIGJ5CisgICAgICAg ICAgICAjIHByZXBlbmRpbmcgWERHX0NBQ0hFX0hPTUUgd2l0aCBEVU1QUkVOREVSVFJFRV9URU1Q LgorICAgICAgICAgICAgc2VydmVyX2Vudmlyb25tZW50WydYREdfQ0FDSEVfSE9NRSddID0gc2Vs Zi5fcG9ydC5ob3N0LmZpbGVzeXN0ZW0uam9pbihzdHIoc2VsZi5fZHJpdmVyX3RlbXBkaXIpLCAn YXBwY2FjaGUnKQogICAgICAgICByZXR1cm4gc2VydmVyX2Vudmlyb25tZW50CiAKICAgICBkZWYg X3N0YXJ0KHNlbGYsIHBpeGVsX3Rlc3RzLCBwZXJfdGVzdF9hcmdzKToKICAgICAgICAgc3VwZXIo WG9yZ0RyaXZlciwgc2VsZikuc3RvcCgpCiAKLSAgICAgICAgc2VsZi5fZHJpdmVyX3RlbXBkaXIg PSBzZWxmLl9wb3J0Lmhvc3QuZmlsZXN5c3RlbS5ta2R0ZW1wKHByZWZpeD0nJXMtJyAlIHNlbGYu X3NlcnZlcl9uYW1lKQorICAgICAgICBzZWxmLl9kcml2ZXJfdGVtcGRpciA9IHNlbGYuX3BvcnQu X2RyaXZlcl90ZW1wZGlyKHNlbGYuX3RhcmdldF9ob3N0KQogCiAgICAgICAgIHNlbGYuX2NyYXNo ZWRfcHJvY2Vzc19uYW1lID0gTm9uZQogICAgICAgICBzZWxmLl9jcmFzaGVkX3BpZCA9IE5vbmUK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC94dmZiZHJpdmVyLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3h2ZmJkcml2ZXIucHkKaW5kZXggODBkNjc0ODI5 NzAuLmUzMDRiZWJmMDA5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv eHZmYmRyaXZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQveHZmYmRyaXZl ci5weQpAQCAtOTksMTkgKzk5LDE5IEBAIGNsYXNzIFh2ZmJEcml2ZXIoRHJpdmVyKToKICAgICAg ICAgIyBXZSBtdXN0IGRvIHRoaXMgaGVyZSBiZWNhdXNlIHRoZSBESVNQTEFZIG51bWJlciBkZXBl bmRzIG9uIF93b3JrZXJfbnVtYmVyCiAgICAgICAgIGVudmlyb25tZW50WydESVNQTEFZJ10gPSAi OiVkIiAlIGRpc3BsYXlfaWQKICAgICAgICAgZW52aXJvbm1lbnRbJ0dES19CQUNLRU5EJ10gPSAn eDExJwotICAgICAgICBzZWxmLl9kcml2ZXJfdGVtcGRpciA9IHNlbGYuX3BvcnQuaG9zdC5maWxl c3lzdGVtLm1rZHRlbXAocHJlZml4PSclcy0nICUgc2VsZi5fc2VydmVyX25hbWUpCi0gICAgICAg IGVudmlyb25tZW50WydEVU1QUkVOREVSVFJFRV9URU1QJ10gPSBzdHIoc2VsZi5fZHJpdmVyX3Rl bXBkaXIpCiAgICAgICAgIGVudmlyb25tZW50WydMT0NBTF9SRVNPVVJDRV9ST09UJ10gPSBzZWxm Ll9wb3J0LmxheW91dF90ZXN0c19kaXIoKQotCi0gICAgICAgICMgQ3VycmVudGx5IG9uIFdlYktp dDIsIHRoZXJlIGlzIG5vIEFQSSBmb3Igc2V0dGluZyB0aGUgYXBwbGljYXRpb24KLSAgICAgICAg IyBjYWNoZSBkaXJlY3RvcnkuIEVhY2ggd29ya2VyIHNob3VsZCBoYXZlIGl0J3Mgb3duIGFuZCBp dCBzaG91bGQgYmUKLSAgICAgICAgIyBjbGVhbmVkIGFmdGVyd2FyZHMsIHNvIHdlIHNldCBpdCB0 byBpbnNpZGUgdGhlIHRlbXBvcmFyeSBmb2xkZXIgYnkKLSAgICAgICAgIyBwcmVwZW5kaW5nIFhE R19DQUNIRV9IT01FIHdpdGggRFVNUFJFTkRFUlRSRUVfVEVNUC4KLSAgICAgICAgZW52aXJvbm1l bnRbJ1hER19DQUNIRV9IT01FJ10gPSBzZWxmLl9wb3J0Lmhvc3QuZmlsZXN5c3RlbS5qb2luKHN0 cihzZWxmLl9kcml2ZXJfdGVtcGRpciksICdhcHBjYWNoZScpCisgICAgICAgIGlmIHNlbGYuX2Ry aXZlcl90ZW1wZGlyIGlzIG5vdCBOb25lOgorICAgICAgICAgICAgZW52aXJvbm1lbnRbJ0RVTVBS RU5ERVJUUkVFX1RFTVAnXSA9IHN0cihzZWxmLl9kcml2ZXJfdGVtcGRpcikKKyAgICAgICAgICAg ICMgQ3VycmVudGx5IG9uIFdlYktpdDIsIHRoZXJlIGlzIG5vIEFQSSBmb3Igc2V0dGluZyB0aGUg YXBwbGljYXRpb24KKyAgICAgICAgICAgICMgY2FjaGUgZGlyZWN0b3J5LiBFYWNoIHdvcmtlciBz aG91bGQgaGF2ZSBpdCdzIG93biBhbmQgaXQgc2hvdWxkIGJlCisgICAgICAgICAgICAjIGNsZWFu ZWQgYWZ0ZXJ3YXJkcywgc28gd2Ugc2V0IGl0IHRvIGluc2lkZSB0aGUgdGVtcG9yYXJ5IGZvbGRl ciBieQorICAgICAgICAgICAgIyBwcmVwZW5kaW5nIFhER19DQUNIRV9IT01FIHdpdGggRFVNUFJF TkRFUlRSRUVfVEVNUC4KKyAgICAgICAgICAgIGVudmlyb25tZW50WydYREdfQ0FDSEVfSE9NRSdd ID0gc2VsZi5fcG9ydC5ob3N0LmZpbGVzeXN0ZW0uam9pbihzdHIoc2VsZi5fZHJpdmVyX3RlbXBk aXIpLCAnYXBwY2FjaGUnKQogICAgICAgICByZXR1cm4gZW52aXJvbm1lbnQKIAogICAgIGRlZiBf c3RhcnQoc2VsZiwgcGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpOgogICAgICAgICBzZWxmLnN0 b3AoKQorICAgICAgICBzZWxmLl9kcml2ZXJfdGVtcGRpciA9IHNlbGYuX3BvcnQuX2RyaXZlcl90 ZW1wZGlyKHNlbGYuX3RhcmdldF9ob3N0KQogICAgICAgICBzZWxmLl9jcmFzaGVkX3Byb2Nlc3Nf bmFtZSA9IE5vbmUKICAgICAgICAgc2VsZi5fY3Jhc2hlZF9waWQgPSBOb25lCiAgICAgICAgIHNl bGYuX3NlcnZlcl9wcm9jZXNzID0gc2VsZi5fcG9ydC5fc2VydmVyX3Byb2Nlc3NfY29uc3RydWN0 b3Ioc2VsZi5fcG9ydCwgc2VsZi5fc2VydmVyX25hbWUsIHNlbGYuY21kX2xpbmUocGl4ZWxfdGVz dHMsIHBlcl90ZXN0X2FyZ3MpLCBzZWxmLl9zZXR1cF9lbnZpcm9uX2Zvcl90ZXN0KCkpCg==