151156 2015-11-11 14:42:47 -0800 [Win] webkitpy is applying abspath to DOS paths, yielding invalid paths 2015-11-19 10:43:00 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=151240 P2 Normal --- 1 bfulgham bfulgham achristensen ap bfulgham commit-queue glenn lforschler ossy ryanhaddad oldest_to_newest 1141229 0 bfulgham 2015-11-11 14:42:47 -0800 Because we are in the process of moving from pure Cygwin to a pure Windows build, some of our Cygwin tools end up calling native Perl and Python. When this happens, the path types received by Cygwin scripts can sometimes be unexpected. The most obvious example of this failure is: > run-webkit-tests -1 fast ... yielding the error: DumpRenderTree was not found at /home/trybot/WebKit/C:/cygwin/home/trybot/WebKit/WebKitBuild/Relese/bin32/DumpRenderTree This is happening because a DOS style path is being passed through a Cygwin "abspath' command, which prefixes the passed path with the current directories absolute path. This is wrong behavior, and should not be used when running under Cygwin or native Windows. 1141230 1 265320 bfulgham 2015-11-11 14:47:28 -0800 Created attachment 265320 Patch 1141253 2 bfulgham 2015-11-11 15:39:21 -0800 Committed r192330: <http://trac.webkit.org/changeset/192330> 1141277 3 265320 ap 2015-11-11 16:34:44 -0800 Comment on attachment 265320 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=265320&action=review > Tools/Scripts/webkitpy/port/base.py:781 > - self._results_directory = self._filesystem.abspath(option_val) > + if sys.platform in ('win32', 'cygwin'): > + self._results_directory = option_val > + else: > + self._results_directory = self._filesystem.abspath(option_val) Should self._filesystem.abspath do the right thing on Windows? Or do we expect to use Unix style paths most pf the time? 1141304 4 bfulgham 2015-11-11 17:13:43 -0800 (In reply to comment #3) > Comment on attachment 265320 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=265320&action=review > > > Tools/Scripts/webkitpy/port/base.py:781 > > - self._results_directory = self._filesystem.abspath(option_val) > > + if sys.platform in ('win32', 'cygwin'): > > + self._results_directory = option_val > > + else: > > + self._results_directory = self._filesystem.abspath(option_val) > > Should self._filesystem.abspath do the right thing on Windows? Or do we > expect to use Unix style paths most pf the time? This is just a weird edge case. "self._filesystem.abspath" is just a wrapper around the os.filesystem.abspath. On Cygwin that tries to covert things based on "/cygpath/C/..." (or whatever), and since it doesn't understand DOS paths, it doesn't properly combine the two paths. When we run under native Windows, the abspath would probably do the right thing. We should probably revisit this special case once that work is finished. 1141504 5 ossy 2015-11-12 09:37:12 -0800 (In reply to comment #2) > Committed r192330: <http://trac.webkit.org/changeset/192330> It broke layout testing on the Apple Windows bots: ServerError raised: Failed to start httpd: httpd.exe: Could not open configuration file C:/xampp/apache/layout-test-results/httpd.conf: The system cannot find the path specified. Traceback (most recent call last): File "/home/buildbot/slave/win-release-tests/build/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 77, in main run_details = run(port, options, args, stderr) File "/home/buildbot/slave/win-release-tests/build/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 409, in run run_details = manager.run(args) File "/home/buildbot/slave/win-release-tests/build/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 196, in run int(self._options.child_processes), retrying=False) File "/home/buildbot/slave/win-release-tests/build/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 259, in _run_tests return self._runner.run_tests(self._expectations, test_inputs, tests_to_skip, num_workers, needs_http, needs_websockets, needs_web_platform_test_server, retrying) File "/home/buildbot/slave/win-release-tests/build/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py", line 107, in run_tests self.start_servers() File "/home/buildbot/slave/win-release-tests/build/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py", line 190, in start_servers self._port.start_http_server() File "/home/buildbot/slave/win-release-tests/build/Tools/Scripts/webkitpy/port/base.py", line 901, in start_http_server server.start() File "/home/buildbot/slave/win-release-tests/build/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py", line 89, in start self._pid = self._spawn_process() File "/home/buildbot/slave/win-release-tests/build/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py", line 171, in _spawn_process raise http_server_base.ServerError('Failed to start %s: %s' % (self._name, err)) ServerError: Failed to start httpd: httpd.exe: Could not open configuration file C:/xampp/apache/layout-test-results/httpd.conf: The system cannot find the path specified. No handlers could be found for logger "webkitpy.port.win" Additionally it broke a webkitpy test on the Apple Windows bots: [452/1444] webkitpy.layout_tests.run_webkit_tests_integrationtest.RunTest.test_results_directory_relative failed: Traceback (most recent call last): File "/home/buildbot/slave/win-release-tests/build/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py", line 625, in test_results_directory_relative self.assertEqual(user.opened_urls, [path.abspath_to_uri(host.platform, '/tmp/cwd/foo/results.html')]) AssertionError: Lists differ: ['file://foo/results.html'] != ['file:///tmp/cwd/foo/results.... First differing element 0: file://foo/results.html file:///tmp/cwd/foo/results.html - ['file://foo/results.html'] + ['file:///tmp/cwd/foo/results.html'] ? +++++++++ 1141507 6 bfulgham 2015-11-12 09:45:01 -0800 (In reply to comment #5) > (In reply to comment #2) > > Committed r192330: <http://trac.webkit.org/changeset/192330> > > It broke layout testing on the Apple Windows bots: > ServerError raised: Failed to start httpd: httpd.exe: Could not open > configuration file C:/xampp/apache/layout-test-results/httpd.conf: The > system cannot find the path specified. > Whoops! I'll correct that. 1141587 7 265421 bfulgham 2015-11-12 12:31:26 -0800 Created attachment 265421 Patch v2 1141590 8 265421 bfulgham 2015-11-12 12:37:26 -0800 Comment on attachment 265421 Patch v2 This patch allows us to give Cygwin paths to Python libraries that expect UNIX style paths. Although we generally want to be dealing in native DOS paths on Windows, when the test infrastructure is run inside Cygwin Python, we need to give Python paths that it can handle properly. 1141684 9 bfulgham 2015-11-12 16:21:09 -0800 Committed r192395: <http://trac.webkit.org/changeset/192395> 1141792 10 ossy 2015-11-13 00:45:18 -0800 (In reply to comment #9) > Committed r192395: <http://trac.webkit.org/changeset/192395> Layout testing is stilk broken on the Apple Windows bots. 1141841 11 bfulgham 2015-11-13 09:20:37 -0800 (In reply to comment #10) > (In reply to comment #9) > > Committed r192395: <http://trac.webkit.org/changeset/192395> > > Layout testing is stilk broken on the Apple Windows bots. Interesting. The tests run when triggered from the command line. The BuildSlave environment must be set differently. 1141842 12 bfulgham 2015-11-13 09:24:17 -0800 I see the problem. We launch Apache with a relative path to the configuration file: 08:18:57.398 6484 Starting httpd server, cmd="C:/xampp/apache/bin/httpd.exe -f "layout-test-results/httpd.conf" -C 'DocumentRoot "C:/cygwin/home/buildbot/slave/win-release-tests/build/LayoutTests/http/tests"' -c 'Alias /js-test-resources "C:/cygwin/home/buildbot/slave/win-release-tests/build/LayoutTests/resources"' -c 'Alias /media-resources "C:/cygwin/home/buildbot/slave/win-release-tests/build/LayoutTests/media"' -c 'TypesConfig "C:/cygwin/home/buildbot/slave/win-release-tests/build/LayoutTests/http/conf/mime.types"' -c 'CustomLog "layout-test-results/access_log.txt" common' -c 'ErrorLog "layout-test-results/error_log.txt"' -c 'PidFile C:/xampp/apache/logs/httpd.pid' -k start -C 'Listen 127.0.0.1:8000' -C 'Listen 127.0.0.1:8080' -C 'Listen 127.0.0.1:8443' -c 'SSLCertificateFile C:/cygwin/home/buildbot/slave/win-release-tests/build/LayoutTests/http/conf/webkit-httpd.pem'" The -f "layout-tests-results/httpd.conf" is getting converted to the httpd.exe root directory -> "C:/xampp/apache/layout-test-results/httpd.conf". We should be passing the full path to the 'httpd.conf', since it lives in the test folder. 1141893 13 bfulgham 2015-11-13 11:36:39 -0800 Fix landed in <https://trac.webkit.org/changeset/192431>. 1142242 14 ryanhaddad 2015-11-16 09:41:39 -0800 (In reply to comment #13) > Fix landed in <https://trac.webkit.org/changeset/192431>. The tests are now running, but they are exiting early after 500 failures. Do you think this could still be fallout from this change? 1142793 15 ossy 2015-11-18 02:38:36 -0800 (In reply to comment #14) > (In reply to comment #13) > > Fix landed in <https://trac.webkit.org/changeset/192431>. > > The tests are now running, but they are exiting early after 500 failures. Do > you think this could still be fallout from this change? I think the culprit is this change and the Windows layout testing is broken since a week. Brent, are you planning to fix the regression your patches caused? 1143298 16 ossy 2015-11-19 09:20:27 -0800 ping? 1143299 17 ryanhaddad 2015-11-19 09:24:34 -0800 (In reply to comment #16) > ping? I know that Brent was investigating this yesterday on one of the bots. I'll follow up with him. 1143340 18 bfulgham 2015-11-19 10:43:00 -0800 Test machines should be fixed with Commit r192635: <http://trac.webkit.org/changeset/192635> 265320 2015-11-11 14:47:28 -0800 2015-11-12 12:31:23 -0800 Patch bug-151156-20151111150520.patch text/plain 2801 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE5MjMyNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE1LTExLTExICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dIHdlYmtpdHB5IGlzIGFwcGx5aW5nIGFic3BhdGggdG8gRE9TIHBh dGhzLCB5aWVsZGluZyBpbnZhbGlkIHBhdGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNTExNTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5OgorICAg ICAgICAoUG9ydC5yZXN1bHRzX2RpcmVjdG9yeSk6IERvbid0IHBhc3MgcGF0aHMgdGhyb3VnaCAn YWJzcGF0aCcKKyAgICAgICAgKFBvcnQuX2J1aWxkX3BhdGgpOiBEaXR0by4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L3BvcnQvd2luLnB5OgorICAgICAgICAoV2luUG9ydC5fYnVpbGRfcGF0 aCk6IERpdHRvLgorCiAyMDE1LTExLTExICBBa29zIEtpc3MgIDxha2lzc0BpbmYudS1zemVnZWQu aHU+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgYWRkIG15c2VsZiB0byB0aGUgY29tbWl0dGVycyBs aXN0LgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkJKHJldmlzaW9uIDE5MjMx NykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CSh3b3JraW5nIGNvcHkp CkBAIC03NzUsNyArNzc1LDEwIEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgIiIiQWJz b2x1dGUgcGF0aCB0byB0aGUgcGxhY2UgdG8gc3RvcmUgdGhlIHRlc3QgcmVzdWx0cyAodXNlcyAt LXJlc3VsdHMtZGlyZWN0b3J5KS4iIiIKICAgICAgICAgaWYgbm90IHNlbGYuX3Jlc3VsdHNfZGly ZWN0b3J5OgogICAgICAgICAgICAgb3B0aW9uX3ZhbCA9IHNlbGYuZ2V0X29wdGlvbigncmVzdWx0 c19kaXJlY3RvcnknKSBvciBzZWxmLmRlZmF1bHRfcmVzdWx0c19kaXJlY3RvcnkoKQotICAgICAg ICAgICAgc2VsZi5fcmVzdWx0c19kaXJlY3RvcnkgPSBzZWxmLl9maWxlc3lzdGVtLmFic3BhdGgo b3B0aW9uX3ZhbCkKKyAgICAgICAgICAgIGlmIHN5cy5wbGF0Zm9ybSBpbiAoJ3dpbjMyJywgJ2N5 Z3dpbicpOgorICAgICAgICAgICAgICAgIHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5ID0gb3B0aW9u X3ZhbAorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICBzZWxmLl9yZXN1bHRzX2Rp cmVjdG9yeSA9IHNlbGYuX2ZpbGVzeXN0ZW0uYWJzcGF0aChvcHRpb25fdmFsKQogICAgICAgICBy ZXR1cm4gc2VsZi5fcmVzdWx0c19kaXJlY3RvcnkKIAogICAgIGRlZiBwZXJmX3Jlc3VsdHNfZGly ZWN0b3J5KHNlbGYpOgpAQCAtMTE0OSw2ICsxMTUyLDEwIEBAIGNsYXNzIFBvcnQob2JqZWN0KToK ICAgICAgICAgICAgICMgdGhlcmUgc2hvdWxkIGJlIGFub3RoZXIgd2F5IHRvIHByb3BhZ2F0ZSBw cmVjb21wdXRlZCB2YWx1ZXMgdG8gd29ya2VycyB3aXRob3V0IG1vZGlmeWluZwogICAgICAgICAg ICAgIyB0aGUgb3B0aW9ucyBsaXN0LgogICAgICAgICAgICAgc2VsZi5zZXRfb3B0aW9uKCdfY2Fj aGVkX3Jvb3QnLCByb290X2RpcmVjdG9yeSkKKworICAgICAgICBpZiBzeXMucGxhdGZvcm0gaW4g KCdjeWd3aW4nLCAnd2luMzInKToKKyAgICAgICAgICAgIHJldHVybiBzZWxmLl9maWxlc3lzdGVt LmpvaW4ocm9vdF9kaXJlY3RvcnksICpjb21wcykKKwogICAgICAgICByZXR1cm4gc2VsZi5fZmls ZXN5c3RlbS5qb2luKHNlbGYuX2ZpbGVzeXN0ZW0uYWJzcGF0aChyb290X2RpcmVjdG9yeSksICpj b21wcykKIAogICAgIGRlZiBfcGF0aF90b19kcml2ZXIoc2VsZiwgY29uZmlndXJhdGlvbj1Ob25l KToKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93aW4ucHkKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQkocmV2aXNpb24gMTkyMzE3KQor KysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQkod29ya2luZyBjb3B5KQpAQCAt MTM0LDcgKzEzNCw3IEBAIGNsYXNzIFdpblBvcnQoQXBwbGVQb3J0KToKICAgICAgICAgICAgIHJv b3RfZGlyZWN0b3J5ID0gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYuZ2V0X29wdGlvbignX2Nh Y2hlZF9yb290JyksIGJpbmFyeV9kaXJlY3RvcnkpCiAgICAgICAgICAgICBzZWxmLnNldF9vcHRp b24oJ19jYWNoZWRfcm9vdCcsIHJvb3RfZGlyZWN0b3J5KQogCi0gICAgICAgIHJldHVybiBzZWxm Ll9maWxlc3lzdGVtLmpvaW4oc2VsZi5fZmlsZXN5c3RlbS5hYnNwYXRoKHJvb3RfZGlyZWN0b3J5 KSwgKmNvbXBzKQorICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHJvb3RfZGly ZWN0b3J5LCAqY29tcHMpCiAKICAgICAjIE5vdGU6IFRoZXNlIGFyZSBiYXNlZCBvbiB0aGUgc3Rv Y2sgWEFNUFAgbG9jYXRpb25zIGZvciB0aGVzZSBmaWxlcy4KICAgICBkZWYgX3VzZXNfYXBhY2hl KHNlbGYpOgo= 265421 2015-11-12 12:31:26 -0800 2015-11-12 12:39:44 -0800 Patch v2 bug-151156-20151112124942.patch text/plain 5682 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE5MjM3NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMzIEBACisyMDE1LTExLTEyICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dIHdlYmtpdHB5IGlzIGFwcGx5aW5nIGFic3BhdGggdG8gRE9TIHBh dGhzLCB5aWVsZGluZyBpbnZhbGlkIHBhdGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNTExNTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBNeSBlYXJsaWVyIHBhdGNoIHdhcyBpbmNvbXBsZXRlLiBUaGVy ZSBhcmUgc29tZSBQeXRob24gbGlicmFyaWVzIHRoYXQgd2FudAorICAgICAgICB0byByZWNlaXZl IFVOSVggc3R5bGUgcGF0aHMsIGV2ZW4gdGhvdWdoIGFsbCBvZiBvdXIgYXBwbGljYXRpb25zIGFu ZCB0b29scworICAgICAgICB1c2UgRE9TIHBhdGhzLiBUbyBoYW5kbGUgdGhpcyBzcGVjaWFsIGNh c2UsIHdlIG5lZWQgdG8gdHJhY2sgYSBVTklYLXN0eWxlCisgICAgICAgIGFic29sdXRlIHBhdGgg dGhhdCBjYW4gYmUgZ2l2ZW4gdG8gdGhpbmdzIGxpa2UgdGhlIFB5dGhvbiBzb2NrZXQgc2VydmVy LgorICAgICAgICAKKyAgICAgICAgV2hlbiB3ZSBjdXQgb3ZlciB0byBhbGwtbmF0aXZlIFdpbmRv d3MgUHl0aG9uIHdlIGNhbiBnZXQgcmlkIG9mIHRoaXMKKyAgICAgICAgc3BlY2lhbCBjYXNlIGNv ZGUuCisgICAgICAgIAorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9m aWxlc3lzdGVtLnB5OgorICAgICAgICAoRmlsZVN5c3RlbS5hYnNwYXRoKTogQWRkIHNwZWNpYWwg Y29kZSBmb3IgQ3lnd2luIHRvIGNvbnZlcnQgYSBET1Mtc3R5bGUKKyAgICAgICAgcGF0aCBpbnRv IHNvbWV0aGluZyBDeWd3aW4gY2FuIHVzZSBpbnRlcm5hbGx5LgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5yZXN1bHRzX2RpcmVjdG9yeSk6 IFJlbW92ZSBjdXN0b20gV2luZG93cyBjb2RlLiBJbnN0ZWFkLCBvdmVycmlkZQorICAgICAgICB0 aGUgbWV0aG9kIGluIHRoZSB3aW5kb3dzIHBvcnQgb2JqZWN0LgorICAgICAgICAoUG9ydC5hYnNf cmVzdWx0c19kaXJlY3RvcnkpOiBBZGQgc3R1Yi4KKyAgICAgICAgKFBvcnQudG8uc3RhcnRfd2Vi c29ja2V0X3NlcnZlcik6IEZvciBDeWd3aW4sIHVzZSBzcGVjaWFsIGN5Z3dpbiBhYnNvbHV0ZQor ICAgICAgICBwYXRoLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC93aW4ucHk6Cisg ICAgICAgIChXaW5Qb3J0Ll9faW5pdF9fKTogQWRkZWQgdG8gaW5pdGlhbHplIG5ldyBfYWJzX3Jl c3VsdHNfZGlyZWN0b3J5IHZhbHVlLgorICAgICAgICAoV2luUG9ydC5hYnNfcmVzdWx0c19kaXJl Y3RvcnkpOiBBZGRlZCwKKyAgICAgICAgKFdpblBvcnQucmVzdWx0c19kaXJlY3RvcnkpOiBNb2Rp ZmllZCB0byBhbHNvIGNyZWF0ZSBhIHZhbHVlIGZvcgorICAgICAgICBfYWJzX3Jlc3VsdHNfZGly ZWN0b3J5CisKIDIwMTUtMTEtMTIgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgog CiAgICAgICAgIFN1cHBvcnQgYnVpbGRpbmcgY29uZmlndXJhdGlvbiBQcm9kdWN0aW9uIG9mIER1 bXBSZW5kZXJUcmVlIGFuZCBXZWJLaXRUZXN0UnVubmVyIGZvciBpT1MKSW5kZXg6IFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtLnB5Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtLnB5CShyZXZp c2lvbiAxOTIzMTcpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmls ZXN5c3RlbS5weQkod29ya2luZyBjb3B5KQpAQCAtNDksNiArNDksMTUgQEAgY2xhc3MgRmlsZVN5 c3RlbShvYmplY3QpOgogICAgIHBhcmRpciA9IG9zLnBhcmRpcgogCiAgICAgZGVmIGFic3BhdGgo c2VsZiwgcGF0aCk6CisgICAgICAgICMgRklYTUU6IFRoaXMgZ3Jvc3MgaGFjayBpcyBuZWVkZWQg d2hpbGUgd2UgdHJhbnNpdGlvbiBmcm9tIEN5Z3dpbiB0byBuYXRpdmUgV2luZG93cywgYmVjYXVz ZSB3ZQorICAgICAgICAjIGhhdmUgc29tZSBtaXhpbmcgb2YgZmlsZSBjb252ZW50aW9ucyBmcm9t IGRpZmZlcmVudCB0b29sczoKKyAgICAgICAgaWYgc3lzLnBsYXRmb3JtID09ICdjeWd3aW4nOgor ICAgICAgICAgICAgcGF0aCA9IG9zLnBhdGgubm9ybXBhdGgocGF0aCkKKyAgICAgICAgICAgIHBh dGhfY29tcG9uZW50cyA9IHBhdGguc3BsaXQob3Muc2VwKQorICAgICAgICAgICAgaWYgcGF0aF9j b21wb25lbnRzIGFuZCBsZW4ocGF0aF9jb21wb25lbnRzWzBdKSA9PSAyIGFuZCBwYXRoX2NvbXBv bmVudHNbMF1bMV0gPT0gJzonOgorICAgICAgICAgICAgICAgIHBhdGhfY29tcG9uZW50c1swXSA9 IHBhdGhfY29tcG9uZW50c1swXVswXQorICAgICAgICAgICAgICAgIHBhdGggPSBvcy5wYXRoLmpv aW4oJy8nLCAnY3lnZHJpdmUnLCAqcGF0aF9jb21wb25lbnRzKQorCiAgICAgICAgIHJldHVybiBv cy5wYXRoLmFic3BhdGgocGF0aCkKIAogICAgIGRlZiByZWFscGF0aChzZWxmLCBwYXRoKToKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CShyZXZpc2lvbiAxOTIzMzApCisrKyBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQkod29ya2luZyBjb3B5KQpAQCAtNzc1 LDEyICs3NzUsMTIgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICAiIiJBYnNvbHV0ZSBw YXRoIHRvIHRoZSBwbGFjZSB0byBzdG9yZSB0aGUgdGVzdCByZXN1bHRzICh1c2VzIC0tcmVzdWx0 cy1kaXJlY3RvcnkpLiIiIgogICAgICAgICBpZiBub3Qgc2VsZi5fcmVzdWx0c19kaXJlY3Rvcnk6 CiAgICAgICAgICAgICBvcHRpb25fdmFsID0gc2VsZi5nZXRfb3B0aW9uKCdyZXN1bHRzX2RpcmVj dG9yeScpIG9yIHNlbGYuZGVmYXVsdF9yZXN1bHRzX2RpcmVjdG9yeSgpCi0gICAgICAgICAgICBp ZiBzeXMucGxhdGZvcm0gaW4gKCd3aW4zMicsICdjeWd3aW4nKToKLSAgICAgICAgICAgICAgICBz ZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSA9IG9wdGlvbl92YWwKLSAgICAgICAgICAgIGVsc2U6Ci0g ICAgICAgICAgICAgICAgc2VsZi5fcmVzdWx0c19kaXJlY3RvcnkgPSBzZWxmLl9maWxlc3lzdGVt LmFic3BhdGgob3B0aW9uX3ZhbCkKKyAgICAgICAgICAgIHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5 ID0gc2VsZi5fZmlsZXN5c3RlbS5hYnNwYXRoKG9wdGlvbl92YWwpCiAgICAgICAgIHJldHVybiBz ZWxmLl9yZXN1bHRzX2RpcmVjdG9yeQogCisgICAgZGVmIGFic19yZXN1bHRzX2RpcmVjdG9yeShz ZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYucmVzdWx0c19kaXJlY3RvcnkoKQorCiAgICAgZGVm IHBlcmZfcmVzdWx0c19kaXJlY3Rvcnkoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl9idWls ZF9wYXRoKCkKIApAQCAtOTA3LDcgKzkwNywxMiBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAg ICAgIFBvcnRzIGNhbiBzdHViIHRoaXMgb3V0IGlmIHRoZXkgZG9uJ3QgbmVlZCBhIHdlYnNvY2tl dCBzZXJ2ZXIgdG8gYmUgcnVubmluZy4iIiIKICAgICAgICAgYXNzZXJ0IG5vdCBzZWxmLl93ZWJz b2NrZXRfc2VydmVyLCAnQWxyZWFkeSBydW5uaW5nIGEgd2Vic29ja2V0IHNlcnZlci4nCiAKLSAg ICAgICAgc2VydmVyID0gd2Vic29ja2V0X3NlcnZlci5QeVdlYlNvY2tldChzZWxmLCBzZWxmLnJl c3VsdHNfZGlyZWN0b3J5KCkpCisgICAgICAgIHdvcmtfZGlyZWN0b3J5ID0gc2VsZi5yZXN1bHRz X2RpcmVjdG9yeSgpCisgICAgICAgIGlmIHNlbGYuaG9zdC5wbGF0Zm9ybS5pc19jeWd3aW4oKToK KyAgICAgICAgICAgICMgQ3lnd2luIHNvY2tldCBzZXJ2ZXIgbmVlZHMgYSBVTklYIHBhdGguCisg ICAgICAgICAgICB3b3JrX2RpcmVjdG9yeSA9IHNlbGYuYWJzX3Jlc3VsdHNfZGlyZWN0b3J5KCkK KworICAgICAgICBzZXJ2ZXIgPSB3ZWJzb2NrZXRfc2VydmVyLlB5V2ViU29ja2V0KHNlbGYsIHdv cmtfZGlyZWN0b3J5KQogICAgICAgICBzZXJ2ZXIuc3RhcnQoKQogICAgICAgICBzZWxmLl93ZWJz b2NrZXRfc2VydmVyID0gc2VydmVyCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y dC93aW4ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5w eQkocmV2aXNpb24gMTkyMzMwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5w eQkod29ya2luZyBjb3B5KQpAQCAtNjEsNiArNjEsMjQgQEAgY2xhc3MgV2luUG9ydChBcHBsZVBv cnQpOgogCiAgICAgcHJldmlvdXNfZXJyb3JfcmVwb3J0aW5nX3ZhbHVlcyA9IHt9CiAKKyAgICBk ZWYgX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lLCAqKmt3YXJncyk6CisgICAgICAgIEFw cGxlUG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKQorCisgICAg ICAgIHNlbGYuX2Fic19yZXN1bHRzX2RpcmVjdG9yeSA9IE5vbmUKKworICAgIGRlZiBhYnNfcmVz dWx0c19kaXJlY3Rvcnkoc2VsZik6CisgICAgICAgIGlmIG5vdCBzZWxmLl9yZXN1bHRzX2RpcmVj dG9yeToKKyAgICAgICAgICAgIHNlbGYucmVzdWx0c19kaXJlY3RvcnkoKQorICAgICAgICByZXR1 cm4gc2VsZi5fYWJzX3Jlc3VsdHNfZGlyZWN0b3J5CisKKyAgICBkZWYgcmVzdWx0c19kaXJlY3Rv cnkoc2VsZik6CisgICAgICAgICIiIkFic29sdXRlIHBhdGggdG8gdGhlIHBsYWNlIHRvIHN0b3Jl IHRoZSB0ZXN0IHJlc3VsdHMgKHVzZXMgLS1yZXN1bHRzLWRpcmVjdG9yeSkuIiIiCisgICAgICAg IGlmIG5vdCBzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeToKKyAgICAgICAgICAgIG9wdGlvbl92YWwg PSBzZWxmLmdldF9vcHRpb24oJ3Jlc3VsdHNfZGlyZWN0b3J5Jykgb3Igc2VsZi5kZWZhdWx0X3Jl c3VsdHNfZGlyZWN0b3J5KCkKKyAgICAgICAgICAgIHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5ID0g b3B0aW9uX3ZhbAorICAgICAgICAgICAgc2VsZi5fYWJzX3Jlc3VsdHNfZGlyZWN0b3J5ID0gc2Vs Zi5fZmlsZXN5c3RlbS5hYnNwYXRoKG9wdGlvbl92YWwpCisgICAgICAgIHJldHVybiBzZWxmLl9y ZXN1bHRzX2RpcmVjdG9yeQorCiAgICAgZGVmIGRvX3RleHRfcmVzdWx0c19kaWZmZXIoc2VsZiwg ZXhwZWN0ZWRfdGV4dCwgYWN0dWFsX3RleHQpOgogICAgICAgICAjIFNhbml0eSB3YXMgcmVzdG9y ZWQgaW4gV0syLCBzbyB3ZSBkb24ndCBuZWVkIHRoaXMgaGFjayB0aGVyZS4KICAgICAgICAgaWYg c2VsZi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXInKToK