82962 2012-04-02 16:00:30 -0700 run-webkit-tests with a relative --root causes tests to fail because DYLD_LIBRARY_PATH is not set 2012-04-02 20:52:40 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser abarth dpranke eric mrowe ojan simon.fraser webkit.review.bot oldest_to_newest 593954 0 simon.fraser 2012-04-02 16:00:30 -0700 On some of our bots we run run-webkit-tests with a --root parameter that is a folder name, rather than an absolute path. That causes _build_path() to return just the folder name, which is then used to set DYLD_FRAMEWORK_PATH and DYLD_LIBRARY PATH, causing problems. Its seems that _build_path() should always return an absolute path. Changing the last line to self._filesystem.join(os.getcwd(), build_directory, *comps) seems to work. 593968 1 135216 simon.fraser 2012-04-02 16:06:09 -0700 Created attachment 135216 Patch 593993 2 135216 dpranke 2012-04-02 16:33:55 -0700 Comment on attachment 135216 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135216&action=review > Tools/Scripts/webkitpy/layout_tests/port/webkit.py:378 > + return self._filesystem.join(os.getcwd(), build_directory, *comps) This is fine but I'd probably do: return self._filesystem.join(self.abspath(build_directory), *comps) instead; that captures the intent a little more clearly (IMO, of course). 594003 3 dpranke 2012-04-02 16:41:03 -0700 (In reply to comment #2) > (From update of attachment 135216 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=135216&action=review > > > Tools/Scripts/webkitpy/layout_tests/port/webkit.py:378 > > + return self._filesystem.join(os.getcwd(), build_directory, *comps) > > This is fine but I'd probably do: > > return self._filesystem.join(self.abspath(build_directory), *comps) > > instead; that captures the intent a little more clearly (IMO, of course). Sorry, that should've been: self._filesystem.join(self._filesystem.abspath(build_directory), *comps) 594044 4 135216 eric 2012-04-02 17:09:45 -0700 Comment on attachment 135216 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135216&action=review >>> Tools/Scripts/webkitpy/layout_tests/port/webkit.py:378 >>> + return self._filesystem.join(os.getcwd(), build_directory, *comps) >> >> This is fine but I'd probably do: >> >> return self._filesystem.join(self.abspath(build_directory), *comps) >> >> instead; that captures the intent a little more clearly (IMO, of course). > > Sorry, that should've been: > > self._filesystem.join(self._filesystem.abspath(build_directory), *comps) You want self._filessystem.getcwd() any place you'd use os.getcwd(). :) 594047 5 135216 eric 2012-04-02 17:12:16 -0700 Comment on attachment 135216 Patch r- for the use of os. Discussing on IRC now. :) 594054 6 135236 simon.fraser 2012-04-02 17:19:53 -0700 Created attachment 135236 Patch 594089 7 135245 eric 2012-04-02 17:49:40 -0700 Created attachment 135245 Patch 594102 8 mrowe 2012-04-02 18:05:58 -0700 It'd make a heck of a lot more sense to fix that existing issue in a separate patch. It makes it a lot harder to see what in this patch fixes the described issue. 594176 9 135245 webkit.review.bot 2012-04-02 20:52:35 -0700 Comment on attachment 135245 Patch Clearing flags on attachment: 135245 Committed r112981: <http://trac.webkit.org/changeset/112981> 594177 10 webkit.review.bot 2012-04-02 20:52:40 -0700 All reviewed patches have been landed. Closing bug. 135216 2012-04-02 16:06:09 -0700 2012-04-02 17:19:46 -0700 Patch bug-82962-20120402160608.patch text/plain 1738 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyOTM5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2FhNGE2OTY2YTg1YWIyZDU2ZTAxODJkM2U2OWE2NTky MWI0OGFlMS4uM2RiZjcwZThmYzk2YzI0YmJjMzU5ODdmYTM5OWMyOTVjMjZhNTc4MCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDEyLTA0LTAyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIHJ1bi13ZWJraXQtdGVzdHMgd2l0aCBhIHJlbGF0aXZlIC0tcm9vdCBjYXVzZXMg dGVzdHMgdG8gZmFpbCBiZWNhdXNlIERZTERfTElCUkFSWV9QQVRIIGlzIG5vdCBzZXQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyOTYyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBFbnN1cmUg dGhhdCBfYnVpbGRfcGF0aCgpIHJldHVybnMgYW4gYWJzb2x1dGUgcGF0aC4KKworICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5OgorICAgICAgICAo V2ViS2l0UG9ydC5fYnVpbGRfcGF0aCk6CisKIDIwMTItMDQtMDIgIEJhbGF6cyBLZWxlbWVuICA8 a2JhbGF6c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF1bV0syXSBTZXQgdXAgcGx1Z2luIHBy b2Nlc3Mgb24gVW5peApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC93ZWJraXQucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L3dlYmtpdC5weQppbmRleCA1NTAwNzg2MDFmNTYxY2MzZDk3ZWJlZTQ2MjI1MTAxMGJh YWZkNzMxLi42MzgzZGRlY2EyYzFkOTQxMDk4YmRlZjA1ZTMyZGZjMWNhZGU2YTYwIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQpA QCAtMzYsNiArMzYsNyBAQCBpbXBvcnQgaXRlcnRvb2xzCiBpbXBvcnQgbG9nZ2luZwogaW1wb3J0 IG9wZXJhdG9yCiBpbXBvcnQgcmUKK2ltcG9ydCBvcwogaW1wb3J0IHN5cwogaW1wb3J0IHRpbWUK IApAQCAtMzc0LDcgKzM3NSw3IEBAIGNsYXNzIFdlYktpdFBvcnQoUG9ydCk6CiAgICAgICAgICAg ICAjIFNldCAtLWJ1aWxkLWRpcmVjdG9yeSBoZXJlIFNpbmNlIHRoaXMgbW9kaWZpZXMgdGhlIG9w dGlvbnMgb2JqZWN0IHVzZWQgYnkgdGhlIHdvcmtlciBzdWJwcm9jZXNzZXMsCiAgICAgICAgICAg ICAjIGl0IGF2b2lkcyB0aGUgc2xvdyBjYWxsIG91dCB0byBidWlsZF9kaXJlY3RvcnkgaW4gZWFj aCBzdWJwcm9jZXNzLgogICAgICAgICAgICAgc2VsZi5zZXRfb3B0aW9uX2RlZmF1bHQoJ2J1aWxk X2RpcmVjdG9yeScsIGJ1aWxkX2RpcmVjdG9yeSkKLSAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVz eXN0ZW0uam9pbihidWlsZF9kaXJlY3RvcnksICpjb21wcykKKyAgICAgICAgcmV0dXJuIHNlbGYu X2ZpbGVzeXN0ZW0uam9pbihvcy5nZXRjd2QoKSwgYnVpbGRfZGlyZWN0b3J5LCAqY29tcHMpCiAK ICAgICBkZWYgX3BhdGhfdG9fZHJpdmVyKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5fYnVp bGRfcGF0aChzZWxmLmRyaXZlcl9uYW1lKCkpCg== 135236 2012-04-02 17:19:53 -0700 2012-04-02 17:49:33 -0700 Patch bug-82962-20120402171952.patch text/plain 2604 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyOTYwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjEwOWQzYzc2MDAxZjlkZDZiZjUwOWU0NTdlNTE1ZGI3 NGFkMGExOC4uNjBjNTE0NTMwYjdmODYyNjc3ZjQ2YmViOWQyOWEyMTRjZjUyZjhiNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDEyLTA0LTAyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIHJ1bi13ZWJraXQtdGVzdHMgd2l0aCBhIHJlbGF0aXZlIC0tcm9vdCBjYXVzZXMg dGVzdHMgdG8gZmFpbCBiZWNhdXNlIERZTERfTElCUkFSWV9QQVRIIGlzIG5vdCBzZXQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyOTYyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgRGlyayBQcmFua2UuCisgICAgICAgIAorICAgICAgICBFbnN1cmUgdGhh dCBfYnVpbGRfcGF0aCgpIHJldHVybnMgYW4gYWJzb2x1dGUgcGF0aC4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5OgorICAgICAgICAoV2Vi S2l0UG9ydC5fYnVpbGRfcGF0aCk6CisKIDIwMTItMDQtMDIgIFNoZXJpZmYgQm90ICA8d2Via2l0 LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0 IHIxMTI5NDguCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L3dlYmtpdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvd2Via2l0LnB5CmluZGV4IDU1MDA3ODYwMWY1NjFjYzNkOTdlYmVlNDYyMjUxMDEwYmFhZmQ3 MzEuLjg3ZmE1ZDlkODY5NTFkZWZlNDU5NTBkMjNlNjAyMDk0ZjdjNjIxOTIgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CkBAIC0z NzQsNyArMzc0LDcgQEAgY2xhc3MgV2ViS2l0UG9ydChQb3J0KToKICAgICAgICAgICAgICMgU2V0 IC0tYnVpbGQtZGlyZWN0b3J5IGhlcmUgU2luY2UgdGhpcyBtb2RpZmllcyB0aGUgb3B0aW9ucyBv YmplY3QgdXNlZCBieSB0aGUgd29ya2VyIHN1YnByb2Nlc3NlcywKICAgICAgICAgICAgICMgaXQg YXZvaWRzIHRoZSBzbG93IGNhbGwgb3V0IHRvIGJ1aWxkX2RpcmVjdG9yeSBpbiBlYWNoIHN1YnBy b2Nlc3MuCiAgICAgICAgICAgICBzZWxmLnNldF9vcHRpb25fZGVmYXVsdCgnYnVpbGRfZGlyZWN0 b3J5JywgYnVpbGRfZGlyZWN0b3J5KQotICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5q b2luKGJ1aWxkX2RpcmVjdG9yeSwgKmNvbXBzKQorICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5 c3RlbS5qb2luKHNlbGYuX2ZpbGVzeXN0ZW0uYWJzcGF0aChidWlsZF9kaXJlY3RvcnkpLCAqY29t cHMpCiAKICAgICBkZWYgX3BhdGhfdG9fZHJpdmVyKHNlbGYpOgogICAgICAgICByZXR1cm4gc2Vs Zi5fYnVpbGRfcGF0aChzZWxmLmRyaXZlcl9uYW1lKCkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdF91bml0dGVzdC5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0X3VuaXR0ZXN0LnB5Cmlu ZGV4IDM5MmFhMzQyYWMzNzdkYjI4YWVhYjRmN2M4MzYyOWY0ZDM4MzVlYTYuLjU4NjU3MWE5Yjk5 MTYxYzE4ODhlNWEyMGRiZTA1YmJmZGExODFlMTUgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0X3VuaXR0ZXN0LnB5CkBA IC0yOTQsOCArMjk0LDkgQEAgY2xhc3MgV2ViS2l0RHJpdmVyVGVzdCh1bml0dGVzdC5UZXN0Q2Fz ZSk6CiAKICAgICBkZWYgdGVzdF9ub190aW1lb3V0KHNlbGYpOgogICAgICAgICBwb3J0ID0gVGVz dFdlYktpdFBvcnQoKQorICAgICAgICBwb3J0Ll9idWlsZF9wYXRoID0gbGFtYmRhICpjb21wczog Jy9idWlsZC9EdW1wUmVuZGVyVHJlZScKICAgICAgICAgZHJpdmVyID0gV2ViS2l0RHJpdmVyKHBv cnQsIDAsIHBpeGVsX3Rlc3RzPVRydWUsIG5vX3RpbWVvdXQ9VHJ1ZSkKLSAgICAgICAgc2VsZi5h c3NlcnRFcXVhbHMoZHJpdmVyLmNtZF9saW5lKFRydWUsIFtdKSwgWydNT0NLIG91dHB1dCBvZiBj aGlsZCBwcm9jZXNzL0R1bXBSZW5kZXJUcmVlJywgJy0tbm8tdGltZW91dCcsICctLXBpeGVsLXRl c3RzJywgJy0nXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZHJpdmVyLmNtZF9saW5lKFRy dWUsIFtdKSwgWycvYnVpbGQvRHVtcFJlbmRlclRyZWUnLCAnLS1uby10aW1lb3V0JywgJy0tcGl4 ZWwtdGVzdHMnLCAnLSddKQogCiAgICAgZGVmIHRlc3RfY2hlY2tfZm9yX2RyaXZlcl9jcmFzaChz ZWxmKToKICAgICAgICAgcG9ydCA9IFRlc3RXZWJLaXRQb3J0KCkK 135245 2012-04-02 17:49:40 -0700 2012-04-02 20:52:35 -0700 Patch bug-82962-20120402174939.patch text/plain 8793 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyODIwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGFiOTEwYzczZTY2ZDFmMjNhNzAzMTZkNWNiMGYyYWRi NDNlMDhlOS4uNWQ3OTI0YTRlZTJmYzM1NjlmMjBjOWQ5M2ExNmM1NzM1ZTFiN2NjNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEyLTA0LTAyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIHJ1bi13ZWJraXQtdGVzdHMgd2l0aCBhIHJlbGF0aXZlIC0tcm9vdCBjYXVzZXMg dGVzdHMgdG8gZmFpbCBiZWNhdXNlIERZTERfTElCUkFSWV9QQVRIIGlzIG5vdCBzZXQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyOTYyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgRGlyayBQcmFua2UuCisKKyAgICAgICAgRW5zdXJlIHRoYXQgX2J1aWxk X3BhdGgoKSByZXR1cm5zIGFuIGFic29sdXRlIHBhdGguCisKKyAgICAgICAgRXJpYyBTZWlkZWwg YWxzbyBoYWQgdG8gZGVwbG95IE1vY2tDb25maWcgaW4gYSBidW5jaCBvZiBwbGFjZXMKKyAgICAg ICAgaW4gb3JkZXIgdG8gY29ycmVjdCBwcmV2aW91cyB0ZXN0aW5nIGVycm9ycyB3aGVyZSB3ZSB3 ZXJlCisgICAgICAgIHByZXRlbmRpbmcgdGhhdCAiTW9jayBPdXRwdXQgZnJvbSBjaGlsZCBwcm9j ZXNzIiAocmV0dXJuZWQgYnkgTW9ja0V4ZWN1dGl2ZS5ydW5fY29tbWFuZCkKKyAgICAgICAgd2Fz IGEgcmVhbCBwYXRoLiAgVGhlIHJlYWwgQ29uZmlnIG9iamVjdCBjYWxscyBydW5fY29tbWFuZCgi d2Via2l0LWJ1aWxkLWRpcmVjdG9yeSIpCisgICAgICAgIHRvIHJlYWQgdGhlIFdlYktpdCBidWls ZCBkaXJlY3RvcnkgZnJvbSB0aGUgd2Via2l0ZGlycy5wbSBwZXJsIGNvZGUuCisgICAgICAgIE1v Y2tDb25maWcgYWJzdHJhY3RzIHRoaXMgYXdheSBhbmQgYWx3YXlzIHJldHVybnMgIi9tb2NrLWJ1 aWxkIiBkdXJpbmcKKyAgICAgICAgdGVzdGluZy4gIFRoaXMgY2hhbmdlIGlzIG11Y2ggbGFyZ2Vy IHRoYW4gb25lIHdvdWxkIHRoaW5rIG5lY2Vzc2FyeQorICAgICAgICBiZWNhdXNlIG9mIG5lZWRp bmcgdG8gZGVwbG95IHRoaXMgTW9ja0NvbmZpZyBjbGFzcy4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5OgorICAgICAgICAoV2ViS2l0UG9y dC5fYnVpbGRfcGF0aCk6CisKIDIwMTItMDQtMDEgIFRvbnkgVHNldW5nICA8dHNldW5nQGFwcGxl LmNvbT4KIAogICAgICAgICBDb21wb3NpdGUgRm9udCBSZWZlcmVuY2VzIGlzIGEgbmV3IGVzdGFi bGlzaGVkIHN0YW5kYXJkIChJU08vSUVDIDE0NDk2LTI4OjIwMTIpIGZvciBzcGVjaWZ5aW5nCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2NvbmZp Z19tb2NrLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jb25m aWdfbW9jay5weQppbmRleCBhZjcxZmEzMzI1NTBjZjZmZWI2YWNiYWEyZDYzOGE2OTVmYTY1MDQ2 Li5lNTBhZDRmODRiM2Y0NDM0ZjM4NzU5NDc5NGRjZTFiNGY5MWYyOTViIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2NvbmZpZ19tb2NrLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnX21vY2su cHkKQEAgLTI5LDEzICsyOSwyNCBAQAogCiAiIiJXcmFwcGVyIG9iamVjdHMgZm9yIFdlYktpdC1z cGVjaWZpYyB1dGlsaXR5IHJvdXRpbmVzLiIiIgogCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0 ZW0uZmlsZXN5c3RlbV9tb2NrIGltcG9ydCBNb2NrRmlsZVN5c3RlbQorCiAKIGNsYXNzIE1vY2tD b25maWcob2JqZWN0KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgZGVmYXVsdF9jb25maWd1cmF0 aW9uPSdSZWxlYXNlJyk6CisgICAgX0ZMQUdTX0ZST01fQ09ORklHVVJBVElPTlMgPSB7CisgICAg ICAgICJEZWJ1ZyI6ICItLWRlYnVnIiwKKyAgICAgICAgIlJlbGVhc2UiOiAiLS1yZWxlYXNlIiwK KyAgICB9CisKKyAgICBkZWYgX19pbml0X18oc2VsZiwgZmlsZXN5c3RlbT1Ob25lLCBkZWZhdWx0 X2NvbmZpZ3VyYXRpb249J1JlbGVhc2UnKToKKyAgICAgICAgc2VsZi5fZmlsZXN5c3RlbSA9IGZp bGVzeXN0ZW0gb3IgTW9ja0ZpbGVTeXN0ZW0oKQogICAgICAgICBzZWxmLl9kZWZhdWx0X2NvbmZp Z3VyYXRpb24gPSBkZWZhdWx0X2NvbmZpZ3VyYXRpb24KIAorICAgIGRlZiBmbGFnX2Zvcl9jb25m aWd1cmF0aW9uKHNlbGYsIGNvbmZpZ3VyYXRpb24pOgorICAgICAgICByZXR1cm4gc2VsZi5fRkxB R1NfRlJPTV9DT05GSUdVUkFUSU9OU1tjb25maWd1cmF0aW9uXQorCiAgICAgZGVmIGJ1aWxkX2Rp cmVjdG9yeShzZWxmLCBjb25maWd1cmF0aW9uKToKLSAgICAgICAgcmV0dXJuICIvYnVpbGQiCisg ICAgICAgIHJldHVybiAiL21vY2stYnVpbGQiCiAKICAgICBkZWYgYnVpbGRfZHVtcHJlbmRlcnRy ZWUoc2VsZiwgY29uZmlndXJhdGlvbik6CiAgICAgICAgIHJldHVybiBUcnVlCkBAIC00NCw3ICs1 NSwxMiBAQCBjbGFzcyBNb2NrQ29uZmlnKG9iamVjdCk6CiAgICAgICAgIHJldHVybiBzZWxmLl9k ZWZhdWx0X2NvbmZpZ3VyYXRpb24KIAogICAgIGRlZiBwYXRoX2Zyb21fd2Via2l0X2Jhc2Uoc2Vs ZiwgKmNvbXBzKToKLSAgICAgICAgcmV0dXJuICIvIiArICIvIi5qb2luKGxpc3QoY29tcHMpKQor ICAgICAgICAjIEZJWE1FOiBUaGlzIGNvdWxkIHVzZSBzZWxmLl9maWxlc3lzdGVtLmpvaW4sIGJ1 dCB0aGF0IGRvZXNuJ3QgaGFuZGxlIGVtcHR5IGxpc3RzLgorICAgICAgICByZXR1cm4gc2VsZi53 ZWJraXRfYmFzZV9kaXIoKSArICIvIiArICIvIi5qb2luKGxpc3QoY29tcHMpKQorCisgICAgZGVm IHNjcmlwdF9wYXRoKHNlbGYsIHNjcmlwdF9uYW1lKToKKyAgICAgICAgIyBUaGlzIGlzIGludGVu dGlvbmFsbHkgcmVsYXRpdmUuIENhbGxlcnMgc2hvdWxkIHBhc3MgdGhlIGNoZWNrb3V0X3Jvb3Qv d2Via2l0X2Jhc2VfZGlyIHRvIHJ1bl9jb21tYW5kIGFzIHRoZSBjd2QuCisgICAgICAgIHJldHVy biBzZWxmLl9maWxlc3lzdGVtLmpvaW4oIlRvb2xzIiwgIlNjcmlwdHMiLCBzY3JpcHRfbmFtZSkK IAogICAgIGRlZiB3ZWJraXRfYmFzZV9kaXIoc2VsZik6Ci0gICAgICAgIHJldHVybiAiLyIKKyAg ICAgICAgcmV0dXJuICIvbW9jay1jaGVja291dCIKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcG9ydF90ZXN0Y2FzZS5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcG9ydF90ZXN0Y2FzZS5weQppbmRleCAxYmUy YmU0MzdiNTA4OTI3MmVkNzZhMDM0NmVhNzBiODViYzNkNjhjLi4zMmM0NmI1ZTNmNjExNTg2OWEy NTBjZjcwMDExZGJhMjUyMjM5NjNhIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L3BvcnRfdGVzdGNhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5CkBAIC00MCw2ICs0MCw3 IEBAIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5zeXN0ZW1ob3N0X21vY2sgaW1wb3J0IE1v Y2tTeXN0ZW1Ib3N0CiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5zZXJ2ZXJzIGltcG9ydCBo dHRwX3NlcnZlcl9iYXNlCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5zZXJ2ZXJzIGltcG9y dCBodHRwX3NlcnZlcl9iYXNlCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9y dCBmYWN0b3J5Citmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0LmNvbmZpZ19tb2NrIGlt cG9ydCBNb2NrQ29uZmlnCiBmcm9tIHdlYmtpdHB5LnRvb2wubW9ja3Rvb2wgaW1wb3J0IE1vY2tP cHRpb25zCiAKIApAQCAtNTMsMTIgKzU0LDEzIEBAIGNsYXNzIFBvcnRUZXN0Q2FzZSh1bml0dGVz dC5UZXN0Q2FzZSk6CiAgICAgb3NfdmVyc2lvbiA9IE5vbmUKICAgICBwb3J0X21ha2VyID0gTm9u ZQogCi0gICAgZGVmIG1ha2VfcG9ydChzZWxmLCBob3N0PU5vbmUsIHBvcnRfbmFtZT1Ob25lLCBv cHRpb25zPU5vbmUsIG9zX25hbWU9Tm9uZSwgb3NfdmVyc2lvbj1Ob25lLCAqKmt3YXJncyk6Cisg ICAgZGVmIG1ha2VfcG9ydChzZWxmLCBob3N0PU5vbmUsIHBvcnRfbmFtZT1Ob25lLCBvcHRpb25z PU5vbmUsIG9zX25hbWU9Tm9uZSwgb3NfdmVyc2lvbj1Ob25lLCBjb25maWc9Tm9uZSwgKiprd2Fy Z3MpOgogICAgICAgICBob3N0ID0gaG9zdCBvciBNb2NrU3lzdGVtSG9zdChvc19uYW1lPShvc19u YW1lIG9yIHNlbGYub3NfbmFtZSksIG9zX3ZlcnNpb249KG9zX3ZlcnNpb24gb3Igc2VsZi5vc192 ZXJzaW9uKSkKICAgICAgICAgb3B0aW9ucyA9IG9wdGlvbnMgb3IgTW9ja09wdGlvbnMoY29uZmln dXJhdGlvbj0nUmVsZWFzZScpCisgICAgICAgIGNvbmZpZyA9IGNvbmZpZyBvciBNb2NrQ29uZmln KGZpbGVzeXN0ZW09aG9zdC5maWxlc3lzdGVtLCBkZWZhdWx0X2NvbmZpZ3VyYXRpb249J1JlbGVh c2UnKQogICAgICAgICBwb3J0X25hbWUgPSBwb3J0X25hbWUgb3Igc2VsZi5wb3J0X25hbWUKICAg ICAgICAgcG9ydF9uYW1lID0gc2VsZi5wb3J0X21ha2VyLmRldGVybWluZV9mdWxsX3BvcnRfbmFt ZShob3N0LCBvcHRpb25zLCBwb3J0X25hbWUpCi0gICAgICAgIHJldHVybiBzZWxmLnBvcnRfbWFr ZXIoaG9zdCwgcG9ydF9uYW1lLCBvcHRpb25zPW9wdGlvbnMsICoqa3dhcmdzKQorICAgICAgICBy ZXR1cm4gc2VsZi5wb3J0X21ha2VyKGhvc3QsIHBvcnRfbmFtZSwgb3B0aW9ucz1vcHRpb25zLCBj b25maWc9Y29uZmlnLCAqKmt3YXJncykKIAogICAgIGRlZiB0ZXN0X2RyaXZlcl9jbWRfbGluZShz ZWxmKToKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRlc3QucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5CmluZGV4 IDI2NzlmMzNmMWYyZWFlNTIyODRhMDJiOTBkMDU5NTY3MWI2Mjc3OTcuLjBjYzY5NDc4MGFjNjA0 NDZjMDU3NDJjYmFmZGQxZGRiMjkxZmFjMjEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5weQpAQCAtODEsNyArODEs NyBAQCBjbGFzcyBRdFBvcnRUZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RDYXNlKToKICAgICBk ZWYgdGVzdF9zZXR1cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIoc2VsZik6CiAgICAgICAgIHBvcnQgPSBz ZWxmLm1ha2VfcG9ydCgpCiAgICAgICAgIGVudiA9IHBvcnQuc2V0dXBfZW52aXJvbl9mb3Jfc2Vy dmVyKHBvcnQuZHJpdmVyX25hbWUoKSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZW52WydR VFdFQktJVF9QTFVHSU5fUEFUSCddLCAnTU9DSyBvdXRwdXQgb2YgY2hpbGQgcHJvY2Vzcy9saWIv cGx1Z2lucycpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGVudlsnUVRXRUJLSVRfUExVR0lO X1BBVEgnXSwgJy9tb2NrLWJ1aWxkL2xpYi9wbHVnaW5zJykKIAogICAgIGRlZiB0ZXN0X29wZXJh dGluZ19zeXN0ZW0oc2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ2xpbnV4Jywgc2Vs Zi5tYWtlX3BvcnQocG9ydF9uYW1lPSdxdC1saW51eCcsIG9zX25hbWU9J2xpbnV4Jykub3BlcmF0 aW5nX3N5c3RlbSgpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC93ZWJraXQucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L3dlYmtpdC5weQppbmRleCA1NTAwNzg2MDFmNTYxY2MzZDk3ZWJlZTQ2MjI1MTAxMGJh YWZkNzMxLi44N2ZhNWQ5ZDg2OTUxZGVmZTQ1OTUwZDIzZTYwMjA5NGY3YzYyMTkyIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQpA QCAtMzc0LDcgKzM3NCw3IEBAIGNsYXNzIFdlYktpdFBvcnQoUG9ydCk6CiAgICAgICAgICAgICAj IFNldCAtLWJ1aWxkLWRpcmVjdG9yeSBoZXJlIFNpbmNlIHRoaXMgbW9kaWZpZXMgdGhlIG9wdGlv bnMgb2JqZWN0IHVzZWQgYnkgdGhlIHdvcmtlciBzdWJwcm9jZXNzZXMsCiAgICAgICAgICAgICAj IGl0IGF2b2lkcyB0aGUgc2xvdyBjYWxsIG91dCB0byBidWlsZF9kaXJlY3RvcnkgaW4gZWFjaCBz dWJwcm9jZXNzLgogICAgICAgICAgICAgc2VsZi5zZXRfb3B0aW9uX2RlZmF1bHQoJ2J1aWxkX2Rp cmVjdG9yeScsIGJ1aWxkX2RpcmVjdG9yeSkKLSAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0 ZW0uam9pbihidWlsZF9kaXJlY3RvcnksICpjb21wcykKKyAgICAgICAgcmV0dXJuIHNlbGYuX2Zp bGVzeXN0ZW0uam9pbihzZWxmLl9maWxlc3lzdGVtLmFic3BhdGgoYnVpbGRfZGlyZWN0b3J5KSwg KmNvbXBzKQogCiAgICAgZGVmIF9wYXRoX3RvX2RyaXZlcihzZWxmKToKICAgICAgICAgcmV0dXJu IHNlbGYuX2J1aWxkX3BhdGgoc2VsZi5kcml2ZXJfbmFtZSgpKQpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXRfdW5pdHRlc3QucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdF91bml0dGVzdC5w eQppbmRleCAzOTJhYTM0MmFjMzc3ZGIyOGFlYWI0ZjdjODM2MjlmNGQzODM1ZWE2Li42MzUwMmE1 NzAxNTFlMmFlNTI2NzllZTNkNTBmM2YwMTQ0MjA2ZTQ2IDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdF91bml0dGVzdC5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdF91bml0dGVzdC5w eQpAQCAtMzUsNiArMzUsNyBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uc3lzdGVtaG9z dF9tb2NrIGltcG9ydCBNb2NrU3lzdGVtSG9zdAogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMu bW9kZWxzLnRlc3RfY29uZmlndXJhdGlvbiBpbXBvcnQgVGVzdENvbmZpZ3VyYXRpb24KIGZyb20g d2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IHBvcnRfdGVzdGNhc2UKIGZyb20gd2Vi a2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQud2Via2l0IGltcG9ydCBXZWJLaXRQb3J0LCBXZWJLaXRE cml2ZXIKK2Zyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQuY29uZmlnX21vY2sgaW1wb3J0 IE1vY2tDb25maWcKIGZyb20gd2Via2l0cHkudG9vbC5tb2NrdG9vbCBpbXBvcnQgTW9ja09wdGlv bnMKIAogCkBAIC00MiwxMSArNDMsMTIgQEAgY2xhc3MgVGVzdFdlYktpdFBvcnQoV2ViS2l0UG9y dCk6CiAgICAgcG9ydF9uYW1lID0gInRlc3R3ZWJraXRwb3J0IgogCiAgICAgZGVmIF9faW5pdF9f KHNlbGYsIHN5bWJvbHNfc3RyaW5nPU5vbmUsCi0gICAgICAgICAgICAgICAgIGV4cGVjdGF0aW9u c19maWxlPU5vbmUsIHNraXBzX2ZpbGU9Tm9uZSwgaG9zdD1Ob25lLAorICAgICAgICAgICAgICAg ICBleHBlY3RhdGlvbnNfZmlsZT1Ob25lLCBza2lwc19maWxlPU5vbmUsIGhvc3Q9Tm9uZSwgY29u ZmlnPU5vbmUsCiAgICAgICAgICAgICAgICAgICoqa3dhcmdzKToKICAgICAgICAgc2VsZi5zeW1i b2xzX3N0cmluZyA9IHN5bWJvbHNfc3RyaW5nICAjIFBhc3NpbmcgIiIgZGlzYWJsZXMgYWxsIHN0 YXRpY2x5LWRldGVjdGFibGUgZmVhdHVyZXMuCiAgICAgICAgIGhvc3QgPSBob3N0IG9yIE1vY2tT eXN0ZW1Ib3N0KCkKLSAgICAgICAgV2ViS2l0UG9ydC5fX2luaXRfXyhzZWxmLCBob3N0PWhvc3Qs ICoqa3dhcmdzKQorICAgICAgICBjb25maWcgPSBjb25maWcgb3IgTW9ja0NvbmZpZygpCisgICAg ICAgIFdlYktpdFBvcnQuX19pbml0X18oc2VsZiwgaG9zdD1ob3N0LCBjb25maWc9Y29uZmlnLCAq Kmt3YXJncykKIAogICAgIGRlZiBhbGxfdGVzdF9jb25maWd1cmF0aW9ucyhzZWxmKToKICAgICAg ICAgcmV0dXJuIFtzZWxmLnRlc3RfY29uZmlndXJhdGlvbigpXQpAQCAtMjk1LDcgKzI5Nyw3IEBA IGNsYXNzIFdlYktpdERyaXZlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiB0ZXN0 X25vX3RpbWVvdXQoc2VsZik6CiAgICAgICAgIHBvcnQgPSBUZXN0V2ViS2l0UG9ydCgpCiAgICAg ICAgIGRyaXZlciA9IFdlYktpdERyaXZlcihwb3J0LCAwLCBwaXhlbF90ZXN0cz1UcnVlLCBub190 aW1lb3V0PVRydWUpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGRyaXZlci5jbWRfbGluZShU cnVlLCBbXSksIFsnTU9DSyBvdXRwdXQgb2YgY2hpbGQgcHJvY2Vzcy9EdW1wUmVuZGVyVHJlZScs ICctLW5vLXRpbWVvdXQnLCAnLS1waXhlbC10ZXN0cycsICctJ10pCisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWxzKGRyaXZlci5jbWRfbGluZShUcnVlLCBbXSksIFsnL21vY2stYnVpbGQvRHVtcFJl bmRlclRyZWUnLCAnLS1uby10aW1lb3V0JywgJy0tcGl4ZWwtdGVzdHMnLCAnLSddKQogCiAgICAg ZGVmIHRlc3RfY2hlY2tfZm9yX2RyaXZlcl9jcmFzaChzZWxmKToKICAgICAgICAgcG9ydCA9IFRl c3RXZWJLaXRQb3J0KCkK