69360 2011-10-04 12:02:09 -0700 new-run-webkit-tests appends "/Debug" or "/Release" to $WEBKITOUTPUTDIR 2012-06-20 14:22:48 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED NRWT P2 Normal --- 88680 1 rakuco dpranke abarth dpranke eric leandro ojan webkit.review.bot oldest_to_newest 477821 0 rakuco 2011-10-04 12:02:09 -0700 I have a custom build directory location, namely $webkitroot/WebKitBuild/Debug-{qt,efl,gtk}, so I export the $WEBKITOUTPUTDIR environment variable to that location. With old-run-webkit-tests, I can pass "--efl" and it will launch $WEBKITOUTPUTDIR/Programs/DumpRenderTree. However, if I pass "--product=efl --debug" to new-run-webkit-tests, it will call "webkit-build-directory --configuration --debug", which will return $WEBKITOUTPUTDIR/Debug. This, in turn, means n-r-w-t will try to launch $WEBKITOUTPUTDIR/Debug/Programs/DumpRenderTree, which does not exist. The problems seems to come from the fact that webkit-build-directory does not pass "--efl" or "--gtk" to webkitdirs.pm, so the usesPerConfigurationBuildDirectory function always returns false. 477824 1 eric 2011-10-04 12:04:04 -0700 I'm confused. You're expecting WEBKITOUTPUTDIR to be used directly without any /Debug suffix? 477828 2 rakuco 2011-10-04 12:11:22 -0700 Yes, just like o-w-r-t does -- in fact, I'd like to have from webkitdirs.pm's determineConfigurationProductDir behave the same way it does with o-r-w-t when usesPerConfigurationBuildDirectory returns true. 651716 3 dpranke 2012-06-18 14:16:09 -0700 it looks like after http://trac.webkit.org/changeset/103234 this is only true for gtk and apple win. 651747 4 148174 dpranke 2012-06-18 14:39:23 -0700 Created attachment 148174 Patch 652504 5 148174 eric 2012-06-19 09:01:38 -0700 Comment on attachment 148174 Patch I don't understand what this does. It seems like it woule be possible to test that Config with a MockExecutive makes the right call.. so we should test that, no? 652516 6 dpranke 2012-06-19 09:19:18 -0700 (In reply to comment #5) > (From update of attachment 148174 [details]) > I don't understand what this does. It seems like it woule be possible to test that Config with a MockExecutive makes the right call.. so we should test that, no? The change makes sure --gtk is passed to webkit-build-directory. In webkit-build-directory, if --gtk is passed, then it returns $WEBKITOUTPUTDIR instead of $WEBKITOUTPUTDIR/$configuration . I can add the mock test as you say. I was reluctant to add a test that actually verified that webkit-build-directory was doing something different for gtk specifically. 652644 7 148373 dpranke 2012-06-19 11:36:23 -0700 Created attachment 148373 add unit test 653878 8 148373 eric 2012-06-20 14:14:51 -0700 Comment on attachment 148373 add unit test OK. 653892 9 dpranke 2012-06-20 14:22:48 -0700 Committed r120863: <http://trac.webkit.org/changeset/120863> 148174 2012-06-18 14:39:23 -0700 2012-06-19 11:36:18 -0700 Patch bug-69360-20120618143922.patch text/plain 4265 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNjIzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDRjZWQ3OTg1MGQ5ODAyNmE2Njg3OTFhY2VhNTNkYzQ4 MDIwZjA4ZC4uMGFjMzI0ZTAzYTIzNDAwNjAyODYwNWE3NjFiOTY0MWU3NjRmMDkxMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDEyLTA2LTE4ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIG5ldy1ydW4td2Via2l0LXRlc3RzIGFwcGVuZHMgIi9EZWJ1ZyIgb3IgIi9SZWxlYXNl IiB0byAkV0VCS0lUT1VUUFVURElSCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02OTM2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFByb3BhZ2F0ZSB0aGUgJ3BvcnRfaW1wbGVtZW50YXRpb24nIHBhcnQgb2Yg dGhlIHBsYXRmb3JtIChpLmUuLAorICAgICAgICBndGsscXQsY2hyb21pdW0pIHRvIHdlYmtpdC1i dWlsZC1kaXJlY3Rvcnkgc28gdGhhdCB3ZSBjYW4gcGljaworICAgICAgICB1cCB0aGUgZ3RrLXNw ZWNpZmljIGhhbmRsaW5nIG9mIFdFQktJVE9VVFBVVERJUiAuLi4KKworICAgICAgICBJIGRpZG4n dCB3cml0ZSBhbnkgYWRkaXRpb25hbCB0ZXN0cyBmb3IgdGhpczsgdGVzdGluZyBpdAorICAgICAg ICBwcm9wZXJseSBpcyBhbiBpbnRlZ3JhdGlvbiB0ZXN0IGJldHdlZW4gdGhlIHB5dGhvbiBjb2Rl IGFuZCB0aGUKKyAgICAgICAgcGVybCBjb2RlLCB3aGljaCBJIHZlcmlmaWVkIGJ5IGhhbmQuCisK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHk6Cisg ICAgICAgIChQb3J0Ll9faW5pdF9fKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2NvbmZpZy5weToKKyAgICAgICAgKENvbmZpZy5fX2luaXRfXyk6CisgICAg ICAgIChDb25maWcuYnVpbGRfZGlyZWN0b3J5KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2NvbmZpZ19tb2NrLnB5OgorICAgICAgICAoTW9ja0NvbmZpZy5f X2luaXRfXyk6CisKIDIwMTItMDYtMTggIFphbiBEb2JlcnNlayAgPHphbmRvYmVyc2VrQGdtYWls LmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIxMjA1NDYpOiBJdCBtYWRlIDMgd2Via2l0cHkg dGVzdHMgZmFpbApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9iYXNlLnB5CmluZGV4IDYyZmJkY2VlZDYxODcyNGEzMTYwNDM1M2U4ZGM5MDk5NzU0OWNmOTUu Ljk3MzY2MDE4MzdhY2QyODZkYzAzMDcxNjBjOTc2OTU5ZmQzNDA0MDYgMTAwNzU1Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKQEAgLTEwNCw3ICsx MDQsNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgIHNlbGYuaG9zdCA9IGhvc3QKICAg ICAgICAgc2VsZi5fZXhlY3V0aXZlID0gaG9zdC5leGVjdXRpdmUKICAgICAgICAgc2VsZi5fZmls ZXN5c3RlbSA9IGhvc3QuZmlsZXN5c3RlbQotICAgICAgICBzZWxmLl9jb25maWcgPSBjb25maWcg b3IgcG9ydF9jb25maWcuQ29uZmlnKHNlbGYuX2V4ZWN1dGl2ZSwgc2VsZi5fZmlsZXN5c3RlbSkK KyAgICAgICAgc2VsZi5fY29uZmlnID0gY29uZmlnIG9yIHBvcnRfY29uZmlnLkNvbmZpZyhzZWxm Ll9leGVjdXRpdmUsIHNlbGYuX2ZpbGVzeXN0ZW0sIHNlbGYucG9ydF9uYW1lKQogCiAgICAgICAg IHNlbGYuX2hlbHBlciA9IE5vbmUKICAgICAgICAgc2VsZi5faHR0cF9zZXJ2ZXIgPSBOb25lCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2NvbmZp Zy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnLnB5 CmluZGV4IDkyOTdiODg3MmJiODVlNTBlYjE5MTIwOThjMjAwMWY4MWY5YmM5ZGUuLmRkOGYzMzFh Zjg3ZWZkZWMwMjYwNDc4OTc2YjlkM2ExYzdjNWE1YTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnLnB5CkBAIC02MSwxMiArNjEsMTMg QEAgY2xhc3MgQ29uZmlnKG9iamVjdCk6CiAgICAgICAgICJSZWxlYXNlIjogIi0tcmVsZWFzZSIs CiAgICAgfQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGV4ZWN1dGl2ZSwgZmlsZXN5c3RlbSk6 CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGV4ZWN1dGl2ZSwgZmlsZXN5c3RlbSwgcG9ydF9pbXBs ZW1lbnRhdGlvbj1Ob25lKToKICAgICAgICAgc2VsZi5fZXhlY3V0aXZlID0gZXhlY3V0aXZlCiAg ICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0gPSBmaWxlc3lzdGVtCiAgICAgICAgIHNlbGYuX3dlYmtp dF9iYXNlX2RpciA9IE5vbmUKICAgICAgICAgc2VsZi5fZGVmYXVsdF9jb25maWd1cmF0aW9uID0g Tm9uZQogICAgICAgICBzZWxmLl9idWlsZF9kaXJlY3RvcmllcyA9IHt9CisgICAgICAgIHNlbGYu X3BvcnRfaW1wbGVtZW50YXRpb24gPSBwb3J0X2ltcGxlbWVudGF0aW9uCiAKICAgICBkZWYgYnVp bGRfZGlyZWN0b3J5KHNlbGYsIGNvbmZpZ3VyYXRpb24pOgogICAgICAgICAiIiJSZXR1cm5zIHRo ZSBwYXRoIHRvIHRoZSBidWlsZCBkaXJlY3RvcnkgZm9yIHRoZSBjb25maWd1cmF0aW9uLiIiIgpA QCAtNzYsNiArNzcsOSBAQCBjbGFzcyBDb25maWcob2JqZWN0KToKICAgICAgICAgICAgIGNvbmZp Z3VyYXRpb24gPSAiIgogICAgICAgICAgICAgZmxhZ3MgPSBbXQogCisgICAgICAgIGlmIHNlbGYu X3BvcnRfaW1wbGVtZW50YXRpb246CisgICAgICAgICAgICBmbGFncy5hcHBlbmQoJy0tJyArIHNl bGYuX3BvcnRfaW1wbGVtZW50YXRpb24pCisKICAgICAgICAgaWYgbm90IHNlbGYuX2J1aWxkX2Rp cmVjdG9yaWVzLmdldChjb25maWd1cmF0aW9uKToKICAgICAgICAgICAgIGFyZ3MgPSBbInBlcmwi LCBzZWxmLnNjcmlwdF9wYXRoKCJ3ZWJraXQtYnVpbGQtZGlyZWN0b3J5IildICsgZmxhZ3MKICAg ICAgICAgICAgIG91dHB1dCA9IHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChhcmdzLCBjd2Q9 c2VsZi53ZWJraXRfYmFzZV9kaXIoKSwgcmV0dXJuX3N0ZGVycj1GYWxzZSkucnN0cmlwKCkKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29uZmln X21vY2sucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2NvbmZp Z19tb2NrLnB5CmluZGV4IGU1MGFkNGY4NGIzZjQ0MzRmMzg3NTk0Nzk0ZGNlMWI0ZjkxZjI5NWIu LjU0NzZlNGJhYjI2ZjFlZWM4YjNhZGFmYThjZjdhZTk3YjEyYWIwNmMgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnX21vY2sucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jb25maWdfbW9jay5w eQpAQCAtMzgsOSArMzgsMTAgQEAgY2xhc3MgTW9ja0NvbmZpZyhvYmplY3QpOgogICAgICAgICAi UmVsZWFzZSI6ICItLXJlbGVhc2UiLAogICAgIH0KIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBm aWxlc3lzdGVtPU5vbmUsIGRlZmF1bHRfY29uZmlndXJhdGlvbj0nUmVsZWFzZScpOgorICAgIGRl ZiBfX2luaXRfXyhzZWxmLCBmaWxlc3lzdGVtPU5vbmUsIGRlZmF1bHRfY29uZmlndXJhdGlvbj0n UmVsZWFzZScsIHBvcnRfaW1wbGVtZW50YXRpb249Tm9uZSk6CiAgICAgICAgIHNlbGYuX2ZpbGVz eXN0ZW0gPSBmaWxlc3lzdGVtIG9yIE1vY2tGaWxlU3lzdGVtKCkKICAgICAgICAgc2VsZi5fZGVm YXVsdF9jb25maWd1cmF0aW9uID0gZGVmYXVsdF9jb25maWd1cmF0aW9uCisgICAgICAgIHNlbGYu X3BvcnRfaW1wbG1lbnRhdGlvbiA9IHBvcnRfaW1wbGVtZW50YXRpb24KIAogICAgIGRlZiBmbGFn X2Zvcl9jb25maWd1cmF0aW9uKHNlbGYsIGNvbmZpZ3VyYXRpb24pOgogICAgICAgICByZXR1cm4g c2VsZi5fRkxBR1NfRlJPTV9DT05GSUdVUkFUSU9OU1tjb25maWd1cmF0aW9uXQo= 148373 2012-06-19 11:36:23 -0700 2012-06-20 14:14:51 -0700 add unit test bug-69360-20120619113622.patch text/plain 6226 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNzQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2JlNTY1OGEzZWE4Yjc3MDdhOWMzNjI1ZTc5YjQ3N2Fm NGRlMjZiYS4uYjcyMmEzNGJlNjY2NzY2YzQwMzEyZWYwMzljMjE1YmFjNWM5MjU0NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDEyLTA2LTE4ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIG5ldy1ydW4td2Via2l0LXRlc3RzIGFwcGVuZHMgIi9EZWJ1ZyIgb3IgIi9SZWxlYXNl IiB0byAkV0VCS0lUT1VUUFVURElSCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02OTM2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFByb3BhZ2F0ZSB0aGUgJ3BvcnRfaW1wbGVtZW50YXRpb24nIHBhcnQgb2Yg dGhlIHBsYXRmb3JtIChpLmUuLAorICAgICAgICBndGsscXQsY2hyb21pdW0pIHRvIHdlYmtpdC1i dWlsZC1kaXJlY3Rvcnkgc28gdGhhdCB3ZSBjYW4gcGljaworICAgICAgICB1cCB0aGUgZ3RrLXNw ZWNpZmljIGhhbmRsaW5nIG9mIFdFQktJVE9VVFBVVERJUiAuLi4KKworICAgICAgICBJIGRpZG4n dCB3cml0ZSBhbnkgYWRkaXRpb25hbCB0ZXN0cyBmb3IgdGhpczsgdGVzdGluZyBpdAorICAgICAg ICBwcm9wZXJseSBpcyBhbiBpbnRlZ3JhdGlvbiB0ZXN0IGJldHdlZW4gdGhlIHB5dGhvbiBjb2Rl IGFuZCB0aGUKKyAgICAgICAgcGVybCBjb2RlLCB3aGljaCBJIHZlcmlmaWVkIGJ5IGhhbmQuCisK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHk6Cisg ICAgICAgIChQb3J0Ll9faW5pdF9fKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2NvbmZpZy5weToKKyAgICAgICAgKENvbmZpZy5fX2luaXRfXyk6CisgICAg ICAgIChDb25maWcuYnVpbGRfZGlyZWN0b3J5KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2NvbmZpZ19tb2NrLnB5OgorICAgICAgICAoTW9ja0NvbmZpZy5f X2luaXRfXyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j b25maWdfdW5pdHRlc3QucHk6CisgICAgICAgIChDb25maWdUZXN0LnRlc3RfYnVpbGRfZGlyZWN0 b3J5X3Bhc3Nlc19wb3J0X2ltcGxlbWVudGF0aW9uKToKKwogMjAxMi0wNi0xOSAgRGlyayBQcmFu a2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OIChOUldUKTog UmVzdWx0cyBmb3IgbmV3IG5vbi10ZXh0LW9ubHkgdGVzdHMgYXJlIGFsd2F5cyBwdXQgaW4gdGhl IG1vc3Qtc3BlY2lmaWMgcGxhdGZvcm0gZGlyZWN0b3J5CmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKaW5kZXggOWU3M2IyYzU1ZmU4M2E0NDkz Y2RkZDYzM2ZhOWE0OTA3MTA4NjliYy4uYmI5ODNlYzNiOTk5MWE3ZDdmMDNlOGE3ZGUwOTdjMDgw NTgzMTM3ZiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9iYXNlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvYmFzZS5weQpAQCAtMTA0LDcgKzEwNCw3IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAg ICAgc2VsZi5ob3N0ID0gaG9zdAogICAgICAgICBzZWxmLl9leGVjdXRpdmUgPSBob3N0LmV4ZWN1 dGl2ZQogICAgICAgICBzZWxmLl9maWxlc3lzdGVtID0gaG9zdC5maWxlc3lzdGVtCi0gICAgICAg IHNlbGYuX2NvbmZpZyA9IGNvbmZpZyBvciBwb3J0X2NvbmZpZy5Db25maWcoc2VsZi5fZXhlY3V0 aXZlLCBzZWxmLl9maWxlc3lzdGVtKQorICAgICAgICBzZWxmLl9jb25maWcgPSBjb25maWcgb3Ig cG9ydF9jb25maWcuQ29uZmlnKHNlbGYuX2V4ZWN1dGl2ZSwgc2VsZi5fZmlsZXN5c3RlbSwgc2Vs Zi5wb3J0X25hbWUpCiAKICAgICAgICAgc2VsZi5faGVscGVyID0gTm9uZQogICAgICAgICBzZWxm Ll9odHRwX3NlcnZlciA9IE5vbmUKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9jb25maWcucHkKaW5kZXggOTI5N2I4ODcyYmI4NWU1MGViMTkxMjA5OGMy MDAxZjgxZjliYzlkZS4uZGQ4ZjMzMWFmODdlZmRlYzAyNjA0Nzg5NzZiOWQzYTFjN2M1YTVhOSAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jb25m aWcucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jb25m aWcucHkKQEAgLTYxLDEyICs2MSwxMyBAQCBjbGFzcyBDb25maWcob2JqZWN0KToKICAgICAgICAg IlJlbGVhc2UiOiAiLS1yZWxlYXNlIiwKICAgICB9CiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwg ZXhlY3V0aXZlLCBmaWxlc3lzdGVtKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgZXhlY3V0aXZl LCBmaWxlc3lzdGVtLCBwb3J0X2ltcGxlbWVudGF0aW9uPU5vbmUpOgogICAgICAgICBzZWxmLl9l eGVjdXRpdmUgPSBleGVjdXRpdmUKICAgICAgICAgc2VsZi5fZmlsZXN5c3RlbSA9IGZpbGVzeXN0 ZW0KICAgICAgICAgc2VsZi5fd2Via2l0X2Jhc2VfZGlyID0gTm9uZQogICAgICAgICBzZWxmLl9k ZWZhdWx0X2NvbmZpZ3VyYXRpb24gPSBOb25lCiAgICAgICAgIHNlbGYuX2J1aWxkX2RpcmVjdG9y aWVzID0ge30KKyAgICAgICAgc2VsZi5fcG9ydF9pbXBsZW1lbnRhdGlvbiA9IHBvcnRfaW1wbGVt ZW50YXRpb24KIAogICAgIGRlZiBidWlsZF9kaXJlY3Rvcnkoc2VsZiwgY29uZmlndXJhdGlvbik6 CiAgICAgICAgICIiIlJldHVybnMgdGhlIHBhdGggdG8gdGhlIGJ1aWxkIGRpcmVjdG9yeSBmb3Ig dGhlIGNvbmZpZ3VyYXRpb24uIiIiCkBAIC03Niw2ICs3Nyw5IEBAIGNsYXNzIENvbmZpZyhvYmpl Y3QpOgogICAgICAgICAgICAgY29uZmlndXJhdGlvbiA9ICIiCiAgICAgICAgICAgICBmbGFncyA9 IFtdCiAKKyAgICAgICAgaWYgc2VsZi5fcG9ydF9pbXBsZW1lbnRhdGlvbjoKKyAgICAgICAgICAg IGZsYWdzLmFwcGVuZCgnLS0nICsgc2VsZi5fcG9ydF9pbXBsZW1lbnRhdGlvbikKKwogICAgICAg ICBpZiBub3Qgc2VsZi5fYnVpbGRfZGlyZWN0b3JpZXMuZ2V0KGNvbmZpZ3VyYXRpb24pOgogICAg ICAgICAgICAgYXJncyA9IFsicGVybCIsIHNlbGYuc2NyaXB0X3BhdGgoIndlYmtpdC1idWlsZC1k aXJlY3RvcnkiKV0gKyBmbGFncwogICAgICAgICAgICAgb3V0cHV0ID0gc2VsZi5fZXhlY3V0aXZl LnJ1bl9jb21tYW5kKGFyZ3MsIGN3ZD1zZWxmLndlYmtpdF9iYXNlX2RpcigpLCByZXR1cm5fc3Rk ZXJyPUZhbHNlKS5yc3RyaXAoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9jb25maWdfbW9jay5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnX21vY2sucHkKaW5kZXggZTUwYWQ0Zjg0YjNmNDQzNGYz ODc1OTQ3OTRkY2UxYjRmOTFmMjk1Yi4uNTQ3NmU0YmFiMjZmMWVlYzhiM2FkYWZhOGNmN2FlOTdi MTJhYjA2YyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9jb25maWdfbW9jay5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2NvbmZpZ19tb2NrLnB5CkBAIC0zOCw5ICszOCwxMCBAQCBjbGFzcyBNb2NrQ29u ZmlnKG9iamVjdCk6CiAgICAgICAgICJSZWxlYXNlIjogIi0tcmVsZWFzZSIsCiAgICAgfQogCi0g ICAgZGVmIF9faW5pdF9fKHNlbGYsIGZpbGVzeXN0ZW09Tm9uZSwgZGVmYXVsdF9jb25maWd1cmF0 aW9uPSdSZWxlYXNlJyk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGZpbGVzeXN0ZW09Tm9uZSwg ZGVmYXVsdF9jb25maWd1cmF0aW9uPSdSZWxlYXNlJywgcG9ydF9pbXBsZW1lbnRhdGlvbj1Ob25l KToKICAgICAgICAgc2VsZi5fZmlsZXN5c3RlbSA9IGZpbGVzeXN0ZW0gb3IgTW9ja0ZpbGVTeXN0 ZW0oKQogICAgICAgICBzZWxmLl9kZWZhdWx0X2NvbmZpZ3VyYXRpb24gPSBkZWZhdWx0X2NvbmZp Z3VyYXRpb24KKyAgICAgICAgc2VsZi5fcG9ydF9pbXBsbWVudGF0aW9uID0gcG9ydF9pbXBsZW1l bnRhdGlvbgogCiAgICAgZGVmIGZsYWdfZm9yX2NvbmZpZ3VyYXRpb24oc2VsZiwgY29uZmlndXJh dGlvbik6CiAgICAgICAgIHJldHVybiBzZWxmLl9GTEFHU19GUk9NX0NPTkZJR1VSQVRJT05TW2Nv bmZpZ3VyYXRpb25dCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2NvbmZpZ191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY29uZmlnX3VuaXR0ZXN0LnB5CmluZGV4IGM3ZDIyYzk2NjJlNzNhYTdi Mjk0NzM5YTIxNTE2YjQ5YTIxNmI0ZWQuLjk2YmE1ZmY1ODI3YTI0MDliZDIxNzQ5NjYxNDY3ODE2 ZTgwNDA4MmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY29uZmlnX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY29uZmlnX3VuaXR0ZXN0LnB5CkBAIC00NiwxMCArNDYsMTAgQEAgY2xh c3MgQ29uZmlnVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRlYXJEb3duKHNlbGYp OgogICAgICAgICBjb25maWcuY2xlYXJfY2FjaGVkX2NvbmZpZ3VyYXRpb24oKQogCi0gICAgZGVm IG1ha2VfY29uZmlnKHNlbGYsIG91dHB1dD0nJywgZmlsZXM9Tm9uZSwgZXhpdF9jb2RlPTAsIGV4 Y2VwdGlvbj1Ob25lLCBydW5fY29tbWFuZF9mbj1Ob25lLCBzdGRlcnI9JycpOgorICAgIGRlZiBt YWtlX2NvbmZpZyhzZWxmLCBvdXRwdXQ9JycsIGZpbGVzPU5vbmUsIGV4aXRfY29kZT0wLCBleGNl cHRpb249Tm9uZSwgcnVuX2NvbW1hbmRfZm49Tm9uZSwgc3RkZXJyPScnLCBwb3J0X2ltcGxlbWVu dGF0aW9uPU5vbmUpOgogICAgICAgICBlID0gTW9ja0V4ZWN1dGl2ZTIob3V0cHV0PW91dHB1dCwg ZXhpdF9jb2RlPWV4aXRfY29kZSwgZXhjZXB0aW9uPWV4Y2VwdGlvbiwgcnVuX2NvbW1hbmRfZm49 cnVuX2NvbW1hbmRfZm4sIHN0ZGVycj1zdGRlcnIpCiAgICAgICAgIGZzID0gTW9ja0ZpbGVTeXN0 ZW0oZmlsZXMpCi0gICAgICAgIHJldHVybiBjb25maWcuQ29uZmlnKGUsIGZzKQorICAgICAgICBy ZXR1cm4gY29uZmlnLkNvbmZpZyhlLCBmcywgcG9ydF9pbXBsZW1lbnRhdGlvbj1wb3J0X2ltcGxl bWVudGF0aW9uKQogCiAgICAgZGVmIGFzc2VydF9jb25maWd1cmF0aW9uKHNlbGYsIGNvbnRlbnRz LCBleHBlY3RlZCk6CiAgICAgICAgICMgVGhpcyB0ZXN0cyB0aGF0IGEgY29uZmlndXJhdGlvbiBm aWxlIGNvbnRhaW5pbmcKQEAgLTkxLDYgKzkxLDEzIEBAIGNsYXNzIENvbmZpZ1Rlc3QodW5pdHRl c3QuVGVzdENhc2UpOgogICAgICAgICBjID0gc2VsZi5tYWtlX2NvbmZpZyhvdXRwdXQ9Jy9XZWJL aXRCdWlsZC8nLCBzdGRlcnI9Im1vY2sgc3RkZXJyIG91dHB1dCBmcm9tIHdlYmtpdC1idWlsZC1k aXJlY3RvcnkiKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGMuYnVpbGRfZGlyZWN0b3J5KE5v bmUpLCAnL1dlYktpdEJ1aWxkLycpCiAKKyAgICBkZWYgdGVzdF9idWlsZF9kaXJlY3RvcnlfcGFz c2VzX3BvcnRfaW1wbGVtZW50YXRpb24oc2VsZik6CisgICAgICAgIGRlZiBtb2NrX3J1bl9jb21t YW5kKGFyZ19saXN0KToKKyAgICAgICAgICAgIHNlbGYuYXNzZXRFcXVhbHMoJy0tZ3RrJyBpbiBh cmdfbGlzdCkKKyAgICAgICAgICAgIHJldHVybiAnL3RtcCcKKworICAgICAgICBjID0gc2VsZi5t YWtlX2NvbmZpZyhydW5fY29tbWFuZF9mbj1tb2NrX3J1bl9jb21tYW5kLCBwb3J0X2ltcGxlbWVu dGF0aW9uPSdndGsnKQorCiAgICAgZGVmIHRlc3RfZGVmYXVsdF9jb25maWd1cmF0aW9uX19yZWxl YXNlKHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydF9jb25maWd1cmF0aW9uKCdSZWxlYXNlJywg J1JlbGVhc2UnKQogCg==