64533 2011-07-14 09:13:20 -0700 new-run-webkit-tests crashes on Apple's Windows port when trying to launch Apache 2011-07-15 15:40:27 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 38756 1 aroben eric abarth dpranke eric ojan webkit.review.bot oldest_to_newest 437118 0 aroben 2011-07-14 09:13:20 -0700 To reproduce: 1. new-run-webkit-tests You'll see this: Starting HTTP server ...Traceback (most recent call last): File "/home/Adam Roben/dev/WebKit/OpenSource/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 433, in <module> sys.exit(main()) File "/home/Adam Roben/dev/WebKit/OpenSource/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 428, in main return run(port, options, args) File "/home/Adam Roben/dev/WebKit/OpenSource/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 107, in run num_unexpected_results = manager.run(result_summary) File "/home/Adam Roben/dev/WebKit/OpenSource/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 874, in run interrupted, keyboard_interrupted, thread_timings, test_timings, individual_test_timings = self._run_tests(self._test_files_list, result_summary) File "/home/Adam Roben/dev/WebKit/OpenSource/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 723, in _run_tests self.start_servers_with_lock() File "/home/Adam Roben/dev/WebKit/OpenSource/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 936, in start_servers_with_lock self._port.start_http_server() File "/home/Adam Roben/dev/WebKit/OpenSource/Tools/Scripts/webkitpy/layout_tests/port/base.py", line 667, in start_http_server server = apache_http_server.LayoutTestApacheHttpd(self, self.results_directory()) File "/home/Adam Roben/dev/WebKit/OpenSource/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py", line 79, in __init__ '-f', "\"%s\"" % self._get_apache_config_file_path(test_dir, output_dir), File "/home/Adam Roben/dev/WebKit/OpenSource/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py", line 167, in _get_apache_config_file_path cygusr = self._port_obj._path_from_base('third_party', 'cygwin', 'usr') AttributeError: 'WinPort' object has no attribute '_path_from_base' I think this is happening because apache_http_server.py has a whole bunch of code that assumes Chromium is the only port that uses Cygwin or Windows. 437234 1 aroben 2011-07-14 11:58:49 -0700 The last time we talked about this (2 years ago?) I think we discussed ripping out all the Chromium/Win support in this file, since Chromium uses LigHTTPD on Windows. 437238 2 eric 2011-07-14 12:02:40 -0700 Sounds like a great idea to me! I'm busy with other NRWT bugs atm, but I'll get to this one eventually if no one else does. 437249 3 ojan 2011-07-14 12:21:36 -0700 (In reply to comment #1) > The last time we talked about this (2 years ago?) I think we discussed ripping out all the Chromium/Win support in this file, since Chromium uses LigHTTPD on Windows. Yeah. I think that's probably the right thing to do. Eventually, I think Chromium will want to move Windows back to using Apache, but in the absence of someone willing to drive that effort, we shouldn't block other work on it. 437263 4 dpranke 2011-07-14 12:45:37 -0700 Even if Chromium ever does get around to using apache2 on Windows, it probably would make more sense for it to be the Win32 apache, in which case I bet most of that code would need to get rewritten anyway. 437899 5 101024 eric 2011-07-15 12:23:00 -0700 Created attachment 101024 Patch 437901 6 101024 aroben 2011-07-15 12:26:14 -0700 Comment on attachment 101024 Patch I think there's more code that can be removed. All uses of _cygwin_safe_join can be replaced with os.path.join, and all calls to _get_cygwin_path should be removed. 437902 7 aroben 2011-07-15 12:27:30 -0700 To put it more succinctly: We should change _is_cygwin to always return false, and then perform dead-code elimination. _is_cygwin really means "we're using Apache Cygwin but Win32 Python", which is not the case for Apple's Windows port. 437947 8 101035 eric 2011-07-15 13:24:36 -0700 Created attachment 101035 Patch 437949 9 eric 2011-07-15 13:25:13 -0700 Here is a second (more agressive) attempt per Adam's suggestion. 438026 10 101035 webkit.review.bot 2011-07-15 15:40:22 -0700 Comment on attachment 101035 Patch Clearing flags on attachment: 101035 Committed r91121: <http://trac.webkit.org/changeset/91121> 438027 11 webkit.review.bot 2011-07-15 15:40:27 -0700 All reviewed patches have been landed. Closing bug. 101024 2011-07-15 12:23:00 -0700 2011-07-15 13:24:30 -0700 Patch bug-64533-20110715122258.patch text/plain 3311 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTEwODQKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwMTk2M2RkN2RkZjMzY2NiNTU4NmNjOTIxMWEwMDVjN2U0 YjhiM2ZlLi5mNGIyMmRkODgzYjJlZDk4OTU2MGQ5MDlmNmE5MmI0ZTk3ODZmYjIwIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTEtMDctMTUgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IG5ldy1ydW4td2Via2l0LXRlc3RzIGNyYXNoZXMgb24gQXBwbGUncyBXaW5kb3dzIHBvcnQgd2hl biB0cnlpbmcgdG8gbGF1bmNoIEFwYWNoZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjQ1MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBCbGluZCByZW1vdmFsIG9mIENocm9taXVtLXNwZWNpZmljIGNvZGUg KG5vdyB0aGF0IENocm9taXVtIGRvZXMgbm90IHVzZSB0aGlzIGZpbGUpLgorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9hcGFjaGVfaHR0cF9zZXJ2ZXIu cHk6CisKIDIwMTEtMDctMTUgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29t PgogCiAgICAgICAgIEJ1aWxkIGZpeGVzIGZvciBXZWJLaXQyLiBFbnN1cmUgdGhhdCBhbGwgZ2Vu ZXJhdGVkIHNvdXJjZXMgYXJlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9zZXJ2ZXJzL2FwYWNoZV9odHRwX3NlcnZlci5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvYXBhY2hlX2h0dHBfc2VydmVyLnB5CmluZGV4 IDYyMjY4ZjI4MTY3MzJmOWU4NjhlMDgyNjQxMmU3Njg1YTg1MzhkOTUuLmY1MWNhOGVjOGU5NThi MGZkOTcyNzM4YmYyZjAxMzI3ZmIwNGQ0MDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvYXBhY2hlX2h0dHBfc2VydmVyLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvYXBhY2hlX2h0dHBfc2Vy dmVyLnB5CkBAIC05NiwxOCArOTYsMTcgQEAgY2xhc3MgTGF5b3V0VGVzdEFwYWNoZUh0dHBkKGh0 dHBfc2VydmVyX2Jhc2UuSHR0cFNlcnZlckJhc2UpOgogICAgICAgICAgICAgJy1rJywgInN0b3Ai XQogCiAgICAgICAgIGlmIHNlbGYuX2lzX2N5Z3dpbigpOgotICAgICAgICAgICAgY3lnYmluID0g c2VsZi5fcG9ydF9vYmouX3BhdGhfZnJvbV9iYXNlKCd0aGlyZF9wYXJ0eScsICdjeWd3aW4nLCAn YmluJykKICAgICAgICAgICAgICMgTm90IGVudGlyZWx5IHN1cmUgd2h5LCBidXQgZnJvbSBjeWd3 aW4gd2UgbmVlZCB0byBydW4gdGhlCiAgICAgICAgICAgICAjIGh0dHBkIGNvbW1hbmQgdGhyb3Vn aCBiYXNoLgogICAgICAgICAgICAgc2VsZi5fc3RhcnRfY21kID0gWwogICAgICAgICAgICAgICAg IG9zLnBhdGguam9pbihjeWdiaW4sICdiYXNoLmV4ZScpLAogICAgICAgICAgICAgICAgICctYycs Ci0gICAgICAgICAgICAgICAgJ1BBVEg9JXMgJXMnICUgKHNlbGYuX2dldF9jeWd3aW5fcGF0aChj eWdiaW4pLCAiICIuam9pbihzdGFydF9jbWQpKSwKKyAgICAgICAgICAgICAgICAnUEFUSD0lcyAl cycgJSAoc2VsZi5fZ2V0X2N5Z3dpbl9wYXRoKCcvYmluJyksICIgIi5qb2luKHN0YXJ0X2NtZCkp LAogICAgICAgICAgICAgICBdCiAgICAgICAgICAgICBzZWxmLl9zdG9wX2NtZCA9IFsKICAgICAg ICAgICAgICAgICBvcy5wYXRoLmpvaW4oY3lnYmluLCAnYmFzaC5leGUnKSwKICAgICAgICAgICAg ICAgICAnLWMnLAotICAgICAgICAgICAgICAgICdQQVRIPSVzICVzJyAlIChzZWxmLl9nZXRfY3ln d2luX3BhdGgoY3lnYmluKSwgIiAiLmpvaW4oc3RvcF9jbWQpKSwKKyAgICAgICAgICAgICAgICAn UEFUSD0lcyAlcycgJSAoc2VsZi5fZ2V0X2N5Z3dpbl9wYXRoKCcvYmluJyksICIgIi5qb2luKHN0 b3BfY21kKSksCiAgICAgICAgICAgICAgIF0KICAgICAgICAgZWxzZToKICAgICAgICAgICAgICMg VE9ETyhvamFuKTogV2hlbiB3ZSBnZXQgY3lnd2luIHVzaW5nIEFwYWNoZSAyLCB1c2Ugc2V0IHRo ZQpAQCAtMTU2LDE2ICsxNTUsNiBAQCBjbGFzcyBMYXlvdXRUZXN0QXBhY2hlSHR0cGQoaHR0cF9z ZXJ2ZXJfYmFzZS5IdHRwU2VydmVyQmFzZSk6CiAgICAgICAgIGh0dHBkX2NvbmZpZyA9IHNlbGYu X3BvcnRfb2JqLl9wYXRoX3RvX2FwYWNoZV9jb25maWdfZmlsZSgpCiAgICAgICAgIGh0dHBkX2Nv bmZpZ19jb3B5ID0gb3MucGF0aC5qb2luKG91dHB1dF9kaXIsICJodHRwZC5jb25mIikKICAgICAg ICAgaHR0cGRfY29uZiA9IHNlbGYuX2ZpbGVzeXN0ZW0ucmVhZF90ZXh0X2ZpbGUoaHR0cGRfY29u ZmlnKQotICAgICAgICAjIEZJWE1FOiBUaGlzIG9ubHkgd29ya3MgZm9yIENocm9taXVtLiBJbnN0 ZWFkIGl0IHNob3VsZCB1c2Ugc29tZSBhYnN0cmFjdGlvbiBvbiB0aGUgcG9ydCBvYmplY3QuCi0g ICAgICAgIGlmIHNlbGYuX2lzX2N5Z3dpbigpOgotICAgICAgICAgICAgIyBUaGlzIGlzIGEgZ3Jv c3MgaGFjaywgYnV0IGl0IGxldHMgdXMgdXNlIHRoZSB1cHN0cmVhbSAuY29uZiBmaWxlCi0gICAg ICAgICAgICAjIGFuZCBvdXIgY2hlY2tlZCBpbiBjeWd3aW4uIFRoaXMgdGVsbHMgdGhlIHNlcnZl ciB0aGUgcm9vdAotICAgICAgICAgICAgIyBkaXJlY3RvcnkgdG8gbG9vayBpbiBmb3IgLnNvIG1v ZHVsZXMuIEl0IHdpbGwgdXNlIHRoaXMgcGF0aAotICAgICAgICAgICAgIyBwbHVzIHRoZSByZWxh dGl2ZSBwYXRocyB0byB0aGUgLnNvIGZpbGVzIGxpc3RlZCBpbiB0aGUgLmNvbmYKLSAgICAgICAg ICAgICMgZmlsZS4gV2UgaGF2ZSBhcGFjaGUvY3lnd2luIGNoZWNrZWQgaW50byBvdXIgdHJlZSBz bwotICAgICAgICAgICAgIyBwZW9wbGUgZG9uJ3QgaGF2ZSB0byBpbnN0YWxsIGl0IGludG8gdGhl aXIgY3lnd2luLgotICAgICAgICAgICAgY3lndXNyID0gc2VsZi5fcG9ydF9vYmouX3BhdGhfZnJv bV9iYXNlKCd0aGlyZF9wYXJ0eScsICdjeWd3aW4nLCAndXNyJykKLSAgICAgICAgICAgIGh0dHBk X2NvbmYgPSBodHRwZF9jb25mLnJlcGxhY2UoJ1NlcnZlclJvb3QgIi91c3IiJywgJ1NlcnZlclJv b3QgIiVzIicgJSBzZWxmLl9nZXRfY3lnd2luX3BhdGgoY3lndXNyKSkKIAogICAgICAgICBzZWxm Ll9maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZShodHRwZF9jb25maWdfY29weSwgaHR0cGRfY29u ZikKIAo= 101035 2011-07-15 13:24:36 -0700 2011-07-15 15:40:22 -0700 Patch bug-64533-20110715132434.patch text/plain 7803 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTEwODQKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwMTk2M2RkN2RkZjMzY2NiNTU4NmNjOTIxMWEwMDVjN2U0 YjhiM2ZlLi5mNGIyMmRkODgzYjJlZDk4OTU2MGQ5MDlmNmE5MmI0ZTk3ODZmYjIwIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTEtMDctMTUgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IG5ldy1ydW4td2Via2l0LXRlc3RzIGNyYXNoZXMgb24gQXBwbGUncyBXaW5kb3dzIHBvcnQgd2hl biB0cnlpbmcgdG8gbGF1bmNoIEFwYWNoZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjQ1MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBCbGluZCByZW1vdmFsIG9mIENocm9taXVtLXNwZWNpZmljIGNvZGUg KG5vdyB0aGF0IENocm9taXVtIGRvZXMgbm90IHVzZSB0aGlzIGZpbGUpLgorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9hcGFjaGVfaHR0cF9zZXJ2ZXIu cHk6CisKIDIwMTEtMDctMTUgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29t PgogCiAgICAgICAgIEJ1aWxkIGZpeGVzIGZvciBXZWJLaXQyLiBFbnN1cmUgdGhhdCBhbGwgZ2Vu ZXJhdGVkIHNvdXJjZXMgYXJlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9zZXJ2ZXJzL2FwYWNoZV9odHRwX3NlcnZlci5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvYXBhY2hlX2h0dHBfc2VydmVyLnB5CmluZGV4 IDYyMjY4ZjI4MTY3MzJmOWU4NjhlMDgyNjQxMmU3Njg1YTg1MzhkOTUuLjRlYTJjNDg5MmIyMTBk MzM0OWVhOTcyZTFlNWIzYjY2MTVmZTI5OWMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvYXBhY2hlX2h0dHBfc2VydmVyLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvYXBhY2hlX2h0dHBfc2Vy dmVyLnB5CkBAIC02MiwxOCArNjIsMTYgQEAgY2xhc3MgTGF5b3V0VGVzdEFwYWNoZUh0dHBkKGh0 dHBfc2VydmVyX2Jhc2UuSHR0cFNlcnZlckJhc2UpOgogICAgICAgICBzZWxmLl9waWRfZmlsZSA9 IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl9ydW50aW1lX3BhdGgsICclcy5waWQnICUgc2Vs Zi5fbmFtZSkKIAogICAgICAgICB0ZXN0X2RpciA9IHNlbGYuX3BvcnRfb2JqLmxheW91dF90ZXN0 c19kaXIoKQotICAgICAgICBqc190ZXN0X3Jlc291cmNlc19kaXIgPSBzZWxmLl9jeWd3aW5fc2Fm ZV9qb2luKHRlc3RfZGlyLCAiZmFzdCIsICJqcyIsICJyZXNvdXJjZXMiKQotICAgICAgICBtZWRp YV9yZXNvdXJjZXNfZGlyID0gc2VsZi5fY3lnd2luX3NhZmVfam9pbih0ZXN0X2RpciwgIm1lZGlh IikKLSAgICAgICAgbWltZV90eXBlc19wYXRoID0gc2VsZi5fY3lnd2luX3NhZmVfam9pbih0ZXN0 X2RpciwgImh0dHAiLCAiY29uZiIsICJtaW1lLnR5cGVzIikKLSAgICAgICAgY2VydF9maWxlID0g c2VsZi5fY3lnd2luX3NhZmVfam9pbih0ZXN0X2RpciwgImh0dHAiLCAiY29uZiIsICJ3ZWJraXQt aHR0cGQucGVtIikKLSAgICAgICAgYWNjZXNzX2xvZyA9IHNlbGYuX2N5Z3dpbl9zYWZlX2pvaW4o b3V0cHV0X2RpciwgImFjY2Vzc19sb2cudHh0IikKLSAgICAgICAgZXJyb3JfbG9nID0gc2VsZi5f Y3lnd2luX3NhZmVfam9pbihvdXRwdXRfZGlyLCAiZXJyb3JfbG9nLnR4dCIpCi0gICAgICAgIGRv Y3VtZW50X3Jvb3QgPSBzZWxmLl9jeWd3aW5fc2FmZV9qb2luKHRlc3RfZGlyLCAiaHR0cCIsICJ0 ZXN0cyIpCisgICAgICAgIGpzX3Rlc3RfcmVzb3VyY2VzX2RpciA9IHNlbGYuX2ZpbGVzeXN0ZW0u am9pbih0ZXN0X2RpciwgImZhc3QiLCAianMiLCAicmVzb3VyY2VzIikKKyAgICAgICAgbWVkaWFf cmVzb3VyY2VzX2RpciA9IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbih0ZXN0X2RpciwgIm1lZGlhIikK KyAgICAgICAgbWltZV90eXBlc19wYXRoID0gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHRlc3RfZGly LCAiaHR0cCIsICJjb25mIiwgIm1pbWUudHlwZXMiKQorICAgICAgICBjZXJ0X2ZpbGUgPSBzZWxm Ll9maWxlc3lzdGVtLmpvaW4odGVzdF9kaXIsICJodHRwIiwgImNvbmYiLCAid2Via2l0LWh0dHBk LnBlbSIpCisgICAgICAgIGFjY2Vzc19sb2cgPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4ob3V0cHV0 X2RpciwgImFjY2Vzc19sb2cudHh0IikKKyAgICAgICAgZXJyb3JfbG9nID0gc2VsZi5fZmlsZXN5 c3RlbS5qb2luKG91dHB1dF9kaXIsICJlcnJvcl9sb2cudHh0IikKKyAgICAgICAgZG9jdW1lbnRf cm9vdCA9IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbih0ZXN0X2RpciwgImh0dHAiLCAidGVzdHMiKQog CiAgICAgICAgICMgRklYTUU6IFdlIHNob3VsZG4ndCBiZSBjYWxsaW5nIGEgcHJvdGVjdGVkIG1l dGhvZCBvZiBfcG9ydF9vYmohCiAgICAgICAgIGV4ZWN1dGFibGUgPSBzZWxmLl9wb3J0X29iai5f cGF0aF90b19hcGFjaGUoKQotICAgICAgICBpZiBzZWxmLl9pc19jeWd3aW4oKToKLSAgICAgICAg ICAgIGV4ZWN1dGFibGUgPSBzZWxmLl9nZXRfY3lnd2luX3BhdGgoZXhlY3V0YWJsZSkKIAogICAg ICAgICBzdGFydF9jbWQgPSBbZXhlY3V0YWJsZSwKICAgICAgICAgICAgICctZicsICJcIiVzXCIi ICUgc2VsZi5fZ2V0X2FwYWNoZV9jb25maWdfZmlsZV9wYXRoKHRlc3RfZGlyLCBvdXRwdXRfZGly KSwKQEAgLTg1LDggKzgzLDcgQEAgY2xhc3MgTGF5b3V0VGVzdEFwYWNoZUh0dHBkKGh0dHBfc2Vy dmVyX2Jhc2UuSHR0cFNlcnZlckJhc2UpOgogICAgICAgICAgICAgJy1jJywgIlwnVHlwZXNDb25m aWcgXCIlc1wiXCciICUgbWltZV90eXBlc19wYXRoLAogICAgICAgICAgICAgJy1jJywgIlwnQ3Vz dG9tTG9nIFwiJXNcIiBjb21tb25cJyIgJSBhY2Nlc3NfbG9nLAogICAgICAgICAgICAgJy1jJywg IlwnRXJyb3JMb2cgXCIlc1wiXCciICUgZXJyb3JfbG9nLAotICAgICAgICAgICAgJy1DJywgIlwn VXNlciBcIiVzXCJcJyIgJSBvcy5lbnZpcm9uLmdldCgiVVNFUk5BTUUiLAotICAgICAgICAgICAg ICAgIG9zLmVudmlyb24uZ2V0KCJVU0VSIiwgIiIpKSwKKyAgICAgICAgICAgICctQycsICJcJ1Vz ZXIgXCIlc1wiXCciICUgb3MuZW52aXJvbi5nZXQoIlVTRVJOQU1FIiwgb3MuZW52aXJvbi5nZXQo IlVTRVIiLCAiIikpLAogICAgICAgICAgICAgJy1jJywgIlwnUGlkRmlsZSAlcyciICUgc2VsZi5f cGlkX2ZpbGUsCiAgICAgICAgICAgICAnLWsnLCAic3RhcnQiXQogCkBAIC05NSw1NyArOTIsMTMg QEAgY2xhc3MgTGF5b3V0VGVzdEFwYWNoZUh0dHBkKGh0dHBfc2VydmVyX2Jhc2UuSHR0cFNlcnZl ckJhc2UpOgogICAgICAgICAgICAgJy1jJywgIlwnUGlkRmlsZSAlcyciICUgc2VsZi5fcGlkX2Zp bGUsCiAgICAgICAgICAgICAnLWsnLCAic3RvcCJdCiAKLSAgICAgICAgaWYgc2VsZi5faXNfY3ln d2luKCk6Ci0gICAgICAgICAgICBjeWdiaW4gPSBzZWxmLl9wb3J0X29iai5fcGF0aF9mcm9tX2Jh c2UoJ3RoaXJkX3BhcnR5JywgJ2N5Z3dpbicsICdiaW4nKQotICAgICAgICAgICAgIyBOb3QgZW50 aXJlbHkgc3VyZSB3aHksIGJ1dCBmcm9tIGN5Z3dpbiB3ZSBuZWVkIHRvIHJ1biB0aGUKLSAgICAg ICAgICAgICMgaHR0cGQgY29tbWFuZCB0aHJvdWdoIGJhc2guCi0gICAgICAgICAgICBzZWxmLl9z dGFydF9jbWQgPSBbCi0gICAgICAgICAgICAgICAgb3MucGF0aC5qb2luKGN5Z2JpbiwgJ2Jhc2gu ZXhlJyksCi0gICAgICAgICAgICAgICAgJy1jJywKLSAgICAgICAgICAgICAgICAnUEFUSD0lcyAl cycgJSAoc2VsZi5fZ2V0X2N5Z3dpbl9wYXRoKGN5Z2JpbiksICIgIi5qb2luKHN0YXJ0X2NtZCkp LAotICAgICAgICAgICAgICBdCi0gICAgICAgICAgICBzZWxmLl9zdG9wX2NtZCA9IFsKLSAgICAg ICAgICAgICAgICBvcy5wYXRoLmpvaW4oY3lnYmluLCAnYmFzaC5leGUnKSwKLSAgICAgICAgICAg ICAgICAnLWMnLAotICAgICAgICAgICAgICAgICdQQVRIPSVzICVzJyAlIChzZWxmLl9nZXRfY3ln d2luX3BhdGgoY3lnYmluKSwgIiAiLmpvaW4oc3RvcF9jbWQpKSwKLSAgICAgICAgICAgICAgXQot ICAgICAgICBlbHNlOgotICAgICAgICAgICAgIyBUT0RPKG9qYW4pOiBXaGVuIHdlIGdldCBjeWd3 aW4gdXNpbmcgQXBhY2hlIDIsIHVzZSBzZXQgdGhlCi0gICAgICAgICAgICAjIGNlcnQgZmlsZSBm b3IgY3lnd2luIGFzIHdlbGwuCi0gICAgICAgICAgICBzdGFydF9jbWQuZXh0ZW5kKFsnLWMnLCAi XCdTU0xDZXJ0aWZpY2F0ZUZpbGUgJXNcJyIgJSBjZXJ0X2ZpbGVdKQotICAgICAgICAgICAgIyBK b2luIHRoZSBzdHJpbmcgaGVyZSBzbyB0aGF0IEN5Z3dpbi9XaW5kb3dzIGFuZCBNYWMvTGludXgK LSAgICAgICAgICAgICMgY2FuIHVzZSB0aGUgc2FtZSBjb2RlLiBPdGhlcndpc2UsIHdlIGNvdWxk IHJlbW92ZSB0aGUgc2luZ2xlCi0gICAgICAgICAgICAjIHF1b3RlcyBhYm92ZSBhbmQga2VlcCBj bWQgYXMgYSBzZXF1ZW5jZS4KLSAgICAgICAgICAgIHNlbGYuX3N0YXJ0X2NtZCA9ICIgIi5qb2lu KHN0YXJ0X2NtZCkKLSAgICAgICAgICAgIHNlbGYuX3N0b3BfY21kID0gIiAiLmpvaW4oc3RvcF9j bWQpCi0KLSAgICBkZWYgX2lzX2N5Z3dpbihzZWxmKToKLSAgICAgICAgcmV0dXJuIHN5cy5wbGF0 Zm9ybSBpbiAoIndpbjMyIiwgImN5Z3dpbiIpCi0KLSAgICAjIEZJWE1FOiBUaGlzIGlzIHRoZSB3 cm9uZyBwbGFjZSB0byBoYXZlIHRoaXMgbWV0aG9kLiAgUGVyaGFwcyB0aGlzIGJlbG9uZ3MgaW4g ZmlsZXN5c3RlbS5weT8KLSAgICBkZWYgX2N5Z3dpbl9zYWZlX2pvaW4oc2VsZiwgKnBhcnRzKToK LSAgICAgICAgcGF0aCA9IG9zLnBhdGguam9pbigqcGFydHMpCi0gICAgICAgIGlmIHNlbGYuX2lz X2N5Z3dpbigpOgotICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2dldF9jeWd3aW5fcGF0aChwYXRo KQotICAgICAgICByZXR1cm4gcGF0aAotCi0gICAgZGVmIF9nZXRfY3lnd2luX3BhdGgoc2VsZiwg cGF0aCk6Ci0gICAgICAgICIiIkNvbnZlcnQgYSBXaW5kb3dzIHBhdGggdG8gYSBjeWd3aW4gcGF0 aC4KLQotICAgICAgICBUaGUgY3lncGF0aCB1dGlsaXR5IGluc2lzdHMgb24gY29udmVydGluZyBw YXRocyB0aGF0IGl0IHRoaW5rcyBhcmUKLSAgICAgICAgQ3lnd2luIHJvb3QgcGF0aHMgdG8gd2hh dCBpdCB0aGlua3MgdGhlIGNvcnJlY3Qgcm9vdHMgYXJlLiAgU28gcGF0aHMKLSAgICAgICAgc3Vj aCBhcyAiQzpcYlxzbGF2ZVx3ZWJraXQtcmVsZWFzZVxidWlsZFx0aGlyZF9wYXJ0eVxjeWd3aW5c YmluIgotICAgICAgICBhcmUgY29udmVydGVkIHRvIHBsYWluICIvdXNyL2JpbiIuICBUbyBhdm9p ZCB0aGlzLCB3ZQotICAgICAgICBkbyB0aGUgY29udmVyc2lvbiBtYW51YWxseS4KLQotICAgICAg ICBUaGUgcGF0aCBpcyBleHBlY3RlZCB0byBiZSBhbiBhYnNvbHV0ZSBwYXRoLCBvbiBhbnkgZHJp dmUuCi0gICAgICAgICIiIgotICAgICAgICBkcml2ZV9yZWdleHAgPSByZS5jb21waWxlKHInKFth LXpdKTpbL1xcXScsIHJlLklHTk9SRUNBU0UpCi0KLSAgICAgICAgZGVmIGxvd2VyX2RyaXZlKG1h dGNob2JqKToKLSAgICAgICAgICAgIHJldHVybiAnL2N5Z2RyaXZlLyVzLycgJSBtYXRjaG9iai5n cm91cCgxKS5sb3dlcigpCi0gICAgICAgIHBhdGggPSBkcml2ZV9yZWdleHAuc3ViKGxvd2VyX2Ry aXZlLCBwYXRoKQotICAgICAgICByZXR1cm4gcGF0aC5yZXBsYWNlKCdcXCcsICcvJykKKyAgICAg ICAgc3RhcnRfY21kLmV4dGVuZChbJy1jJywgIlwnU1NMQ2VydGlmaWNhdGVGaWxlICVzXCciICUg Y2VydF9maWxlXSkKKyAgICAgICAgIyBKb2luIHRoZSBzdHJpbmcgaGVyZSBzbyB0aGF0IEN5Z3dp bi9XaW5kb3dzIGFuZCBNYWMvTGludXgKKyAgICAgICAgIyBjYW4gdXNlIHRoZSBzYW1lIGNvZGUu IE90aGVyd2lzZSwgd2UgY291bGQgcmVtb3ZlIHRoZSBzaW5nbGUKKyAgICAgICAgIyBxdW90ZXMg YWJvdmUgYW5kIGtlZXAgY21kIGFzIGEgc2VxdWVuY2UuCisgICAgICAgICMgRklYTUU6IEl0J3Mg dW5jbGVhciBpZiB0aGlzIGlzIHN0aWxsIG5lZWRlZC4KKyAgICAgICAgc2VsZi5fc3RhcnRfY21k ID0gIiAiLmpvaW4oc3RhcnRfY21kKQorICAgICAgICBzZWxmLl9zdG9wX2NtZCA9ICIgIi5qb2lu KHN0b3BfY21kKQogCiAgICAgZGVmIF9nZXRfYXBhY2hlX2NvbmZpZ19maWxlX3BhdGgoc2VsZiwg dGVzdF9kaXIsIG91dHB1dF9kaXIpOgogICAgICAgICAiIiJSZXR1cm5zIHRoZSBwYXRoIHRvIHRo ZSBhcGFjaGUgY29uZmlnIGZpbGUgdG8gdXNlLgpAQCAtMTU2LDIxICsxMDksMTAgQEAgY2xhc3Mg TGF5b3V0VGVzdEFwYWNoZUh0dHBkKGh0dHBfc2VydmVyX2Jhc2UuSHR0cFNlcnZlckJhc2UpOgog ICAgICAgICBodHRwZF9jb25maWcgPSBzZWxmLl9wb3J0X29iai5fcGF0aF90b19hcGFjaGVfY29u ZmlnX2ZpbGUoKQogICAgICAgICBodHRwZF9jb25maWdfY29weSA9IG9zLnBhdGguam9pbihvdXRw dXRfZGlyLCAiaHR0cGQuY29uZiIpCiAgICAgICAgIGh0dHBkX2NvbmYgPSBzZWxmLl9maWxlc3lz dGVtLnJlYWRfdGV4dF9maWxlKGh0dHBkX2NvbmZpZykKLSAgICAgICAgIyBGSVhNRTogVGhpcyBv bmx5IHdvcmtzIGZvciBDaHJvbWl1bS4gSW5zdGVhZCBpdCBzaG91bGQgdXNlIHNvbWUgYWJzdHJh Y3Rpb24gb24gdGhlIHBvcnQgb2JqZWN0LgotICAgICAgICBpZiBzZWxmLl9pc19jeWd3aW4oKToK LSAgICAgICAgICAgICMgVGhpcyBpcyBhIGdyb3NzIGhhY2ssIGJ1dCBpdCBsZXRzIHVzIHVzZSB0 aGUgdXBzdHJlYW0gLmNvbmYgZmlsZQotICAgICAgICAgICAgIyBhbmQgb3VyIGNoZWNrZWQgaW4g Y3lnd2luLiBUaGlzIHRlbGxzIHRoZSBzZXJ2ZXIgdGhlIHJvb3QKLSAgICAgICAgICAgICMgZGly ZWN0b3J5IHRvIGxvb2sgaW4gZm9yIC5zbyBtb2R1bGVzLiBJdCB3aWxsIHVzZSB0aGlzIHBhdGgK LSAgICAgICAgICAgICMgcGx1cyB0aGUgcmVsYXRpdmUgcGF0aHMgdG8gdGhlIC5zbyBmaWxlcyBs aXN0ZWQgaW4gdGhlIC5jb25mCi0gICAgICAgICAgICAjIGZpbGUuIFdlIGhhdmUgYXBhY2hlL2N5 Z3dpbiBjaGVja2VkIGludG8gb3VyIHRyZWUgc28KLSAgICAgICAgICAgICMgcGVvcGxlIGRvbid0 IGhhdmUgdG8gaW5zdGFsbCBpdCBpbnRvIHRoZWlyIGN5Z3dpbi4KLSAgICAgICAgICAgIGN5Z3Vz ciA9IHNlbGYuX3BvcnRfb2JqLl9wYXRoX2Zyb21fYmFzZSgndGhpcmRfcGFydHknLCAnY3lnd2lu JywgJ3VzcicpCi0gICAgICAgICAgICBodHRwZF9jb25mID0gaHR0cGRfY29uZi5yZXBsYWNlKCdT ZXJ2ZXJSb290ICIvdXNyIicsICdTZXJ2ZXJSb290ICIlcyInICUgc2VsZi5fZ2V0X2N5Z3dpbl9w YXRoKGN5Z3VzcikpCiAKKyAgICAgICAgIyBGSVhNRTogV2h5IGRvIHdlIG5lZWQgdG8gY29weSB0 aGUgY29uZmlnIGZpbGUgc2luY2Ugd2UncmUgbm90IG1vZGlmeWluZyBpdD8KICAgICAgICAgc2Vs Zi5fZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUoaHR0cGRfY29uZmlnX2NvcHksIGh0dHBkX2Nv bmYpCiAKLSAgICAgICAgaWYgc2VsZi5faXNfY3lnd2luKCk6Ci0gICAgICAgICAgICByZXR1cm4g c2VsZi5fZ2V0X2N5Z3dpbl9wYXRoKGh0dHBkX2NvbmZpZ19jb3B5KQogICAgICAgICByZXR1cm4g aHR0cGRfY29uZmlnX2NvcHkKIAogICAgIGRlZiBfc3Bhd25fcHJvY2VzcyhzZWxmKToK