52754 2011-01-19 15:08:32 -0800 nrwt: remove fs refs from layout_package/json* modules 2011-01-19 20:19:04 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 52753 52756 1 dpranke dpranke eric mihaip ojan tony oldest_to_newest 336855 0 dpranke 2011-01-19 15:08:32 -0800 nrwt: remove fs refs from layout_package/json* modules 336871 1 79501 dpranke 2011-01-19 15:26:42 -0800 Created attachment 79501 Patch 337072 2 dpranke 2011-01-19 20:17:19 -0800 Committed r76200: <http://trac.webkit.org/changeset/76200> 337073 3 dpranke 2011-01-19 20:18:50 -0800 Note that I committed a slight variation unreviewed to fix a couple of issues introduced by landing 52753 and not this one, as well as a couple of bugs that were revealed when I was testing this (all of which were causing build failures). 79501 2011-01-19 15:26:42 -0800 2011-01-19 20:19:04 -0800 Patch bug-52754-20110119152640.patch text/plain 8687 dpranke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyNzJj MmZiNzJhYjRmYmM4Mjc4MTU2ZjE1YzdjYTQxMWFmNDFjY2MzLi4yNWI2MjM5YzRlNjlkNjE3NGVl MmFjMWMwMmI0MjQyNGM3ZjczOTg4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTggQEAKIAogICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBucnd0OiByZW1vdmUgZnMgcmVmcyBmcm9tIGxheW91 dF9wYWNrYWdlL2pzb24qCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTUyNzU0CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3VsdHNfZ2VuZXJhdG9yLnB5OgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fbGF5b3V0X3Jl c3VsdHNfZ2VuZXJhdG9yLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0b3JfdW5pdHRlc3QucHk6CisK KzIwMTEtMDEtMTkgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgcmVtb3ZlIGZzIHJlZnMg ZnJvbSB0ZXN0X3J1bm5lciwgZHVtcF9yZW5kZXJfdHJlZV90aHJlYWQKIAogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTI3NTMKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fbGF5 b3V0X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9sYXlvdXRfcmVzdWx0c19nZW5lcmF0b3IucHkKaW5k ZXggYjA1NGM1YjIzMDU0ZmY5ZjBjOGVmYzk0YWQxNGJhY2NiMWRiNGNiZi4uMzI2N2ZiN2RkYzUz NmFkNzFlYjZhYTA1OGExMzEwNTA2NTJmOWI0OSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9sYXlvdXRfcmVzdWx0c19n ZW5lcmF0b3IucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5 b3V0X3BhY2thZ2UvanNvbl9sYXlvdXRfcmVzdWx0c19nZW5lcmF0b3IucHkKQEAgLTI3LDcgKzI3 LDYgQEAKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KIAogaW1wb3J0IGxvZ2dpbmcKLWltcG9ydCBvcwogCiBmcm9t IHdlYmtpdHB5LmxheW91dF90ZXN0cy5sYXlvdXRfcGFja2FnZSBpbXBvcnQganNvbl9yZXN1bHRz X2dlbmVyYXRvcgogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubGF5b3V0X3BhY2thZ2UgaW1w b3J0IHRlc3RfZXhwZWN0YXRpb25zCkBAIC02NiwxMiArNjUsMTEgQEAgY2xhc3MgSlNPTkxheW91 dFJlc3VsdHNHZW5lcmF0b3IoanNvbl9yZXN1bHRzX2dlbmVyYXRvci5KU09OUmVzdWx0c0dlbmVy YXRvckJhc2UKICAgICAgICAgICAgICAgcmVzdWx0cy4KICAgICAgICAgIiIiCiAgICAgICAgIHN1 cGVyKEpTT05MYXlvdXRSZXN1bHRzR2VuZXJhdG9yLCBzZWxmKS5fX2luaXRfXygKLSAgICAgICAg ICAgIGJ1aWxkZXJfbmFtZSwgYnVpbGRfbmFtZSwgYnVpbGRfbnVtYmVyLCByZXN1bHRzX2ZpbGVf YmFzZV9wYXRoLAorICAgICAgICAgICAgcG9ydCwgYnVpbGRlcl9uYW1lLCBidWlsZF9uYW1lLCBi dWlsZF9udW1iZXIsIHJlc3VsdHNfZmlsZV9iYXNlX3BhdGgsCiAgICAgICAgICAgICBidWlsZGVy X2Jhc2VfdXJsLCB7fSwgcG9ydC50ZXN0X3JlcG9zaXRvcnlfcGF0aHMoKSwKICAgICAgICAgICAg IGdlbmVyYXRlX2luY3JlbWVudGFsX3Jlc3VsdHMsIHRlc3RfcmVzdWx0c19zZXJ2ZXIsCiAgICAg ICAgICAgICB0ZXN0X3R5cGUsIG1hc3Rlcl9uYW1lKQogCi0gICAgICAgIHNlbGYuX3BvcnQgPSBw b3J0CiAgICAgICAgIHNlbGYuX2V4cGVjdGF0aW9ucyA9IGV4cGVjdGF0aW9ucwogCiAgICAgICAg ICMgV2Ugd2FudCByZWxhdGl2ZSBwYXRocyB0byBMYXlvdXRUZXN0IHJvb3QgZm9yIEpTT04gb3V0 cHV0LgpAQCAtMTgxLDkgKzE3OSw5IEBAIGNsYXNzIEpTT05MYXlvdXRSZXN1bHRzR2VuZXJhdG9y KGpzb25fcmVzdWx0c19nZW5lcmF0b3IuSlNPTlJlc3VsdHNHZW5lcmF0b3JCYXNlCiAgICAgICAg ICAgICB0ZXN0LCB0ZXN0X25hbWUsIHRlc3RzKQogCiAgICAgICAgICMgUmVtb3ZlIHRlc3RzIHRo YXQgZG9uJ3QgZXhpc3QgYW55bW9yZS4KLSAgICAgICAgZnVsbF9wYXRoID0gb3MucGF0aC5qb2lu KHNlbGYuX3BvcnQubGF5b3V0X3Rlc3RzX2RpcigpLCB0ZXN0X25hbWUpCi0gICAgICAgIGZ1bGxf cGF0aCA9IG9zLnBhdGgubm9ybXBhdGgoZnVsbF9wYXRoKQotICAgICAgICBpZiBub3Qgb3MucGF0 aC5leGlzdHMoZnVsbF9wYXRoKToKKyAgICAgICAgZnVsbF9wYXRoID0gc2VsZi5fZnMuam9pbihz ZWxmLl9wb3J0LmxheW91dF90ZXN0c19kaXIoKSwgdGVzdF9uYW1lKQorICAgICAgICBmdWxsX3Bh dGggPSBzZWxmLl9mcy5ub3JtcGF0aChmdWxsX3BhdGgpCisgICAgICAgIGlmIG5vdCBzZWxmLl9m cy5leGlzdHMoZnVsbF9wYXRoKToKICAgICAgICAgICAgIGRlbCB0ZXN0c1t0ZXN0X25hbWVdCiAK ICAgICBkZWYgX2dldF9mYWlsdXJlX3N1bW1hcnlfZW50cnkoc2VsZiwgdGltZWxpbmUpOgpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2th Z2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0b3IucHkKaW5kZXgg MTJlNjViMmY5ZGZjMzljZDI5YjI0NTQzYTYzMzFlMjQ3M2Q0MTA2OC4uMzJmZmQ3MWZlNzBlNjJi NzJmZjU3ZjJmYzE1MzVlY2JmMjM1ZDlhNyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvci5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2Fn ZS9qc29uX3Jlc3VsdHNfZ2VuZXJhdG9yLnB5CkBAIC0yNiwxMSArMjYsNyBAQAogIyAoSU5DTFVE SU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRI RSBVU0UKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KIAotZnJvbSBfX2Z1dHVyZV9fIGltcG9ydCB3aXRoX3N0YXRl bWVudAotCi1pbXBvcnQgY29kZWNzCiBpbXBvcnQgbG9nZ2luZwotaW1wb3J0IG9zCiBpbXBvcnQg c3VicHJvY2VzcwogaW1wb3J0IHN5cwogaW1wb3J0IHRpbWUKQEAgLTExOCw3ICsxMTQsNyBAQCBj bGFzcyBKU09OUmVzdWx0c0dlbmVyYXRvckJhc2Uob2JqZWN0KToKICAgICBVUkxfRk9SX1RFU1Rf TElTVF9KU09OID0gXAogICAgICAgICAiaHR0cDovLyVzL3Rlc3RmaWxlP2J1aWxkZXI9JXMmbmFt ZT0lcyZ0ZXN0bGlzdGpzb249MSZ0ZXN0dHlwZT0lcyIKIAotICAgIGRlZiBfX2luaXRfXyhzZWxm LCBidWlsZGVyX25hbWUsIGJ1aWxkX25hbWUsIGJ1aWxkX251bWJlciwKKyAgICBkZWYgX19pbml0 X18oc2VsZiwgcG9ydCwgYnVpbGRlcl9uYW1lLCBidWlsZF9uYW1lLCBidWlsZF9udW1iZXIsCiAg ICAgICAgIHJlc3VsdHNfZmlsZV9iYXNlX3BhdGgsIGJ1aWxkZXJfYmFzZV91cmwsCiAgICAgICAg IHRlc3RfcmVzdWx0c19tYXAsIHN2bl9yZXBvc2l0b3JpZXM9Tm9uZSwKICAgICAgICAgZ2VuZXJh dGVfaW5jcmVtZW50YWxfcmVzdWx0cz1GYWxzZSwKQEAgLTEyOSw2ICsxMjUsNyBAQCBjbGFzcyBK U09OUmVzdWx0c0dlbmVyYXRvckJhc2Uob2JqZWN0KToKICAgICAgICAgaWYgaXQgaXMgbm90IGZv dW5kIGxvY2FsbHkuCiAKICAgICAgICAgQXJncworICAgICAgICAgIHBvcnQ6IHBvcnQtc3BlY2lm aWMgd3JhcHBlcgogICAgICAgICAgIGJ1aWxkZXJfbmFtZTogdGhlIGJ1aWxkZXIgbmFtZSAoZS5n LiBXZWJraXQpLgogICAgICAgICAgIGJ1aWxkX25hbWU6IHRoZSBidWlsZCBuYW1lIChlLmcuIHdl YmtpdC1yZWwpLgogICAgICAgICAgIGJ1aWxkX251bWJlcjogdGhlIGJ1aWxkIG51bWJlci4KQEAg LTE0NiwxNCArMTQzLDE2IEBAIGNsYXNzIEpTT05SZXN1bHRzR2VuZXJhdG9yQmFzZShvYmplY3Qp OgogICAgICAgICAgIHRlc3RfdHlwZTogdGVzdCB0eXBlIHN0cmluZyAoZS5nLiAnbGF5b3V0LXRl c3RzJykuCiAgICAgICAgICAgbWFzdGVyX25hbWU6IHRoZSBuYW1lIG9mIHRoZSBidWlsZGJvdCBt YXN0ZXIuCiAgICAgICAgICIiIgorICAgICAgICBzZWxmLl9wb3J0ID0gcG9ydAorICAgICAgICBz ZWxmLl9mcyA9IHBvcnQuX2ZpbGVzeXN0ZW0KICAgICAgICAgc2VsZi5fYnVpbGRlcl9uYW1lID0g YnVpbGRlcl9uYW1lCiAgICAgICAgIHNlbGYuX2J1aWxkX25hbWUgPSBidWlsZF9uYW1lCiAgICAg ICAgIHNlbGYuX2J1aWxkX251bWJlciA9IGJ1aWxkX251bWJlcgogICAgICAgICBzZWxmLl9idWls ZGVyX2Jhc2VfdXJsID0gYnVpbGRlcl9iYXNlX3VybAogICAgICAgICBzZWxmLl9yZXN1bHRzX2Rp cmVjdG9yeSA9IHJlc3VsdHNfZmlsZV9iYXNlX3BhdGgKLSAgICAgICAgc2VsZi5fcmVzdWx0c19m aWxlX3BhdGggPSBvcy5wYXRoLmpvaW4ocmVzdWx0c19maWxlX2Jhc2VfcGF0aCwKKyAgICAgICAg c2VsZi5fcmVzdWx0c19maWxlX3BhdGggPSBzZWxmLl9mcy5qb2luKHJlc3VsdHNfZmlsZV9iYXNl X3BhdGgsCiAgICAgICAgICAgICBzZWxmLlJFU1VMVFNfRklMRU5BTUUpCi0gICAgICAgIHNlbGYu X2luY3JlbWVudGFsX3Jlc3VsdHNfZmlsZV9wYXRoID0gb3MucGF0aC5qb2luKAorICAgICAgICBz ZWxmLl9pbmNyZW1lbnRhbF9yZXN1bHRzX2ZpbGVfcGF0aCA9IHNlbGYuX2ZzLmpvaW4oCiAgICAg ICAgICAgICByZXN1bHRzX2ZpbGVfYmFzZV9wYXRoLCBzZWxmLklOQ1JFTUVOVEFMX1JFU1VMVFNf RklMRU5BTUUpCiAKICAgICAgICAgc2VsZi5fdGVzdF9yZXN1bHRzX21hcCA9IHRlc3RfcmVzdWx0 c19tYXAKQEAgLTI1NCw3ICsyNTMsNyBAQCBjbGFzcyBKU09OUmVzdWx0c0dlbmVyYXRvckJhc2Uo b2JqZWN0KToKICAgICAgICAgICAgICAgICAgKCJ0ZXN0dHlwZSIsIHNlbGYuX3Rlc3RfdHlwZSks CiAgICAgICAgICAgICAgICAgICgibWFzdGVyIiwgc2VsZi5fbWFzdGVyX25hbWUpXQogCi0gICAg ICAgIGZpbGVzID0gWyhmaWxlLCBvcy5wYXRoLmpvaW4oc2VsZi5fcmVzdWx0c19kaXJlY3Rvcnks IGZpbGUpKQorICAgICAgICBmaWxlcyA9IFsoZmlsZSwgc2VsZi5fZnMuam9pbihzZWxmLl9yZXN1 bHRzX2RpcmVjdG9yeSwgZmlsZSkpCiAgICAgICAgICAgICBmb3IgZmlsZSBpbiBqc29uX2ZpbGVz XQogCiAgICAgICAgIHVwbG9hZGVyID0gdGVzdF9yZXN1bHRzX3VwbG9hZGVyLlRlc3RSZXN1bHRz VXBsb2FkZXIoCkBAIC0yNzMsMTAgKzI3Miw3IEBAIGNsYXNzIEpTT05SZXN1bHRzR2VuZXJhdG9y QmFzZShvYmplY3QpOgogICAgICAgICAjIFNwZWNpZnkgc2VwYXJhdG9ycyBpbiBvcmRlciB0byBn ZXQgY29tcGFjdCBlbmNvZGluZy4KICAgICAgICAganNvbl9kYXRhID0gc2ltcGxlanNvbi5kdW1w cyhqc29uLCBzZXBhcmF0b3JzPSgnLCcsICc6JykpCiAgICAgICAgIGpzb25fc3RyaW5nID0gc2Vs Zi5KU09OX1BSRUZJWCArIGpzb25fZGF0YSArIHNlbGYuSlNPTl9TVUZGSVgKLQotICAgICAgICBy ZXN1bHRzX2ZpbGUgPSBjb2RlY3Mub3BlbihmaWxlX3BhdGgsICJ3IiwgInV0Zi04IikKLSAgICAg ICAgcmVzdWx0c19maWxlLndyaXRlKGpzb25fc3RyaW5nKQotICAgICAgICByZXN1bHRzX2ZpbGUu Y2xvc2UoKQorICAgICAgICBzZWxmLl9mcy53cml0ZV90ZXh0X2ZpbGUoZmlsZV9wYXRoLCBqc29u X3N0cmluZykKIAogICAgIGRlZiBfZ2V0X3Rlc3RfdGltaW5nKHNlbGYsIHRlc3RfbmFtZSk6CiAg ICAgICAgICIiIlJldHVybnMgdGVzdCB0aW1pbmcgZGF0YSAoZWxhcHNlZCB0aW1lKSBpbiBzZWNv bmQKQEAgLTMzMCw3ICszMjYsNyBAQCBjbGFzcyBKU09OUmVzdWx0c0dlbmVyYXRvckJhc2Uob2Jq ZWN0KToKICAgICAgICAgQXJnczoKICAgICAgICAgICBpbl9kaXJlY3Rvcnk6IFRoZSBkaXJlY3Rv cnkgd2hlcmUgc3ZuIGlzIHRvIGJlIHJ1bi4KICAgICAgICAgIiIiCi0gICAgICAgIGlmIG9zLnBh dGguZXhpc3RzKG9zLnBhdGguam9pbihpbl9kaXJlY3RvcnksICcuc3ZuJykpOgorICAgICAgICBp ZiBzZWxmLl9mcy5leGlzdHMoc2VsZi5fZnMuam9pbihpbl9kaXJlY3RvcnksICcuc3ZuJykpOgog ICAgICAgICAgICAgIyBOb3RlOiBOb3QgdGhyZWFkIHNhZmU6IGh0dHA6Ly9idWdzLnB5dGhvbi5v cmcvaXNzdWUyMzIwCiAgICAgICAgICAgICBvdXRwdXQgPSBzdWJwcm9jZXNzLlBvcGVuKFsic3Zu IiwgImluZm8iLCAiLS14bWwiXSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY3dkPWluX2RpcmVjdG9yeSwKQEAgLTM1OCw5ICszNTQsOCBAQCBjbGFzcyBKU09OUmVzdWx0 c0dlbmVyYXRvckJhc2Uob2JqZWN0KToKICAgICAgICAgb2xkX3Jlc3VsdHMgPSBOb25lCiAgICAg ICAgIGVycm9yID0gTm9uZQogCi0gICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKHNlbGYuX3Jlc3Vs dHNfZmlsZV9wYXRoKSBhbmQgbm90IGZvcl9pbmNyZW1lbnRhbDoKLSAgICAgICAgICAgIHdpdGgg Y29kZWNzLm9wZW4oc2VsZi5fcmVzdWx0c19maWxlX3BhdGgsICJyIiwgInV0Zi04IikgYXMgZmls ZToKLSAgICAgICAgICAgICAgICBvbGRfcmVzdWx0cyA9IGZpbGUucmVhZCgpCisgICAgICAgIGlm IHNlbGYuX2ZzLmV4aXN0cyhzZWxmLl9yZXN1bHRzX2ZpbGVfcGF0aCkgYW5kIG5vdCBmb3JfaW5j cmVtZW50YWw6CisgICAgICAgICAgICBvbGRfcmVzdWx0cyA9IHNlbGYuX2ZzLnJlYWRfdGV4dF9m aWxlKHNlbGYuX3Jlc3VsdHNfZmlsZV9wYXRoKQogICAgICAgICBlbGlmIHNlbGYuX2J1aWxkZXJf YmFzZV91cmwgb3IgZm9yX2luY3JlbWVudGFsOgogICAgICAgICAgICAgaWYgZm9yX2luY3JlbWVu dGFsOgogICAgICAgICAgICAgICAgIGlmIG5vdCBzZWxmLl90ZXN0X3Jlc3VsdHNfc2VydmVyOgpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3Bh Y2thZ2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvcl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0 b3JfdW5pdHRlc3QucHkKaW5kZXggZGFkNTQ5YWNhZjc2ZDg3ZWM1ZjUwY2NjMjU3MDg0MWY2NmZm YWJiMC4uY2U5OTc2NThmYjQxNjBiYjg1OTg5MmY1NTRlM2E5YTRlMDA5MzJjZSAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNv bl9yZXN1bHRzX2dlbmVyYXRvcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3VsdHNfZ2VuZXJhdG9yX3Vu aXR0ZXN0LnB5CkBAIC0zMSwxMSArMzEsMTEgQEAKIGltcG9ydCB1bml0dGVzdAogaW1wb3J0IG9w dHBhcnNlCiBpbXBvcnQgcmFuZG9tCi1pbXBvcnQgc2h1dGlsCi1pbXBvcnQgdGVtcGZpbGUKIAor ZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtIGltcG9ydCBmaWxlc3lzdGVtX21vY2sKIGZyb20g d2Via2l0cHkubGF5b3V0X3Rlc3RzLmxheW91dF9wYWNrYWdlIGltcG9ydCBqc29uX3Jlc3VsdHNf Z2VuZXJhdG9yCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5sYXlvdXRfcGFja2FnZSBpbXBv cnQgdGVzdF9leHBlY3RhdGlvbnMKK2Zyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5tb2NrIGltcG9y dCBNb2NrCiAKIAogY2xhc3MgSlNPTkdlbmVyYXRvclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgpA QCAtODMsNyArODMsOSBAQCBjbGFzcyBKU09OR2VuZXJhdG9yVGVzdCh1bml0dGVzdC5UZXN0Q2Fz ZSk6CiAgICAgICAgICAgICAgICAgZmFpbGVkPSh0ZXN0IGluIGZhaWxlZF90ZXN0cyksCiAgICAg ICAgICAgICAgICAgZWxhcHNlZF90aW1lPXRlc3RfdGltaW5nc1t0ZXN0XSkKIAotICAgICAgICBn ZW5lcmF0b3IgPSBqc29uX3Jlc3VsdHNfZ2VuZXJhdG9yLkpTT05SZXN1bHRzR2VuZXJhdG9yQmFz ZSgKKyAgICAgICAgcG9ydCA9IE1vY2soKQorICAgICAgICBwb3J0Ll9maWxlc3lzdGVtID0gZmls ZXN5c3RlbV9tb2NrLk1vY2tGaWxlU3lzdGVtKCkKKyAgICAgICAgZ2VuZXJhdG9yID0ganNvbl9y ZXN1bHRzX2dlbmVyYXRvci5KU09OUmVzdWx0c0dlbmVyYXRvckJhc2UocG9ydCwKICAgICAgICAg ICAgIHNlbGYuYnVpbGRlcl9uYW1lLCBzZWxmLmJ1aWxkX25hbWUsIHNlbGYuYnVpbGRfbnVtYmVy LAogICAgICAgICAgICAgJycsCiAgICAgICAgICAgICBOb25lLCAgICMgZG9uJ3QgZmV0Y2ggcGFz dCBqc29uIHJlc3VsdHMgYXJjaGl2ZQo=