40402 2010-06-09 23:02:04 -0700 [Chromium] new-run-webkit-tests --use-drt should work with Chromium checkout 2010-06-12 05:44:25 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 tkent webkit-unassigned dglazkov eric morrita rolandsteiner tony oldest_to_newest 236170 0 tkent 2010-06-09 23:02:04 -0700 On Mac, "new-run-webkit-test --chromium --use-drt" doesn't work in Chromium tree. Linux and Windows seem to have the same problem. _build_path() in webkitpy/layout_test/port/chromium_*.py have a problem. 236173 1 tkent 2010-06-09 23:07:49 -0700 NRWT tries to use src/third_party/WebKit/WebKit/chromium/xcodebuild/Debug/DumpRenderTree.app instead of src/xcodebuild/Debug/DumpRenderTree.app We need to use path_from_chromium_base() even if --use-drt is specified. 236176 2 tony 2010-06-09 23:11:09 -0700 I think it would be ideal if we first tried src/third_party/WebKit/WebKit/chromium/xcodebuild/Debug/DumpRenderTree.app then fell back to src/xcodebuild/Debug/DumpRenderTree.app. For example, if I only have a chromium checkout, I sometimes use build-webkit --chromium in src/third_party/WebKit/ to make and test changes. 236195 3 58337 tkent 2010-06-10 00:18:14 -0700 Created attachment 58337 Patch 236200 4 tony 2010-06-10 00:37:50 -0700 LGTM (but I am not a reviewer) 236201 5 58340 tkent 2010-06-10 00:39:25 -0700 Created attachment 58340 Patch (rev.2) 236890 6 58340 dglazkov 2010-06-11 10:26:14 -0700 Comment on attachment 58340 Patch (rev.2) ok. 237287 7 58340 tkent 2010-06-12 05:44:14 -0700 Comment on attachment 58340 Patch (rev.2) Clearing flags on attachment: 58340 Committed r61061: <http://trac.webkit.org/changeset/61061> 237288 8 tkent 2010-06-12 05:44:25 -0700 All reviewed patches have been landed. Closing bug. 58337 2010-06-10 00:18:14 -0700 2010-06-10 00:39:19 -0700 Patch bug-40402-20100610161808.patch text/plain 4439 tkent ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBkYzQ2NmQ3YmI0ZGU0ZDdiZjVkNDE4NmM1OTlhZGExY2Y0NTUyMWI2Li45MzA1YWI4 NWQ0MDU1ZDZhOGJiYzIzZDY5OWRhMDJjOTZlYzI2M2Q1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAK KzIwMTAtMDYtMTAgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtDaHJvbWl1bV0gbmV3LXJ1 bi13ZWJraXQtdGVzdHMgLS11c2UtZHJ0IHNob3VsZCB3b3JrIHdpdGggQ2hyb21pdW0gY2hlY2tv dXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwNDAy CisKKyAgICAgICAgX2J1aWxkX3BhdGgoKSBvZiBlYWNoIENocm9taXVtIHBvcnQgY2hlY2sgZXhp c3RlbmNlIG9mIGJ1aWxkIHBhdGgKKyAgICAgICAgb2YgQ2hyb21pdW0gY2hlY2tvdXQgZmlyc3Qs IHRoZW4gY2hlY2sgZXhpc3RlbmNlIG9mIGJ1aWxkIHBhdGggb2YKKyAgICAgICAgV2ViS2l0LW9u bHkgY2hlY2tvdXQuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2Nocm9taXVtX2xpbnV4LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5OgorCiAyMDEwLTA2LTA5ICBPamFuIFZh ZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0 aC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY2hyb21pdW1fbGludXgucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5CmluZGV4IGY4ZTYxYjk3OWMxZTE3NmQ2 MmY2NDBiN2JlZDgyNzE5MDc5ZjIzNGMuLjRkZjQzZTAxMzIwMmYxODczZDI3M2FmN2QyZDMxNDhl Yjg0YjZiY2UgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXgucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weQpAQCAtODEsMTQgKzgx LDE1IEBAIGNsYXNzIENocm9taXVtTGludXhQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAg ICAgIwogCiAgICAgZGVmIF9idWlsZF9wYXRoKHNlbGYsICpjb21wcyk6Ci0gICAgICAgIGlmIHNl bGYuX29wdGlvbnMudXNlX2RydDoKLSAgICAgICAgICAgIGJhc2UgPSBvcy5wYXRoLmpvaW4oc2Vs Zi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoKSkKLSAgICAgICAgZWxzZToKLSAgICAgICAgICAgIGJh c2UgPSBzZWxmLnBhdGhfZnJvbV9jaHJvbWl1bV9iYXNlKCkKKyAgICAgICAgYmFzZSA9IHNlbGYu cGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoKQogICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhvcy5w YXRoLmpvaW4oYmFzZSwgJ3Njb25zYnVpbGQnKSk6CiAgICAgICAgICAgICByZXR1cm4gb3MucGF0 aC5qb2luKGJhc2UsICdzY29uc2J1aWxkJywgKmNvbXBzKQotICAgICAgICBlbHNlOgorICAgICAg ICBpZiBvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oYmFzZSwgJ291dCcsICpjb21wcykpIG9y IG5vdCBzZWxmLl9vcHRpb25zLnVzZV9kcnQ6CiAgICAgICAgICAgICByZXR1cm4gb3MucGF0aC5q b2luKGJhc2UsICdvdXQnLCAqY29tcHMpCisgICAgICAgIGJhc2UgPSBzZWxmLnBhdGhfZnJvbV93 ZWJraXRfYmFzZSgpCisgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKG9zLnBhdGguam9pbihiYXNl LCAnc2NvbnNidWlsZCcpKToKKyAgICAgICAgICAgIHJldHVybiBvcy5wYXRoLmpvaW4oYmFzZSwg J3Njb25zYnVpbGQnLCAqY29tcHMpCisgICAgICAgIHJldHVybiBvcy5wYXRoLmpvaW4oYmFzZSwg J291dCcsICpjb21wcykKIAogICAgIGRlZiBfY2hlY2tfYXBhY2hlX2luc3RhbGwoc2VsZik6CiAg ICAgICAgIHJlc3VsdCA9IGNocm9taXVtLmNoZWNrX2ZpbGVfZXhpc3RzKHNlbGYuX3BhdGhfdG9f YXBhY2hlKCksCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5CmluZGV4IGFhM2FjOGQxZTRhMWE0 MTMzZDU0NWJmMDZiNmVlYTcwNmFiNGIxNjUuLjVmZWE1M2JjYzE0N2Y3OTZhODQwNWY4NWM2MmNj YTQwNWUwNmM4OGIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5CkBAIC0xMDIsMTAgKzEw MiwxMCBAQCBjbGFzcyBDaHJvbWl1bU1hY1BvcnQoY2hyb21pdW0uQ2hyb21pdW1Qb3J0KToKICAg ICAjCiAKICAgICBkZWYgX2J1aWxkX3BhdGgoc2VsZiwgKmNvbXBzKToKLSAgICAgICAgaWYgc2Vs Zi5fb3B0aW9ucy51c2VfZHJ0OgotICAgICAgICAgICAgcmV0dXJuIHNlbGYucGF0aF9mcm9tX3dl YmtpdF9iYXNlKCdXZWJLaXQnLCAnY2hyb21pdW0nLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICd4Y29kZWJ1aWxkJywgKmNvbXBzKQotICAgICAgICByZXR1 cm4gc2VsZi5wYXRoX2Zyb21fY2hyb21pdW1fYmFzZSgneGNvZGVidWlsZCcsICpjb21wcykKKyAg ICAgICAgcGF0aCA9IHNlbGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoJ3hjb2RlYnVpbGQnLCAq Y29tcHMpCisgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKHBhdGgpIG9yIG5vdCBzZWxmLl9vcHRp b25zLnVzZV9kcnQ6CisgICAgICAgICAgICByZXR1cm4gcGF0aAorICAgICAgICByZXR1cm4gc2Vs Zi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoJ3hjb2RlYnVpbGQnLCAqY29tcHMpCiAKICAgICBkZWYg X2NoZWNrX3dkaWZmX2luc3RhbGwoc2VsZik6CiAgICAgICAgIHRyeToKZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2lu LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bV93aW4ucHkKaW5kZXggZWMxYzMzY2EzMGJkNmUwYzhlNzQyYjE4NmUwMDc1Y2ZlZjVkNTlh OC4uODA3MmJjMGQyY2U3MzhkOGE3ZWM0YzBjMjFkNDZmOGIxMTM0MmVjZiAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93 aW4ucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9jaHJvbWl1bV93aW4ucHkKQEAgLTExNywxMyArMTE3LDE0IEBAIGNsYXNzIENocm9taXVtV2lu UG9ydChjaHJvbWl1bS5DaHJvbWl1bVBvcnQpOgogICAgICMKIAogICAgIGRlZiBfYnVpbGRfcGF0 aChzZWxmLCAqY29tcHMpOgotICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnVzZV9kcnQ6Ci0gICAg ICAgICAgICByZXR1cm4gb3MucGF0aC5qb2luKHNlbGYucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCks ICdXZWJLaXQnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnY2hyb21pdW0nLCAq Y29tcHMpCiAgICAgICAgIHAgPSBzZWxmLnBhdGhfZnJvbV9jaHJvbWl1bV9iYXNlKCd3ZWJraXQn LCAqY29tcHMpCiAgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKHApOgogICAgICAgICAgICAgcmV0 dXJuIHAKLSAgICAgICAgcmV0dXJuIHNlbGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoJ2Nocm9t ZScsICpjb21wcykKKyAgICAgICAgcCA9IHNlbGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoJ2No cm9tZScsICpjb21wcykKKyAgICAgICAgaWYgb3MucGF0aC5leGlzdHMocCkgb3Igbm90IHNlbGYu X29wdGlvbnMudXNlX2RydDoKKyAgICAgICAgICAgIHJldHVybiBwCisgICAgICAgIHJldHVybiBv cy5wYXRoLmpvaW4oc2VsZi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoKSwgJ1dlYktpdCcsICdjaHJv bWl1bScsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgKmNvbXBzKQogCiAgICAgZGVmIF9s aWdodHRwZF9wYXRoKHNlbGYsICpjb21wcyk6CiAgICAgICAgIHJldHVybiBzZWxmLnBhdGhfZnJv bV9jaHJvbWl1bV9iYXNlKCd0aGlyZF9wYXJ0eScsICdsaWdodHRwZCcsICd3aW4nLAo= 58340 2010-06-10 00:39:25 -0700 2010-06-12 05:44:13 -0700 Patch (rev.2) bug-40402-20100610163923.patch text/plain 4504 tkent ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBkYzQ2NmQ3YmI0ZGU0ZDdiZjVkNDE4NmM1OTlhZGExY2Y0NTUyMWI2Li45MzA1YWI4 NWQ0MDU1ZDZhOGJiYzIzZDY5OWRhMDJjOTZlYzI2M2Q1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAK KzIwMTAtMDYtMTAgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtDaHJvbWl1bV0gbmV3LXJ1 bi13ZWJraXQtdGVzdHMgLS11c2UtZHJ0IHNob3VsZCB3b3JrIHdpdGggQ2hyb21pdW0gY2hlY2tv dXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwNDAy CisKKyAgICAgICAgX2J1aWxkX3BhdGgoKSBvZiBlYWNoIENocm9taXVtIHBvcnQgY2hlY2sgZXhp c3RlbmNlIG9mIGJ1aWxkIHBhdGgKKyAgICAgICAgb2YgQ2hyb21pdW0gY2hlY2tvdXQgZmlyc3Qs IHRoZW4gY2hlY2sgZXhpc3RlbmNlIG9mIGJ1aWxkIHBhdGggb2YKKyAgICAgICAgV2ViS2l0LW9u bHkgY2hlY2tvdXQuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2Nocm9taXVtX2xpbnV4LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5OgorCiAyMDEwLTA2LTA5ICBPamFuIFZh ZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0 aC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY2hyb21pdW1fbGludXgucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5CmluZGV4IGY4ZTYxYjk3OWMxZTE3NmQ2 MmY2NDBiN2JlZDgyNzE5MDc5ZjIzNGMuLjRkZjQzZTAxMzIwMmYxODczZDI3M2FmN2QyZDMxNDhl Yjg0YjZiY2UgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXgucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weQpAQCAtODEsMTQgKzgx LDE1IEBAIGNsYXNzIENocm9taXVtTGludXhQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAg ICAgIwogCiAgICAgZGVmIF9idWlsZF9wYXRoKHNlbGYsICpjb21wcyk6Ci0gICAgICAgIGlmIHNl bGYuX29wdGlvbnMudXNlX2RydDoKLSAgICAgICAgICAgIGJhc2UgPSBvcy5wYXRoLmpvaW4oc2Vs Zi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoKSkKLSAgICAgICAgZWxzZToKLSAgICAgICAgICAgIGJh c2UgPSBzZWxmLnBhdGhfZnJvbV9jaHJvbWl1bV9iYXNlKCkKKyAgICAgICAgYmFzZSA9IHNlbGYu cGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoKQogICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhvcy5w YXRoLmpvaW4oYmFzZSwgJ3Njb25zYnVpbGQnKSk6CiAgICAgICAgICAgICByZXR1cm4gb3MucGF0 aC5qb2luKGJhc2UsICdzY29uc2J1aWxkJywgKmNvbXBzKQotICAgICAgICBlbHNlOgorICAgICAg ICBpZiBvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oYmFzZSwgJ291dCcsICpjb21wcykpIG9y IG5vdCBzZWxmLl9vcHRpb25zLnVzZV9kcnQ6CiAgICAgICAgICAgICByZXR1cm4gb3MucGF0aC5q b2luKGJhc2UsICdvdXQnLCAqY29tcHMpCisgICAgICAgIGJhc2UgPSBzZWxmLnBhdGhfZnJvbV93 ZWJraXRfYmFzZSgpCisgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKG9zLnBhdGguam9pbihiYXNl LCAnc2NvbnNidWlsZCcpKToKKyAgICAgICAgICAgIHJldHVybiBvcy5wYXRoLmpvaW4oYmFzZSwg J3Njb25zYnVpbGQnLCAqY29tcHMpCisgICAgICAgIHJldHVybiBvcy5wYXRoLmpvaW4oYmFzZSwg J291dCcsICpjb21wcykKIAogICAgIGRlZiBfY2hlY2tfYXBhY2hlX2luc3RhbGwoc2VsZik6CiAg ICAgICAgIHJlc3VsdCA9IGNocm9taXVtLmNoZWNrX2ZpbGVfZXhpc3RzKHNlbGYuX3BhdGhfdG9f YXBhY2hlKCksCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5CmluZGV4IGFhM2FjOGQxZTRhMWE0 MTMzZDU0NWJmMDZiNmVlYTcwNmFiNGIxNjUuLmFiZDg0YWU1ZWU0NGVmOTNmODBmNDRmNzAzZjBl YjY0ZTEwMDNkM2UgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5CkBAIC0xMDIsMTAgKzEw MiwxMSBAQCBjbGFzcyBDaHJvbWl1bU1hY1BvcnQoY2hyb21pdW0uQ2hyb21pdW1Qb3J0KToKICAg ICAjCiAKICAgICBkZWYgX2J1aWxkX3BhdGgoc2VsZiwgKmNvbXBzKToKLSAgICAgICAgaWYgc2Vs Zi5fb3B0aW9ucy51c2VfZHJ0OgotICAgICAgICAgICAgcmV0dXJuIHNlbGYucGF0aF9mcm9tX3dl YmtpdF9iYXNlKCdXZWJLaXQnLCAnY2hyb21pdW0nLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICd4Y29kZWJ1aWxkJywgKmNvbXBzKQotICAgICAgICByZXR1 cm4gc2VsZi5wYXRoX2Zyb21fY2hyb21pdW1fYmFzZSgneGNvZGVidWlsZCcsICpjb21wcykKKyAg ICAgICAgcGF0aCA9IHNlbGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoJ3hjb2RlYnVpbGQnLCAq Y29tcHMpCisgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKHBhdGgpIG9yIG5vdCBzZWxmLl9vcHRp b25zLnVzZV9kcnQ6CisgICAgICAgICAgICByZXR1cm4gcGF0aAorICAgICAgICByZXR1cm4gc2Vs Zi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoJ1dlYktpdCcsICdjaHJvbWl1bScsICd4Y29kZWJ1aWxk JywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICpjb21wcykKIAog ICAgIGRlZiBfY2hlY2tfd2RpZmZfaW5zdGFsbChzZWxmKToKICAgICAgICAgdHJ5OgpkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bV93aW4ucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2Nocm9taXVtX3dpbi5weQppbmRleCBlYzFjMzNjYTMwYmQ2ZTBjOGU3NDJiMTg2ZTAwNzVj ZmVmNWQ1OWE4Li44MDcyYmMwZDJjZTczOGQ4YTdlYzRjMGMyMWQ0NmY4YjExMzQyZWNmIDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2No cm9taXVtX3dpbi5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtX3dpbi5weQpAQCAtMTE3LDEzICsxMTcsMTQgQEAgY2xhc3MgQ2hy b21pdW1XaW5Qb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAgICAgIwogCiAgICAgZGVmIF9i dWlsZF9wYXRoKHNlbGYsICpjb21wcyk6Ci0gICAgICAgIGlmIHNlbGYuX29wdGlvbnMudXNlX2Ry dDoKLSAgICAgICAgICAgIHJldHVybiBvcy5wYXRoLmpvaW4oc2VsZi5wYXRoX2Zyb21fd2Via2l0 X2Jhc2UoKSwgJ1dlYktpdCcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdjaHJv bWl1bScsICpjb21wcykKICAgICAgICAgcCA9IHNlbGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2Uo J3dlYmtpdCcsICpjb21wcykKICAgICAgICAgaWYgb3MucGF0aC5leGlzdHMocCk6CiAgICAgICAg ICAgICByZXR1cm4gcAotICAgICAgICByZXR1cm4gc2VsZi5wYXRoX2Zyb21fY2hyb21pdW1fYmFz ZSgnY2hyb21lJywgKmNvbXBzKQorICAgICAgICBwID0gc2VsZi5wYXRoX2Zyb21fY2hyb21pdW1f YmFzZSgnY2hyb21lJywgKmNvbXBzKQorICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhwKSBvciBu b3Qgc2VsZi5fb3B0aW9ucy51c2VfZHJ0OgorICAgICAgICAgICAgcmV0dXJuIHAKKyAgICAgICAg cmV0dXJuIG9zLnBhdGguam9pbihzZWxmLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgpLCAnV2ViS2l0 JywgJ2Nocm9taXVtJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAqY29tcHMpCiAKICAg ICBkZWYgX2xpZ2h0dHBkX3BhdGgoc2VsZiwgKmNvbXBzKToKICAgICAgICAgcmV0dXJuIHNlbGYu cGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoJ3RoaXJkX3BhcnR5JywgJ2xpZ2h0dHBkJywgJ3dpbics Cg==