187973 2018-07-24 15:02:20 -0700 [webkitpy][Win] LayoutTests: test names should be Unix style, separated by slash not backslash 2018-08-14 15:45:15 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 188345 1 basuke fujii achristensen bfulgham ews-watchlist fujii glenn lforschler pvollan ross.kirsling tsavell webkit-bug-importer oldest_to_newest 1444850 0 basuke 2018-07-24 15:02:20 -0700 Test path on native Windows are displayed using back slash. It should be forward slash like other ports do. 1448366 1 fujii 2018-08-06 23:49:51 -0700 relative_test_filename of chromium_win.py used to replace backward slash with forward slash. (Bug 34739) 1448375 2 fujii 2018-08-07 00:47:08 -0700 test_name has been cannibalized in unix-style since Bug 63597. Basuke's Bug 179572 seems bad fix. 1448378 3 fujii 2018-08-07 00:57:48 -0700 Bug 180660, too. 1448413 4 346701 fujii 2018-08-07 02:47:28 -0700 Created attachment 346701 WIP patch 1448417 5 346702 fujii 2018-08-07 03:12:14 -0700 Created attachment 346702 WIP patch * Reverted parts of Bug 179572, Bug 180660 and Bug 181814 to restore test_name is unix-style. * relative_test_filename: Replace os.path.sep with self.TEST_PATH_SEPARATOR. * abspath_for_test: Replace self.TEST_PATH_SEPARATOR with os.path.sep. 1448703 6 fujii 2018-08-08 01:06:50 -0700 This patch makes some tests of test-webkitpy failing because common/system/filesystem_mock.py assumes path separator is a forward slash. > python Tools\Scripts\test-webkitpy webkitpy.port.base_unittest.PortTest.test_test_exists This is the test case to check mock file system. This seems the reason why chromium_win.py didn't do the string conversion in abspath_for_test. 1448706 7 346760 fujii 2018-08-08 01:26:42 -0700 Created attachment 346760 WIP patch This patch significantly reduces the number of test-webkitpy failures, but LayoutTest doesn't work. FAILED (failures=41, errors=25) ↓ FAILED (failures=0, errors=8) 1448712 8 fujii 2018-08-08 02:24:06 -0700 If DumpRenderTree is given a file path containing forward slashes, such like: > C:\webkit\ga\LayoutTests\fast/css/button-height.html CFURLCreateWithFileSystemPath converts it to "file://localhost/C:/webkit/ga/LayoutTests/fast%2Fcss%2Fbutton-height.html". https://github.com/WebKit/webkit/blob/82bae82cf0f329dbe21059ef0986c4e92fea4ba6/Tools/DumpRenderTree/win/DumpRenderTree.cpp#L1135 > url = CFURLCreateWithFileSystemPath(0, str, kCFURLWindowsPathStyle, false); 1448939 9 346817 fujii 2018-08-08 21:02:27 -0700 Created attachment 346817 Patch 1449207 10 346817 fujii 2018-08-09 19:14:33 -0700 Comment on attachment 346817 Patch Clearing flags on attachment: 346817 Committed r234749: <https://trac.webkit.org/changeset/234749> 1449208 11 fujii 2018-08-09 19:14:36 -0700 All reviewed patches have been landed. Closing bug. 1449209 12 webkit-bug-importer 2018-08-09 19:15:20 -0700 <rdar://problem/43122448> 1449274 13 pvollan 2018-08-10 08:49:09 -0700 I am currently observing errors on the Win EWS bots. Is it possible that this was introduced by this change? This is the error message: Starting WebSocket server ... Failed to remove stale pywebsocket log files: [Errno 2] No such file or directory: '/cygdrive/C/cygwin/home/buildbot/WebKit/WebKitBuild/Release/bin32/layout-test-results' IOError raised: [Errno 2] No such file or directory: u'/cygdrive/C/cygwin/home/buildbot/WebKit/WebKitBuild/Release/bin32/layout-test-results/pywebsocket.ws.log-out.txt' Traceback (most recent call last): File "/home/buildbot/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 85, in main run_details = run(port, options, args, stderr) File "/home/buildbot/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 447, in run run_details = manager.run(args) File "/home/buildbot/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 240, in run needs_http=needs_http, needs_web_platform_test_server=needs_web_platform_test_server, needs_websockets=needs_websockets) File "/home/buildbot/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py", line 87, in __init__ self.start_servers() File "/home/buildbot/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py", line 202, in start_servers self._port.start_websocket_server() File "/home/buildbot/WebKit/Tools/Scripts/webkitpy/port/base.py", line 1031, in start_websocket_server server.start() File "/home/buildbot/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py", line 95, in start self._prepare_config() File "/home/buildbot/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py", line 118, in _prepare_config self._wsout = self._filesystem.open_text_file_for_writing(output_log) File "/home/buildbot/WebKit/Tools/Scripts/webkitpy/common/system/filesystem.py", line 239, in open_text_file_for_writing return codecs.open(path, 'w', 'utf8') File "/usr/lib/python2.7/codecs.py", line 896, in open file = __builtin__.open(filename, mode, buffering) IOError: [Errno 2] No such file or directory: u'/cygdrive/C/cygwin/home/buildbot/WebKit/WebKitBuild/Release/bin32/layout-test-results/pywebsocket.ws.log-out.txt' 1449329 14 tsavell 2018-08-10 11:41:49 -0700 It looks like https://trac.webkit.org/changeset/234749/webkit has caused the perf tests on Sierra to all fail. Build History: https://build.webkit.org/builders/Apple%20Sierra%20Release%20WK2%20(Perf)?numbuilds=50 Output: https://build.webkit.org/builders/Apple%20Sierra%20Release%20WK2%20%28Perf%29/builds/1401/steps/perf-test/logs/stdio 1449336 15 tsavell 2018-08-10 11:56:44 -0700 Reverted r234749 for reason: Caused all perf tests to fail in Sierra Committed r234765: <https://trac.webkit.org/changeset/234765> 1450042 16 basuke 2018-08-14 11:38:40 -0700 This patch alsodoesn't solve my original issue. The test result is still displayed using Windows path. Something is missing. > Running 8 DumpRenderTrees in parallel. > > [63/270] http\tests\xmlhttprequest\cache-override.html passed unexpectedly > [143/270] http\tests\xmlhttprequest\range-test.html passed unexpectedly > [169/270] http\tests\xmlhttprequest\response-empty-arraybuffer.html passed unexpectedly > [258/270] http\tests\xmlhttprequest\reentrant-cancel.html failed unexpectedly (test timed out, test was not run) > [270/270] http\tests\xmlhttprequest\xmlhttprequest-overridemimetype-content-type-header.html failed unexpectedly (test timed out, test was not run) > [270/270] http\tests\xmlhttprequest\on-network-timeout-error-during-preflight.html failed unexpectedly (test timed out, text diff) > > Retrying 3 unexpected failures ... > > Running 1 DumpRenderTree. > > [3/3] http\tests\xmlhttprequest\on-network-timeout-error-during-preflight.html failed unexpectedly (test timed out, text diff) > > 264 tests ran as expected, 6 didn't: > > Expected to fail, but passed: (3) > http\tests\xmlhttprequest\cache-override.html > http\tests\xmlhttprequest\range-test.html > http\tests\xmlhttprequest\response-empty-arraybuffer.html > > Unexpected flakiness: timeouts (2) > http\tests\xmlhttprequest\reentrant-cancel.html [ Timeout Pass ] > http\tests\xmlhttprequest\xmlhttprequest-overridemimetype-content-type-header.html [ Timeout Pass ] > > Regressions: Unexpected timeouts (1) > http\tests\xmlhttprequest\on-network-timeout-error-during-preflight.html [ Timeout ] 1450043 17 basuke 2018-08-14 11:39:20 -0700 Oh, it was rolled back. That's why. 1450111 18 346817 ross.kirsling 2018-08-14 15:01:35 -0700 Comment on attachment 346817 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=346817&action=review > Tools/Scripts/webkitpy/port/base.py:844 > + return host.filesystem.join(host.filesystem.map_base_host_path(self.layout_tests_dir()), *test_name.split(self.TEST_PATH_SEPARATOR)) Looks like perf tests use abspaths as test names, so we need to be explicit and `.replace(self.TEST_PATH_SEPARATOR, self.host.filesystem.sep)` here. 1450124 19 ross.kirsling 2018-08-14 15:45:15 -0700 Committed r234863: <https://trac.webkit.org/changeset/234863> 346701 2018-08-07 02:47:28 -0700 2018-08-07 03:12:26 -0700 WIP patch wip.patch text/plain 3644 fujii ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90 ZXN0X2V4cGVjdGF0aW9ucy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQppbmRleCBhYTViNTExZDFlMC4uY2RjZGExYWMz ODcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVs cy90ZXN0X2V4cGVjdGF0aW9ucy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkKQEAgLTMxLDcgKzMxLDYgQEAgZm9y IGxheW91dCB0ZXN0cy4KICIiIgogCiBpbXBvcnQgbG9nZ2luZwotaW1wb3J0IG9zLnBhdGgKIGlt cG9ydCByZQogCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMudGVzdF9jb25maWd1 cmF0aW9uIGltcG9ydCBUZXN0Q29uZmlndXJhdGlvbkNvbnZlcnRlcgpAQCAtMTM5LDEyICsxMzgs MTEgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uUGFyc2VyKG9iamVjdCk6CiAgICAgICAgIGlmIG5v dCBzZWxmLl9jaGVja190ZXN0X2V4aXN0cyhleHBlY3RhdGlvbl9saW5lKToKICAgICAgICAgICAg IHJldHVybgogCi0gICAgICAgIHBhdGggPSBvcy5wYXRoLm5vcm1wYXRoKGV4cGVjdGF0aW9uX2xp bmUubmFtZSkKLSAgICAgICAgZXhwZWN0YXRpb25fbGluZS5pc19maWxlID0gc2VsZi5fcG9ydC50 ZXN0X2lzZmlsZShwYXRoKQorICAgICAgICBleHBlY3RhdGlvbl9saW5lLmlzX2ZpbGUgPSBzZWxm Ll9wb3J0LnRlc3RfaXNmaWxlKGV4cGVjdGF0aW9uX2xpbmUubmFtZSkKICAgICAgICAgaWYgZXhw ZWN0YXRpb25fbGluZS5pc19maWxlOgotICAgICAgICAgICAgZXhwZWN0YXRpb25fbGluZS5wYXRo ID0gcGF0aAorICAgICAgICAgICAgZXhwZWN0YXRpb25fbGluZS5wYXRoID0gZXhwZWN0YXRpb25f bGluZS5uYW1lCiAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBleHBlY3RhdGlvbl9saW5lLnBh dGggPSBzZWxmLl9wb3J0Lm5vcm1hbGl6ZV90ZXN0X25hbWUocGF0aCkKKyAgICAgICAgICAgIGV4 cGVjdGF0aW9uX2xpbmUucGF0aCA9IHNlbGYuX3BvcnQubm9ybWFsaXplX3Rlc3RfbmFtZShleHBl Y3RhdGlvbl9saW5lLm5hbWUpCiAKICAgICAgICAgc2VsZi5fY29sbGVjdF9tYXRjaGluZ190ZXN0 cyhleHBlY3RhdGlvbl9saW5lKQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvYmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CmluZGV4 IGQ2MDdjYmViMTA0Li41YjFiNGMwYmQzOSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2Jhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2Uu cHkKQEAgLTcwMCwxMCArNzAwLDEwIEBAIGNsYXNzIFBvcnQob2JqZWN0KToKIAogICAgIGRlZiBu b3JtYWxpemVfdGVzdF9uYW1lKHNlbGYsIHRlc3RfbmFtZSk6CiAgICAgICAgICIiIlJldHVybnMg YSBub3JtYWxpemVkIHZlcnNpb24gb2YgdGhlIHRlc3QgbmFtZSBvciB0ZXN0IGRpcmVjdG9yeS4i IiIKLSAgICAgICAgaWYgdGVzdF9uYW1lLmVuZHN3aXRoKG9zLnBhdGguc2VwKToKKyAgICAgICAg aWYgdGVzdF9uYW1lLmVuZHN3aXRoKHNlbGYuVEVTVF9QQVRIX1NFUEFSQVRPUik6CiAgICAgICAg ICAgICByZXR1cm4gdGVzdF9uYW1lCiAgICAgICAgIGlmIHNlbGYudGVzdF9pc2Rpcih0ZXN0X25h bWUpOgotICAgICAgICAgICAgcmV0dXJuIHRlc3RfbmFtZSArIG9zLnBhdGguc2VwCisgICAgICAg ICAgICByZXR1cm4gdGVzdF9uYW1lICsgc2VsZi5URVNUX1BBVEhfU0VQQVJBVE9SCiAgICAgICAg IHJldHVybiB0ZXN0X25hbWUKIAogICAgIGRlZiBkcml2ZXJfY21kX2xpbmVfZm9yX2xvZ2dpbmco c2VsZik6CkBAIC04MzAsNyArODMwLDkgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICAj IFBvcnRzIHRoYXQgcnVuIG9uIHdpbmRvd3MgbmVlZCB0byBvdmVycmlkZSB0aGlzIG1ldGhvZCB0 byBkZWFsIHdpdGgKICAgICAgICAgIyBmaWxlbmFtZXMgd2l0aCBiYWNrc2xhc2hlcyBpbiB0aGVt LgogICAgICAgICBpZiBmaWxlbmFtZS5zdGFydHN3aXRoKHNlbGYubGF5b3V0X3Rlc3RzX2Rpcigp KToKLSAgICAgICAgICAgIHJldHVybiBzZWxmLmhvc3QuZmlsZXN5c3RlbS5yZWxwYXRoKGZpbGVu YW1lLCBzZWxmLmxheW91dF90ZXN0c19kaXIoKSkKKyAgICAgICAgICAgIHBhdGggPSBzZWxmLmhv c3QuZmlsZXN5c3RlbS5yZWxwYXRoKGZpbGVuYW1lLCBzZWxmLmxheW91dF90ZXN0c19kaXIoKSkK KyAgICAgICAgICAgIHBhdGggPSBwYXRoLnJlcGxhY2Uob3MucGF0aC5zZXAsIHNlbGYuVEVTVF9Q QVRIX1NFUEFSQVRPUikKKyAgICAgICAgICAgIHJldHVybiBwYXRoCiAgICAgICAgIGVsc2U6CiAg ICAgICAgICAgICByZXR1cm4gc2VsZi5ob3N0LmZpbGVzeXN0ZW0uYWJzcGF0aChmaWxlbmFtZSkK IApAQCAtODM5LDcgKzg0MSw4IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgIiIiUmV0 dXJucyB0aGUgZnVsbCBwYXRoIHRvIHRoZSBmaWxlIGZvciBhIGdpdmVuIHRlc3QgbmFtZS4gVGhp cyBpcyB0aGUKICAgICAgICAgaW52ZXJzZSBvZiByZWxhdGl2ZV90ZXN0X2ZpbGVuYW1lKCkgaWYg bm8gdGFyZ2V0X2hvc3QgaXMgc3BlY2lmaWVkLiIiIgogICAgICAgICBob3N0ID0gdGFyZ2V0X2hv c3Qgb3Igc2VsZi5ob3N0Ci0gICAgICAgIHJldHVybiBob3N0LmZpbGVzeXN0ZW0uam9pbihob3N0 LmZpbGVzeXN0ZW0ubWFwX2Jhc2VfaG9zdF9wYXRoKHNlbGYubGF5b3V0X3Rlc3RzX2RpcigpKSwg dGVzdF9uYW1lKQorICAgICAgICBwYXRoID0gdGVzdF9uYW1lLnJlcGxhY2Uoc2VsZi5URVNUX1BB VEhfU0VQQVJBVE9SLCBvcy5wYXRoLnNlcCkKKyAgICAgICAgcmV0dXJuIGhvc3QuZmlsZXN5c3Rl bS5qb2luKGhvc3QuZmlsZXN5c3RlbS5tYXBfYmFzZV9ob3N0X3BhdGgoc2VsZi5sYXlvdXRfdGVz dHNfZGlyKCkpLCBwYXRoKQogCiAgICAgZGVmIGpzY19yZXN1bHRzX2RpcmVjdG9yeShzZWxmKToK ICAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L3dpbi5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93 aW4ucHkKaW5kZXggNTEwYjZlNzI5YzUuLmM4NmZmNDJhYWNhIDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvd2luLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC93aW4ucHkKQEAgLTQ3NSw4ICs0NzUsNiBAQCBjbGFzcyBXaW5DYWlyb1BvcnQoV2luUG9y dCk6CiAKICAgICBERUZBVUxUX0FSQ0hJVEVDVFVSRSA9ICd4ODZfNjQnCiAKLSAgICBURVNUX1BB VEhfU0VQQVJBVE9SID0gb3Muc2VwCi0KICAgICBkZWYgZGVmYXVsdF9iYXNlbGluZV9zZWFyY2hf cGF0aChzZWxmKToKICAgICAgICAgdmVyc2lvbl9uYW1lX21hcCA9IFZlcnNpb25OYW1lTWFwLm1h cChzZWxmLmhvc3QucGxhdGZvcm0pCiAgICAgICAgIGlmIHNlbGYuX29zX3ZlcnNpb24gPCBzZWxm LlZFUlNJT05fTUlOIG9yIHNlbGYuX29zX3ZlcnNpb24gPiBzZWxmLlZFUlNJT05fTUFYOgo= 346702 2018-08-07 03:12:14 -0700 2018-08-08 01:26:42 -0700 WIP patch wip.patch text/plain 4617 fujii ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90 ZXN0X2V4cGVjdGF0aW9ucy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQppbmRleCBhYTViNTExZDFlMC4uY2RjZGExYWMz ODcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVs cy90ZXN0X2V4cGVjdGF0aW9ucy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkKQEAgLTMxLDcgKzMxLDYgQEAgZm9y IGxheW91dCB0ZXN0cy4KICIiIgogCiBpbXBvcnQgbG9nZ2luZwotaW1wb3J0IG9zLnBhdGgKIGlt cG9ydCByZQogCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMudGVzdF9jb25maWd1 cmF0aW9uIGltcG9ydCBUZXN0Q29uZmlndXJhdGlvbkNvbnZlcnRlcgpAQCAtMTM5LDEyICsxMzgs MTEgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uUGFyc2VyKG9iamVjdCk6CiAgICAgICAgIGlmIG5v dCBzZWxmLl9jaGVja190ZXN0X2V4aXN0cyhleHBlY3RhdGlvbl9saW5lKToKICAgICAgICAgICAg IHJldHVybgogCi0gICAgICAgIHBhdGggPSBvcy5wYXRoLm5vcm1wYXRoKGV4cGVjdGF0aW9uX2xp bmUubmFtZSkKLSAgICAgICAgZXhwZWN0YXRpb25fbGluZS5pc19maWxlID0gc2VsZi5fcG9ydC50 ZXN0X2lzZmlsZShwYXRoKQorICAgICAgICBleHBlY3RhdGlvbl9saW5lLmlzX2ZpbGUgPSBzZWxm Ll9wb3J0LnRlc3RfaXNmaWxlKGV4cGVjdGF0aW9uX2xpbmUubmFtZSkKICAgICAgICAgaWYgZXhw ZWN0YXRpb25fbGluZS5pc19maWxlOgotICAgICAgICAgICAgZXhwZWN0YXRpb25fbGluZS5wYXRo ID0gcGF0aAorICAgICAgICAgICAgZXhwZWN0YXRpb25fbGluZS5wYXRoID0gZXhwZWN0YXRpb25f bGluZS5uYW1lCiAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBleHBlY3RhdGlvbl9saW5lLnBh dGggPSBzZWxmLl9wb3J0Lm5vcm1hbGl6ZV90ZXN0X25hbWUocGF0aCkKKyAgICAgICAgICAgIGV4 cGVjdGF0aW9uX2xpbmUucGF0aCA9IHNlbGYuX3BvcnQubm9ybWFsaXplX3Rlc3RfbmFtZShleHBl Y3RhdGlvbl9saW5lLm5hbWUpCiAKICAgICAgICAgc2VsZi5fY29sbGVjdF9tYXRjaGluZ190ZXN0 cyhleHBlY3RhdGlvbl9saW5lKQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvYmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CmluZGV4 IGQ2MDdjYmViMTA0Li41YjFiNGMwYmQzOSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2Jhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2Uu cHkKQEAgLTcwMCwxMCArNzAwLDEwIEBAIGNsYXNzIFBvcnQob2JqZWN0KToKIAogICAgIGRlZiBu b3JtYWxpemVfdGVzdF9uYW1lKHNlbGYsIHRlc3RfbmFtZSk6CiAgICAgICAgICIiIlJldHVybnMg YSBub3JtYWxpemVkIHZlcnNpb24gb2YgdGhlIHRlc3QgbmFtZSBvciB0ZXN0IGRpcmVjdG9yeS4i IiIKLSAgICAgICAgaWYgdGVzdF9uYW1lLmVuZHN3aXRoKG9zLnBhdGguc2VwKToKKyAgICAgICAg aWYgdGVzdF9uYW1lLmVuZHN3aXRoKHNlbGYuVEVTVF9QQVRIX1NFUEFSQVRPUik6CiAgICAgICAg ICAgICByZXR1cm4gdGVzdF9uYW1lCiAgICAgICAgIGlmIHNlbGYudGVzdF9pc2Rpcih0ZXN0X25h bWUpOgotICAgICAgICAgICAgcmV0dXJuIHRlc3RfbmFtZSArIG9zLnBhdGguc2VwCisgICAgICAg ICAgICByZXR1cm4gdGVzdF9uYW1lICsgc2VsZi5URVNUX1BBVEhfU0VQQVJBVE9SCiAgICAgICAg IHJldHVybiB0ZXN0X25hbWUKIAogICAgIGRlZiBkcml2ZXJfY21kX2xpbmVfZm9yX2xvZ2dpbmco c2VsZik6CkBAIC04MzAsNyArODMwLDkgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICAj IFBvcnRzIHRoYXQgcnVuIG9uIHdpbmRvd3MgbmVlZCB0byBvdmVycmlkZSB0aGlzIG1ldGhvZCB0 byBkZWFsIHdpdGgKICAgICAgICAgIyBmaWxlbmFtZXMgd2l0aCBiYWNrc2xhc2hlcyBpbiB0aGVt LgogICAgICAgICBpZiBmaWxlbmFtZS5zdGFydHN3aXRoKHNlbGYubGF5b3V0X3Rlc3RzX2Rpcigp KToKLSAgICAgICAgICAgIHJldHVybiBzZWxmLmhvc3QuZmlsZXN5c3RlbS5yZWxwYXRoKGZpbGVu YW1lLCBzZWxmLmxheW91dF90ZXN0c19kaXIoKSkKKyAgICAgICAgICAgIHBhdGggPSBzZWxmLmhv c3QuZmlsZXN5c3RlbS5yZWxwYXRoKGZpbGVuYW1lLCBzZWxmLmxheW91dF90ZXN0c19kaXIoKSkK KyAgICAgICAgICAgIHBhdGggPSBwYXRoLnJlcGxhY2Uob3MucGF0aC5zZXAsIHNlbGYuVEVTVF9Q QVRIX1NFUEFSQVRPUikKKyAgICAgICAgICAgIHJldHVybiBwYXRoCiAgICAgICAgIGVsc2U6CiAg ICAgICAgICAgICByZXR1cm4gc2VsZi5ob3N0LmZpbGVzeXN0ZW0uYWJzcGF0aChmaWxlbmFtZSkK IApAQCAtODM5LDcgKzg0MSw4IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgIiIiUmV0 dXJucyB0aGUgZnVsbCBwYXRoIHRvIHRoZSBmaWxlIGZvciBhIGdpdmVuIHRlc3QgbmFtZS4gVGhp cyBpcyB0aGUKICAgICAgICAgaW52ZXJzZSBvZiByZWxhdGl2ZV90ZXN0X2ZpbGVuYW1lKCkgaWYg bm8gdGFyZ2V0X2hvc3QgaXMgc3BlY2lmaWVkLiIiIgogICAgICAgICBob3N0ID0gdGFyZ2V0X2hv c3Qgb3Igc2VsZi5ob3N0Ci0gICAgICAgIHJldHVybiBob3N0LmZpbGVzeXN0ZW0uam9pbihob3N0 LmZpbGVzeXN0ZW0ubWFwX2Jhc2VfaG9zdF9wYXRoKHNlbGYubGF5b3V0X3Rlc3RzX2RpcigpKSwg dGVzdF9uYW1lKQorICAgICAgICBwYXRoID0gdGVzdF9uYW1lLnJlcGxhY2Uoc2VsZi5URVNUX1BB VEhfU0VQQVJBVE9SLCBvcy5wYXRoLnNlcCkKKyAgICAgICAgcmV0dXJuIGhvc3QuZmlsZXN5c3Rl bS5qb2luKGhvc3QuZmlsZXN5c3RlbS5tYXBfYmFzZV9ob3N0X3BhdGgoc2VsZi5sYXlvdXRfdGVz dHNfZGlyKCkpLCBwYXRoKQogCiAgICAgZGVmIGpzY19yZXN1bHRzX2RpcmVjdG9yeShzZWxmKToK ICAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y dC9kcml2ZXIucHkKaW5kZXggMjk5ODJhZGMxMzQuLmVhMjg3ZmUwMDBiIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvcG9ydC9kcml2ZXIucHkKQEAgLTI1NCwxMCArMjU0LDEwIEBAIGNsYXNzIERyaXZl cihvYmplY3QpOgogICAgICAgICAgICAgcmV0dXJuIHNobGV4LnNwbGl0KHNlbGYuX3BvcnQuZ2V0 X29wdGlvbignd3JhcHBlcicpKSArIHdyYXBwZXJfYXJndW1lbnRzCiAgICAgICAgIHJldHVybiB3 cmFwcGVyX2FyZ3VtZW50cwogCi0gICAgSFRUUF9ESVIgPSBub3JtcGF0aCgiaHR0cC90ZXN0cyIp ICsgb3Muc2VwCi0gICAgSFRUUF9MT0NBTF9ESVIgPSBub3JtcGF0aCgiaHR0cC90ZXN0cy9sb2Nh bCIpICsgb3Muc2VwCi0gICAgV0VCS0lUX1NQRUNJRklDX1dFQl9QTEFURk9STV9URVNUX1NVQkRJ UiA9IG5vcm1wYXRoKCJodHRwL3dwdCIpICsgb3Muc2VwCi0gICAgV0VCS0lUX1dFQl9QTEFURk9S TV9URVNUX1NFUlZFUl9ST1VURSA9IG5vcm1wYXRoKCJXZWJLaXQiKSArIG9zLnNlcAorICAgIEhU VFBfRElSID0gImh0dHAvdGVzdHMvIgorICAgIEhUVFBfTE9DQUxfRElSID0gImh0dHAvdGVzdHMv bG9jYWwvIgorICAgIFdFQktJVF9TUEVDSUZJQ19XRUJfUExBVEZPUk1fVEVTVF9TVUJESVIgPSAi aHR0cC93cHQvIgorICAgIFdFQktJVF9XRUJfUExBVEZPUk1fVEVTVF9TRVJWRVJfUk9VVEUgPSAi V2ViS2l0LyIKIAogICAgIGRlZiBpc19odHRwX3Rlc3Qoc2VsZiwgdGVzdF9uYW1lKToKICAgICAg ICAgcmV0dXJuIHRlc3RfbmFtZS5zdGFydHN3aXRoKHNlbGYuSFRUUF9ESVIpIGFuZCBub3QgdGVz dF9uYW1lLnN0YXJ0c3dpdGgoc2VsZi5IVFRQX0xPQ0FMX0RJUikKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC93aW4ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvd2luLnB5CmluZGV4IDUxMGI2ZTcyOWM1Li5jODZmZjQyYWFjYSAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3BvcnQvd2luLnB5CkBAIC00NzUsOCArNDc1LDYgQEAgY2xhc3MgV2luQ2Fpcm9Qb3J0KFdp blBvcnQpOgogCiAgICAgREVGQVVMVF9BUkNISVRFQ1RVUkUgPSAneDg2XzY0JwogCi0gICAgVEVT VF9QQVRIX1NFUEFSQVRPUiA9IG9zLnNlcAotCiAgICAgZGVmIGRlZmF1bHRfYmFzZWxpbmVfc2Vh cmNoX3BhdGgoc2VsZik6CiAgICAgICAgIHZlcnNpb25fbmFtZV9tYXAgPSBWZXJzaW9uTmFtZU1h cC5tYXAoc2VsZi5ob3N0LnBsYXRmb3JtKQogICAgICAgICBpZiBzZWxmLl9vc192ZXJzaW9uIDwg c2VsZi5WRVJTSU9OX01JTiBvciBzZWxmLl9vc192ZXJzaW9uID4gc2VsZi5WRVJTSU9OX01BWDoK 346760 2018-08-08 01:26:42 -0700 2018-08-08 21:02:23 -0700 WIP patch wip.patch text/plain 4014 fujii ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90 ZXN0X2V4cGVjdGF0aW9ucy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQppbmRleCBhYTViNTExZDFlMC4uY2RjZGExYWMz ODcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVs cy90ZXN0X2V4cGVjdGF0aW9ucy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkKQEAgLTMxLDcgKzMxLDYgQEAgZm9y IGxheW91dCB0ZXN0cy4KICIiIgogCiBpbXBvcnQgbG9nZ2luZwotaW1wb3J0IG9zLnBhdGgKIGlt cG9ydCByZQogCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMudGVzdF9jb25maWd1 cmF0aW9uIGltcG9ydCBUZXN0Q29uZmlndXJhdGlvbkNvbnZlcnRlcgpAQCAtMTM5LDEyICsxMzgs MTEgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uUGFyc2VyKG9iamVjdCk6CiAgICAgICAgIGlmIG5v dCBzZWxmLl9jaGVja190ZXN0X2V4aXN0cyhleHBlY3RhdGlvbl9saW5lKToKICAgICAgICAgICAg IHJldHVybgogCi0gICAgICAgIHBhdGggPSBvcy5wYXRoLm5vcm1wYXRoKGV4cGVjdGF0aW9uX2xp bmUubmFtZSkKLSAgICAgICAgZXhwZWN0YXRpb25fbGluZS5pc19maWxlID0gc2VsZi5fcG9ydC50 ZXN0X2lzZmlsZShwYXRoKQorICAgICAgICBleHBlY3RhdGlvbl9saW5lLmlzX2ZpbGUgPSBzZWxm Ll9wb3J0LnRlc3RfaXNmaWxlKGV4cGVjdGF0aW9uX2xpbmUubmFtZSkKICAgICAgICAgaWYgZXhw ZWN0YXRpb25fbGluZS5pc19maWxlOgotICAgICAgICAgICAgZXhwZWN0YXRpb25fbGluZS5wYXRo ID0gcGF0aAorICAgICAgICAgICAgZXhwZWN0YXRpb25fbGluZS5wYXRoID0gZXhwZWN0YXRpb25f bGluZS5uYW1lCiAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBleHBlY3RhdGlvbl9saW5lLnBh dGggPSBzZWxmLl9wb3J0Lm5vcm1hbGl6ZV90ZXN0X25hbWUocGF0aCkKKyAgICAgICAgICAgIGV4 cGVjdGF0aW9uX2xpbmUucGF0aCA9IHNlbGYuX3BvcnQubm9ybWFsaXplX3Rlc3RfbmFtZShleHBl Y3RhdGlvbl9saW5lLm5hbWUpCiAKICAgICAgICAgc2VsZi5fY29sbGVjdF9tYXRjaGluZ190ZXN0 cyhleHBlY3RhdGlvbl9saW5lKQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvYmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CmluZGV4 IGQ2MDdjYmViMTA0Li4xYzdhNTljN2I2NSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2Jhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2Uu cHkKQEAgLTcwMCwxMCArNzAwLDEwIEBAIGNsYXNzIFBvcnQob2JqZWN0KToKIAogICAgIGRlZiBu b3JtYWxpemVfdGVzdF9uYW1lKHNlbGYsIHRlc3RfbmFtZSk6CiAgICAgICAgICIiIlJldHVybnMg YSBub3JtYWxpemVkIHZlcnNpb24gb2YgdGhlIHRlc3QgbmFtZSBvciB0ZXN0IGRpcmVjdG9yeS4i IiIKLSAgICAgICAgaWYgdGVzdF9uYW1lLmVuZHN3aXRoKG9zLnBhdGguc2VwKToKKyAgICAgICAg aWYgdGVzdF9uYW1lLmVuZHN3aXRoKHNlbGYuVEVTVF9QQVRIX1NFUEFSQVRPUik6CiAgICAgICAg ICAgICByZXR1cm4gdGVzdF9uYW1lCiAgICAgICAgIGlmIHNlbGYudGVzdF9pc2Rpcih0ZXN0X25h bWUpOgotICAgICAgICAgICAgcmV0dXJuIHRlc3RfbmFtZSArIG9zLnBhdGguc2VwCisgICAgICAg ICAgICByZXR1cm4gdGVzdF9uYW1lICsgc2VsZi5URVNUX1BBVEhfU0VQQVJBVE9SCiAgICAgICAg IHJldHVybiB0ZXN0X25hbWUKIAogICAgIGRlZiBkcml2ZXJfY21kX2xpbmVfZm9yX2xvZ2dpbmco c2VsZik6CkBAIC04MzAsNyArODMwLDkgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICAj IFBvcnRzIHRoYXQgcnVuIG9uIHdpbmRvd3MgbmVlZCB0byBvdmVycmlkZSB0aGlzIG1ldGhvZCB0 byBkZWFsIHdpdGgKICAgICAgICAgIyBmaWxlbmFtZXMgd2l0aCBiYWNrc2xhc2hlcyBpbiB0aGVt LgogICAgICAgICBpZiBmaWxlbmFtZS5zdGFydHN3aXRoKHNlbGYubGF5b3V0X3Rlc3RzX2Rpcigp KToKLSAgICAgICAgICAgIHJldHVybiBzZWxmLmhvc3QuZmlsZXN5c3RlbS5yZWxwYXRoKGZpbGVu YW1lLCBzZWxmLmxheW91dF90ZXN0c19kaXIoKSkKKyAgICAgICAgICAgIHBhdGggPSBzZWxmLmhv c3QuZmlsZXN5c3RlbS5yZWxwYXRoKGZpbGVuYW1lLCBzZWxmLmxheW91dF90ZXN0c19kaXIoKSkK KyAgICAgICAgICAgIHBhdGggPSBwYXRoLnJlcGxhY2Uob3MucGF0aC5zZXAsIHNlbGYuVEVTVF9Q QVRIX1NFUEFSQVRPUikKKyAgICAgICAgICAgIHJldHVybiBwYXRoCiAgICAgICAgIGVsc2U6CiAg ICAgICAgICAgICByZXR1cm4gc2VsZi5ob3N0LmZpbGVzeXN0ZW0uYWJzcGF0aChmaWxlbmFtZSkK IApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkKaW5kZXggMjk5ODJhZGMxMzQuLmVh Mjg3ZmUwMDBiIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVy LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkKQEAgLTI1NCwx MCArMjU0LDEwIEBAIGNsYXNzIERyaXZlcihvYmplY3QpOgogICAgICAgICAgICAgcmV0dXJuIHNo bGV4LnNwbGl0KHNlbGYuX3BvcnQuZ2V0X29wdGlvbignd3JhcHBlcicpKSArIHdyYXBwZXJfYXJn dW1lbnRzCiAgICAgICAgIHJldHVybiB3cmFwcGVyX2FyZ3VtZW50cwogCi0gICAgSFRUUF9ESVIg PSBub3JtcGF0aCgiaHR0cC90ZXN0cyIpICsgb3Muc2VwCi0gICAgSFRUUF9MT0NBTF9ESVIgPSBu b3JtcGF0aCgiaHR0cC90ZXN0cy9sb2NhbCIpICsgb3Muc2VwCi0gICAgV0VCS0lUX1NQRUNJRklD X1dFQl9QTEFURk9STV9URVNUX1NVQkRJUiA9IG5vcm1wYXRoKCJodHRwL3dwdCIpICsgb3Muc2Vw Ci0gICAgV0VCS0lUX1dFQl9QTEFURk9STV9URVNUX1NFUlZFUl9ST1VURSA9IG5vcm1wYXRoKCJX ZWJLaXQiKSArIG9zLnNlcAorICAgIEhUVFBfRElSID0gImh0dHAvdGVzdHMvIgorICAgIEhUVFBf TE9DQUxfRElSID0gImh0dHAvdGVzdHMvbG9jYWwvIgorICAgIFdFQktJVF9TUEVDSUZJQ19XRUJf UExBVEZPUk1fVEVTVF9TVUJESVIgPSAiaHR0cC93cHQvIgorICAgIFdFQktJVF9XRUJfUExBVEZP Uk1fVEVTVF9TRVJWRVJfUk9VVEUgPSAiV2ViS2l0LyIKIAogICAgIGRlZiBpc19odHRwX3Rlc3Qo c2VsZiwgdGVzdF9uYW1lKToKICAgICAgICAgcmV0dXJuIHRlc3RfbmFtZS5zdGFydHN3aXRoKHNl bGYuSFRUUF9ESVIpIGFuZCBub3QgdGVzdF9uYW1lLnN0YXJ0c3dpdGgoc2VsZi5IVFRQX0xPQ0FM X0RJUikKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93aW4ucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2luLnB5CmluZGV4IDUxMGI2ZTcyOWM1Li5jODZm ZjQyYWFjYSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2luLnB5CkBAIC00NzUsOCArNDc1LDYg QEAgY2xhc3MgV2luQ2Fpcm9Qb3J0KFdpblBvcnQpOgogCiAgICAgREVGQVVMVF9BUkNISVRFQ1RV UkUgPSAneDg2XzY0JwogCi0gICAgVEVTVF9QQVRIX1NFUEFSQVRPUiA9IG9zLnNlcAotCiAgICAg ZGVmIGRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6CiAgICAgICAgIHZlcnNpb25f bmFtZV9tYXAgPSBWZXJzaW9uTmFtZU1hcC5tYXAoc2VsZi5ob3N0LnBsYXRmb3JtKQogICAgICAg ICBpZiBzZWxmLl9vc192ZXJzaW9uIDwgc2VsZi5WRVJTSU9OX01JTiBvciBzZWxmLl9vc192ZXJz aW9uID4gc2VsZi5WRVJTSU9OX01BWDoK 346817 2018-08-08 21:02:27 -0700 2018-08-09 19:14:33 -0700 Patch bug-187973-20180809130226.patch text/plain 6646 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0NzE1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjJjM2NjNWU2MGY3YTI5OTg0MTVkZGUyM2FkYTllN2Iy ZTQ0ODQ4MS4uNTNhNDg5ZmM2YjI5ZmFiMDNjM2QwNzY3NTcxMWIzZjZhYTE5Mjc1MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDE4LTA4LTA4ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFt3ZWJraXRweV1bV2luXSBMYXlvdXRUZXN0czogdGVzdCBuYW1lcyBzaG91 bGQgYmUgVW5peCBzdHlsZSwgc2VwYXJhdGVkIGJ5IHNsYXNoIG5vdCBiYWNrc2xhc2gKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4Nzk3MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIExheW91dFRlc3Rz LCB0ZXN0IG5hbWVzIGhhdmUgYmVlbiBjYW5vbmljYWxpemVkIGluIFVuaXggc3R5bGUKKyAgICAg ICAgc2luY2UgQnVnIDYzNTk3LCBmb3IgZXhhbXBsZSAnZmFzdC9jc3MvMDAxLmh0bWwnLiBCdXQs IEJ1ZyAxNzkyMTksCisgICAgICAgIEJ1ZyAxNzk1NzIsIEJ1ZyAxODA2NjAgYW5kIEJ1ZyAxODE4 MTQgaGF2ZSBjaGFuZ2VkIHRvIHVzZQorICAgICAgICBvcy5wYXRoLnNlcSBpbnN0ZWFkIG9mIHNs YXNoIGlmIFdpbmRvd3MgUHl0aG9uIGlzIHVzZWQuCisKKyAgICAgICAgUmV2ZXJ0IHBhcnRzIG9m IHRob3NlIGNoYW5nZXMuIENoYW5nZSByZWxhdGl2ZV90ZXN0X2ZpbGVuYW1lIHRvCisgICAgICAg IHJldHVybiBhIHNsYXNoIHNwZXJhdGVkIHRlc3QgbmFtZSBhcyB3ZWxsIGFzIGNocm9taXVtX3dp bi5weSB1c2VkCisgICAgICAgIHRvIGRvLgorCisgICAgICAgIFRoaXMgY2hhbmdlIGZpeGVzIGFs bCA0MSB0ZXN0LXdlYmtpdHB5IGZhaWx1cmVzIGluIFdpbkNhaXJvIHBvcnQuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMu cHk6CisgICAgICAgIChUZXN0RXhwZWN0YXRpb25QYXJzZXIuX3BhcnNlX2xpbmUpOiBEbyBub3Qg Y29udmVydCBhIHRlc3QgbmFtZSBieSB1c2luZyBub3JtcGF0aC4KKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3BvcnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQubm9ybWFsaXplX3Rlc3RfbmFt ZSk6IFVzZSBURVNUX1BBVEhfU0VQQVJBVE9SIGluc3RlYWQgb2Ygb3MucGF0aC5zZXAuCisgICAg ICAgIChQb3J0LnJlbGF0aXZlX3Rlc3RfZmlsZW5hbWUpOiBSZXBsYWNlIHNlbGYuaG9zdC5maWxl c3lzdGVtLnNlcCB3aXRoIHNlbGYuVEVTVF9QQVRIX1NFUEFSQVRPUi4KKyAgICAgICAgKFBvcnQu YWJzcGF0aF9mb3JfdGVzdCk6IFNwbGl0IHRlc3RfbmFtZSB3aXRoIFRFU1RfUEFUSF9TRVBBUkFU T1IuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weToKKyAgICAgICAg KERyaXZlcik6IFVzZSAnLycgaW5zdGVhZCBvZiBvcy5zZXAuCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9wb3J0L3dpbi5weToKKyAgICAgICAgKFdpbkNhaXJvUG9ydCk6IERvIG5vdCBvdmVy cmlkZSBURVNUX1BBVEhfU0VQQVJBVE9SLgorCiAyMDE4LTA4LTA4ICBBbGV4IENocmlzdGVuc2Vu ICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IHBvc3NpYmxlIG51bGwg ZGVyZWZlcmVuY2UgaW4gV2ViQmFja0ZvcndhcmRMaXN0OjpyZXN0b3JlRnJvbVN0YXRlCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9l eHBlY3RhdGlvbnMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2Rl bHMvdGVzdF9leHBlY3RhdGlvbnMucHkKaW5kZXggYWE1YjUxMWQxZTA2YmQ3ZTYyZDY0ODZhMTNm NGM4MmM5NjY0ZDY1ZS4uY2RjZGExYWMzODcwZmVhMzBjZjdiYmEyNDUxY2NhOGM3Mjc2ZTg3NiAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rl c3RfZXhwZWN0YXRpb25zLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQpAQCAtMzEsNyArMzEsNiBAQCBmb3IgbGF5 b3V0IHRlc3RzLgogIiIiCiAKIGltcG9ydCBsb2dnaW5nCi1pbXBvcnQgb3MucGF0aAogaW1wb3J0 IHJlCiAKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscy50ZXN0X2NvbmZpZ3VyYXRp b24gaW1wb3J0IFRlc3RDb25maWd1cmF0aW9uQ29udmVydGVyCkBAIC0xMzksMTIgKzEzOCwxMSBA QCBjbGFzcyBUZXN0RXhwZWN0YXRpb25QYXJzZXIob2JqZWN0KToKICAgICAgICAgaWYgbm90IHNl bGYuX2NoZWNrX3Rlc3RfZXhpc3RzKGV4cGVjdGF0aW9uX2xpbmUpOgogICAgICAgICAgICAgcmV0 dXJuCiAKLSAgICAgICAgcGF0aCA9IG9zLnBhdGgubm9ybXBhdGgoZXhwZWN0YXRpb25fbGluZS5u YW1lKQotICAgICAgICBleHBlY3RhdGlvbl9saW5lLmlzX2ZpbGUgPSBzZWxmLl9wb3J0LnRlc3Rf aXNmaWxlKHBhdGgpCisgICAgICAgIGV4cGVjdGF0aW9uX2xpbmUuaXNfZmlsZSA9IHNlbGYuX3Bv cnQudGVzdF9pc2ZpbGUoZXhwZWN0YXRpb25fbGluZS5uYW1lKQogICAgICAgICBpZiBleHBlY3Rh dGlvbl9saW5lLmlzX2ZpbGU6Ci0gICAgICAgICAgICBleHBlY3RhdGlvbl9saW5lLnBhdGggPSBw YXRoCisgICAgICAgICAgICBleHBlY3RhdGlvbl9saW5lLnBhdGggPSBleHBlY3RhdGlvbl9saW5l Lm5hbWUKICAgICAgICAgZWxzZToKLSAgICAgICAgICAgIGV4cGVjdGF0aW9uX2xpbmUucGF0aCA9 IHNlbGYuX3BvcnQubm9ybWFsaXplX3Rlc3RfbmFtZShwYXRoKQorICAgICAgICAgICAgZXhwZWN0 YXRpb25fbGluZS5wYXRoID0gc2VsZi5fcG9ydC5ub3JtYWxpemVfdGVzdF9uYW1lKGV4cGVjdGF0 aW9uX2xpbmUubmFtZSkKIAogICAgICAgICBzZWxmLl9jb2xsZWN0X21hdGNoaW5nX3Rlc3RzKGV4 cGVjdGF0aW9uX2xpbmUpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y dC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKaW5kZXggZDYw N2NiZWIxMDQ5ZWU4NTcwMGVjMTc5YWE0MmZkOWFkM2U1ZmQwMy4uOGM4NmI2YjA5MmE1NjlhYWE3 MzQ4NGM2YzZhN2UxYzlkZWY1ZGE3OCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L2Jhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkK QEAgLTcwMCwxMCArNzAwLDEwIEBAIGNsYXNzIFBvcnQob2JqZWN0KToKIAogICAgIGRlZiBub3Jt YWxpemVfdGVzdF9uYW1lKHNlbGYsIHRlc3RfbmFtZSk6CiAgICAgICAgICIiIlJldHVybnMgYSBu b3JtYWxpemVkIHZlcnNpb24gb2YgdGhlIHRlc3QgbmFtZSBvciB0ZXN0IGRpcmVjdG9yeS4iIiIK LSAgICAgICAgaWYgdGVzdF9uYW1lLmVuZHN3aXRoKG9zLnBhdGguc2VwKToKKyAgICAgICAgaWYg dGVzdF9uYW1lLmVuZHN3aXRoKHNlbGYuVEVTVF9QQVRIX1NFUEFSQVRPUik6CiAgICAgICAgICAg ICByZXR1cm4gdGVzdF9uYW1lCiAgICAgICAgIGlmIHNlbGYudGVzdF9pc2Rpcih0ZXN0X25hbWUp OgotICAgICAgICAgICAgcmV0dXJuIHRlc3RfbmFtZSArIG9zLnBhdGguc2VwCisgICAgICAgICAg ICByZXR1cm4gdGVzdF9uYW1lICsgc2VsZi5URVNUX1BBVEhfU0VQQVJBVE9SCiAgICAgICAgIHJl dHVybiB0ZXN0X25hbWUKIAogICAgIGRlZiBkcml2ZXJfY21kX2xpbmVfZm9yX2xvZ2dpbmcoc2Vs Zik6CkBAIC04MzAsNyArODMwLDkgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICAjIFBv cnRzIHRoYXQgcnVuIG9uIHdpbmRvd3MgbmVlZCB0byBvdmVycmlkZSB0aGlzIG1ldGhvZCB0byBk ZWFsIHdpdGgKICAgICAgICAgIyBmaWxlbmFtZXMgd2l0aCBiYWNrc2xhc2hlcyBpbiB0aGVtLgog ICAgICAgICBpZiBmaWxlbmFtZS5zdGFydHN3aXRoKHNlbGYubGF5b3V0X3Rlc3RzX2RpcigpKToK LSAgICAgICAgICAgIHJldHVybiBzZWxmLmhvc3QuZmlsZXN5c3RlbS5yZWxwYXRoKGZpbGVuYW1l LCBzZWxmLmxheW91dF90ZXN0c19kaXIoKSkKKyAgICAgICAgICAgIHBhdGggPSBzZWxmLmhvc3Qu ZmlsZXN5c3RlbS5yZWxwYXRoKGZpbGVuYW1lLCBzZWxmLmxheW91dF90ZXN0c19kaXIoKSkKKyAg ICAgICAgICAgIHBhdGggPSBwYXRoLnJlcGxhY2Uoc2VsZi5ob3N0LmZpbGVzeXN0ZW0uc2VwLCBz ZWxmLlRFU1RfUEFUSF9TRVBBUkFUT1IpCisgICAgICAgICAgICByZXR1cm4gcGF0aAogICAgICAg ICBlbHNlOgogICAgICAgICAgICAgcmV0dXJuIHNlbGYuaG9zdC5maWxlc3lzdGVtLmFic3BhdGgo ZmlsZW5hbWUpCiAKQEAgLTgzOSw3ICs4NDEsNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAg ICAgICIiIlJldHVybnMgdGhlIGZ1bGwgcGF0aCB0byB0aGUgZmlsZSBmb3IgYSBnaXZlbiB0ZXN0 IG5hbWUuIFRoaXMgaXMgdGhlCiAgICAgICAgIGludmVyc2Ugb2YgcmVsYXRpdmVfdGVzdF9maWxl bmFtZSgpIGlmIG5vIHRhcmdldF9ob3N0IGlzIHNwZWNpZmllZC4iIiIKICAgICAgICAgaG9zdCA9 IHRhcmdldF9ob3N0IG9yIHNlbGYuaG9zdAotICAgICAgICByZXR1cm4gaG9zdC5maWxlc3lzdGVt LmpvaW4oaG9zdC5maWxlc3lzdGVtLm1hcF9iYXNlX2hvc3RfcGF0aChzZWxmLmxheW91dF90ZXN0 c19kaXIoKSksIHRlc3RfbmFtZSkKKyAgICAgICAgcmV0dXJuIGhvc3QuZmlsZXN5c3RlbS5qb2lu KGhvc3QuZmlsZXN5c3RlbS5tYXBfYmFzZV9ob3N0X3BhdGgoc2VsZi5sYXlvdXRfdGVzdHNfZGly KCkpLCAqdGVzdF9uYW1lLnNwbGl0KHNlbGYuVEVTVF9QQVRIX1NFUEFSQVRPUikpCiAKICAgICBk ZWYganNjX3Jlc3VsdHNfZGlyZWN0b3J5KHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5fYnVp bGRfcGF0aCgpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVy LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weQppbmRleCAyOTk4MmFk YzEzNGViNTA2NTA5ZTY0NDljYjhiYTBkZTlmYWEwZmQyLi5lYTI4N2ZlMDAwYjI3NzVkMTBkMjc5 MjM3NDI0ZDNhZTNlOTg5ZmJkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvZHJpdmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkK QEAgLTI1NCwxMCArMjU0LDEwIEBAIGNsYXNzIERyaXZlcihvYmplY3QpOgogICAgICAgICAgICAg cmV0dXJuIHNobGV4LnNwbGl0KHNlbGYuX3BvcnQuZ2V0X29wdGlvbignd3JhcHBlcicpKSArIHdy YXBwZXJfYXJndW1lbnRzCiAgICAgICAgIHJldHVybiB3cmFwcGVyX2FyZ3VtZW50cwogCi0gICAg SFRUUF9ESVIgPSBub3JtcGF0aCgiaHR0cC90ZXN0cyIpICsgb3Muc2VwCi0gICAgSFRUUF9MT0NB TF9ESVIgPSBub3JtcGF0aCgiaHR0cC90ZXN0cy9sb2NhbCIpICsgb3Muc2VwCi0gICAgV0VCS0lU X1NQRUNJRklDX1dFQl9QTEFURk9STV9URVNUX1NVQkRJUiA9IG5vcm1wYXRoKCJodHRwL3dwdCIp ICsgb3Muc2VwCi0gICAgV0VCS0lUX1dFQl9QTEFURk9STV9URVNUX1NFUlZFUl9ST1VURSA9IG5v cm1wYXRoKCJXZWJLaXQiKSArIG9zLnNlcAorICAgIEhUVFBfRElSID0gImh0dHAvdGVzdHMvIgor ICAgIEhUVFBfTE9DQUxfRElSID0gImh0dHAvdGVzdHMvbG9jYWwvIgorICAgIFdFQktJVF9TUEVD SUZJQ19XRUJfUExBVEZPUk1fVEVTVF9TVUJESVIgPSAiaHR0cC93cHQvIgorICAgIFdFQktJVF9X RUJfUExBVEZPUk1fVEVTVF9TRVJWRVJfUk9VVEUgPSAiV2ViS2l0LyIKIAogICAgIGRlZiBpc19o dHRwX3Rlc3Qoc2VsZiwgdGVzdF9uYW1lKToKICAgICAgICAgcmV0dXJuIHRlc3RfbmFtZS5zdGFy dHN3aXRoKHNlbGYuSFRUUF9ESVIpIGFuZCBub3QgdGVzdF9uYW1lLnN0YXJ0c3dpdGgoc2VsZi5I VFRQX0xPQ0FMX0RJUikKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93 aW4ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2luLnB5CmluZGV4IDUxMGI2ZTcy OWM1MjVhZjIzZmMxOGU5MDcyNTdjZDdjNjM3ZjkyZDQuLmM4NmZmNDJhYWNhODFlYWI3NmI5MDk4 ODBlMTg3MGFjNDQ0MDU1YTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y dC93aW4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQpAQCAtNDc1 LDggKzQ3NSw2IEBAIGNsYXNzIFdpbkNhaXJvUG9ydChXaW5Qb3J0KToKIAogICAgIERFRkFVTFRf QVJDSElURUNUVVJFID0gJ3g4Nl82NCcKIAotICAgIFRFU1RfUEFUSF9TRVBBUkFUT1IgPSBvcy5z ZXAKLQogICAgIGRlZiBkZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgogICAgICAg ICB2ZXJzaW9uX25hbWVfbWFwID0gVmVyc2lvbk5hbWVNYXAubWFwKHNlbGYuaG9zdC5wbGF0Zm9y bSkKICAgICAgICAgaWYgc2VsZi5fb3NfdmVyc2lvbiA8IHNlbGYuVkVSU0lPTl9NSU4gb3Igc2Vs Zi5fb3NfdmVyc2lvbiA+IHNlbGYuVkVSU0lPTl9NQVg6Cg==