201311 2019-08-29 13:56:00 -0700 run-api-tests: Add support for specifying additional environment variables 2019-11-20 01:14:45 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build All All RESOLVED FIXED InRadar P2 Enhancement --- 1 dbates jbedard ews-watchlist fujii glenn webkit-bug-importer oldest_to_newest 1566377 0 dbates 2019-08-29 13:56:00 -0700 I need to be able to run the API tests with additional built system frameworks, like UIKit. We should support passing additional environment variables to use when running run-api-tests. Run-webkit-tests supports this via the --additional-env-var command line option. I propose we also add a --additional-env-var to run-api-tests that behaves the same. 1566378 1 webkit-bug-importer 2019-08-29 13:56:13 -0700 <rdar://problem/54852698> 1566382 2 jbedard 2019-08-29 14:04:24 -0700 This should be pretty straight-forward, run-webkit-tests and run-api-tests share a lot of code. 1567752 3 377981 jbedard 2019-09-04 08:14:14 -0700 Created attachment 377981 Patch 1567759 4 377981 dbates 2019-09-04 08:30:22 -0700 Comment on attachment 377981 Patch Thank you for taking this on. This is a good first stab. It was not the solution I expected because: 1. Specifying the *DYLD_* variables using --additional-env-var overrides (instead of appends to) them, which is not behavior I expected. I expected them to append to – the same behavior as in run-webkit-tests. FYI, this is an important behavioral difference because without the appending I cannot use my custom build UIKit **together** with a custom build WebKit. 2. There is duplication of code from run-webkit-tests. I was expecting more code sharing. 1567771 5 jbedard 2019-09-04 09:22:04 -0700 (In reply to Daniel Bates from comment #4) > Comment on attachment 377981 [details] > Patch > > Thank you for taking this on. This is a good first stab. It was not the > solution I expected because: > > 1. Specifying the *DYLD_* variables using --additional-env-var overrides > (instead of appends to) them, which is not behavior I expected. I expected > them to append to – the same behavior as in run-webkit-tests. FYI, this is > an important behavioral difference because without the appending I cannot > use my custom build UIKit **together** with a custom build WebKit. Good point, hadn't thought about this use case. > 2. There is duplication of code from run-webkit-tests. I was expecting more > code sharing. That's (mostly) more trouble than it's worth. The actual option parsing code in run-webkit-tests is coupled with layout test specific options, so reusing it would involve refactoring our option parser for run-webkit-tests. The environment variable code is split between setup_environ_for_server (which, taking a closer look, we can reuse, even though the name would sort of indicate otherwise) and _setup_environ_for_driver in driver.py. We can't use anything in driver.py, that entire class is extremely specific to layout tests. 1567778 6 377986 jbedard 2019-09-04 10:10:33 -0700 Created attachment 377986 Patch 1567856 7 377986 dbates 2019-09-04 13:48:19 -0700 Comment on attachment 377986 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=377986&action=review > Tools/Scripts/webkitpy/port/base.py:275 > + for key in ['DYLD_LIBRARY_PATH', '__XPC_DYLD_LIBRARY_PATH', 'DYLD_FRAMEWORK_PATH', '__XPC_DYLD_FRAMEWORK_PATH']: > + if environment.get(key): > + environment[key] = environment[key] + os.pathsep + build_root_path > + else: > + environment[key] = build_root_path Good use of os.pathsep. Can self._append_value_colon_separated() be used here instead of duplicating its functionality? If not, please explain in the ChangeLog why it cannot be used. For this patch or a future patch append_value_colon_separated() could benefit by writing in terms of os.pathsep. 1567869 8 jbedard 2019-09-04 14:17:39 -0700 (In reply to Daniel Bates from comment #7) > Comment on attachment 377986 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=377986&action=review > > > Tools/Scripts/webkitpy/port/base.py:275 > > + for key in ['DYLD_LIBRARY_PATH', '__XPC_DYLD_LIBRARY_PATH', 'DYLD_FRAMEWORK_PATH', '__XPC_DYLD_FRAMEWORK_PATH']: > > + if environment.get(key): > > + environment[key] = environment[key] + os.pathsep + build_root_path > > + else: > > + environment[key] = build_root_path > > Good use of os.pathsep. Can self._append_value_colon_separated() be used > here instead of duplicating its functionality? If not, please explain in the > ChangeLog why it cannot be used. For this patch or a future patch > append_value_colon_separated() could benefit by writing in terms of > os.pathsep. Yes it can, didn't notice that function in base.py, good catch. 1567872 9 jbedard 2019-09-04 14:25:56 -0700 Committed r249500: <https://trac.webkit.org/changeset/249500> 1591915 10 fujii 2019-11-20 00:02:39 -0800 Filed: Bug 204400 – [Win][Cygwin][run-api-tests] assert os.pathsep not in value in _append_value_colon_separated 1591916 11 383949 fujii 2019-11-20 00:05:35 -0800 Created attachment 383949 Patch actually landed 1591917 12 383949 fujii 2019-11-20 00:08:49 -0800 Comment on attachment 383949 Patch actually landed View in context: https://bugs.webkit.org/attachment.cgi?id=383949&action=review > Tools/ChangeLog:12 > + (Port._append_value_colon_separated): Use os.pathsep instead of ':'. Why? The function name '_append_value_colon_separated' is misleading. 1591929 13 383949 fujii 2019-11-20 01:14:45 -0800 Comment on attachment 383949 Patch actually landed View in context: https://bugs.webkit.org/attachment.cgi?id=383949&action=review >> Tools/ChangeLog:12 >> + (Port._append_value_colon_separated): Use os.pathsep instead of ':'. > > Why? The function name '_append_value_colon_separated' is misleading. Sorry. I misunderstood. Ignore this comment. 377981 2019-09-04 08:14:14 -0700 2019-09-04 10:10:32 -0700 Patch bug-201311-20190904081412.patch text/plain 2602 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0OTQ3OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE5LTA5LTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBydW4tYXBpLXRlc3RzOiBBZGQgc3VwcG9ydCBmb3Igc3BlY2lmeWluZyBh ZGRpdGlvbmFsIGVudmlyb25tZW50IHZhcmlhYmxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxMzExCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81 NDg1MjY5OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvYXBpX3Rlc3RzL3J1bl9hcGlfdGVzdHMucHk6CisgICAgICAg IChwYXJzZV9hcmdzKTogQWRkIC0tYWRkaXRpb25hbC1lbnYtdmFyIGZsYWcuCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHk6CisgICAgICAgIChQb3J0LmVudmlyb25tZW50 X2Zvcl9hcGlfdGVzdHMpOiBBZGQgdGhlIHZhbHVlcyBmcm9tIC0tYWRkaXRpb25hbC1lbnYtdmFy IHRvIHRoZQorICAgICAgICBlbnZpcm9ubWVudC4KKwogMjAxOS0wOS0wMyAgWXVzdWtlIFN1enVr aSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtibWFsbG9jXSBJc29UTFNMYXlvdXQg YW5kIEFsbElzb0hlYXBzIHJlZ2lzdHJhdGlvbiBpcyByYWN5IHdpdGggZGVyaXZlZCBjbGFzcyBp bml0aWFsaXphdGlvbiB3aXRoIHZpcnR1YWwgZnVuY3Rpb25zCkluZGV4OiBUb29scy9TY3JpcHRz L3dlYmtpdHB5L2FwaV90ZXN0cy9ydW5fYXBpX3Rlc3RzLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvYXBpX3Rlc3RzL3J1bl9hcGlfdGVzdHMucHkJKHJldmlzaW9uIDI0 OTQ3OSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYXBpX3Rlc3RzL3J1bl9hcGlfdGVzdHMu cHkJKHdvcmtpbmcgY29weSkKQEAgLTEzNiw2ICsxMzYsOCBAQCBkZWYgcGFyc2VfYXJncyhhcmdz KToKIAogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbignLS1mb3JjZScsIGFjdGlvbj0nc3Rv cmVfdHJ1ZScsIGRlZmF1bHQ9RmFsc2UsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhl bHA9J1J1biBhbGwgdGVzdHMsIGV2ZW4gRElTQUJMRUQgdGVzdHMnKSwKKyAgICAgICAgb3B0cGFy c2UubWFrZV9vcHRpb24oJy0tYWRkaXRpb25hbC1lbnYtdmFyJywgdHlwZT0nc3RyaW5nJywgYWN0 aW9uPSdhcHBlbmQnLCBkZWZhdWx0PVtdLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBo ZWxwPSdQYXNzZXMgdGhhdCBlbnZpcm9ubWVudCB2YXJpYWJsZSB0byB0aGUgdGVzdHMgKC0tYWRk aXRpb25hbC1lbnYtdmFyPU5BTUU9VkFMVUUpJyksCiAgICAgXSkpCiAgICAgb3B0aW9uX2dyb3Vw X2RlZmluaXRpb25zLmFwcGVuZCgoJ1VwbG9hZCBPcHRpb25zJywgdXBsb2FkX29wdGlvbnMoKSkp CiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CShyZXZpc2lvbiAyNDk0Nzkp CisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQkod29ya2luZyBjb3B5KQpA QCAtMjY3LDEzICsyNjcsMTkgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogCiAgICAgZGVmIGVudmly b25tZW50X2Zvcl9hcGlfdGVzdHMoc2VsZik6CiAgICAgICAgIGJ1aWxkX3Jvb3RfcGF0aCA9IHN0 cihzZWxmLl9idWlsZF9wYXRoKCkpCi0gICAgICAgIHJldHVybiB7CisgICAgICAgIGVudmlyb25t ZW50ID0gewogICAgICAgICAgICAgJ0RZTERfTElCUkFSWV9QQVRIJzogYnVpbGRfcm9vdF9wYXRo LAogICAgICAgICAgICAgJ19fWFBDX0RZTERfTElCUkFSWV9QQVRIJzogYnVpbGRfcm9vdF9wYXRo LAogICAgICAgICAgICAgJ0RZTERfRlJBTUVXT1JLX1BBVEgnOiBidWlsZF9yb290X3BhdGgsCiAg ICAgICAgICAgICAnX19YUENfRFlMRF9GUkFNRVdPUktfUEFUSCc6IGJ1aWxkX3Jvb3RfcGF0aCwK ICAgICAgICAgfQogCisgICAgICAgIGZvciBwYWlyIGluIHNlbGYuZ2V0X29wdGlvbignYWRkaXRp b25hbF9lbnZfdmFyJywgW10pOgorICAgICAgICAgICAga2V5LCB2YWx1ZSA9IHBhaXIuc3BsaXQo Jz0nLCAxKQorICAgICAgICAgICAgZW52aXJvbm1lbnRba2V5XSA9IHZhbHVlCisKKyAgICAgICAg cmV0dXJuIGVudmlyb25tZW50CisKICAgICBkZWYgX2NoZWNrX2RyaXZlcihzZWxmKToKICAgICAg ICAgZHJpdmVyX3BhdGggPSBzZWxmLl9wYXRoX3RvX2RyaXZlcigpCiAgICAgICAgIGlmIG5vdCBz ZWxmLl9maWxlc3lzdGVtLmV4aXN0cyhkcml2ZXJfcGF0aCk6Cg== 377986 2019-09-04 10:10:33 -0700 2019-09-04 13:48:19 -0700 Patch bug-201311-20190904101032.patch text/plain 2744 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0OTQ3OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE5LTA5LTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBydW4tYXBpLXRlc3RzOiBBZGQgc3VwcG9ydCBmb3Igc3BlY2lmeWluZyBh ZGRpdGlvbmFsIGVudmlyb25tZW50IHZhcmlhYmxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxMzExCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81 NDg1MjY5OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvYXBpX3Rlc3RzL3J1bl9hcGlfdGVzdHMucHk6CisgICAgICAg IChwYXJzZV9hcmdzKTogQWRkIC0tYWRkaXRpb25hbC1lbnYtdmFyIGZsYWcuCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHk6CisgICAgICAgIChQb3J0LmVudmlyb25tZW50 X2Zvcl9hcGlfdGVzdHMpOiBBZGQgdGhlIHZhbHVlcyBmcm9tIC0tYWRkaXRpb25hbC1lbnYtdmFy IHRvIHRoZQorICAgICAgICBlbnZpcm9ubWVudC4KKwogMjAxOS0wOS0wMyAgWXVzdWtlIFN1enVr aSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtibWFsbG9jXSBJc29UTFNMYXlvdXQg YW5kIEFsbElzb0hlYXBzIHJlZ2lzdHJhdGlvbiBpcyByYWN5IHdpdGggZGVyaXZlZCBjbGFzcyBp bml0aWFsaXphdGlvbiB3aXRoIHZpcnR1YWwgZnVuY3Rpb25zCkluZGV4OiBUb29scy9TY3JpcHRz L3dlYmtpdHB5L2FwaV90ZXN0cy9ydW5fYXBpX3Rlc3RzLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvYXBpX3Rlc3RzL3J1bl9hcGlfdGVzdHMucHkJKHJldmlzaW9uIDI0 OTQ3OSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYXBpX3Rlc3RzL3J1bl9hcGlfdGVzdHMu cHkJKHdvcmtpbmcgY29weSkKQEAgLTEzNiw2ICsxMzYsOCBAQCBkZWYgcGFyc2VfYXJncyhhcmdz KToKIAogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbignLS1mb3JjZScsIGFjdGlvbj0nc3Rv cmVfdHJ1ZScsIGRlZmF1bHQ9RmFsc2UsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhl bHA9J1J1biBhbGwgdGVzdHMsIGV2ZW4gRElTQUJMRUQgdGVzdHMnKSwKKyAgICAgICAgb3B0cGFy c2UubWFrZV9vcHRpb24oJy0tYWRkaXRpb25hbC1lbnYtdmFyJywgdHlwZT0nc3RyaW5nJywgYWN0 aW9uPSdhcHBlbmQnLCBkZWZhdWx0PVtdLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBo ZWxwPSdQYXNzZXMgdGhhdCBlbnZpcm9ubWVudCB2YXJpYWJsZSB0byB0aGUgdGVzdHMgKC0tYWRk aXRpb25hbC1lbnYtdmFyPU5BTUU9VkFMVUUpJyksCiAgICAgXSkpCiAgICAgb3B0aW9uX2dyb3Vw X2RlZmluaXRpb25zLmFwcGVuZCgoJ1VwbG9hZCBPcHRpb25zJywgdXBsb2FkX29wdGlvbnMoKSkp CiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CShyZXZpc2lvbiAyNDk0Nzkp CisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQkod29ya2luZyBjb3B5KQpA QCAtMjY3LDEyICsyNjcsMTQgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogCiAgICAgZGVmIGVudmly b25tZW50X2Zvcl9hcGlfdGVzdHMoc2VsZik6CiAgICAgICAgIGJ1aWxkX3Jvb3RfcGF0aCA9IHN0 cihzZWxmLl9idWlsZF9wYXRoKCkpCi0gICAgICAgIHJldHVybiB7Ci0gICAgICAgICAgICAnRFlM RF9MSUJSQVJZX1BBVEgnOiBidWlsZF9yb290X3BhdGgsCi0gICAgICAgICAgICAnX19YUENfRFlM RF9MSUJSQVJZX1BBVEgnOiBidWlsZF9yb290X3BhdGgsCi0gICAgICAgICAgICAnRFlMRF9GUkFN RVdPUktfUEFUSCc6IGJ1aWxkX3Jvb3RfcGF0aCwKLSAgICAgICAgICAgICdfX1hQQ19EWUxEX0ZS QU1FV09SS19QQVRIJzogYnVpbGRfcm9vdF9wYXRoLAotICAgICAgICB9CisgICAgICAgIGVudmly b25tZW50ID0gc2VsZi5zZXR1cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIoKQorICAgICAgICBmb3Iga2V5 IGluIFsnRFlMRF9MSUJSQVJZX1BBVEgnLCAnX19YUENfRFlMRF9MSUJSQVJZX1BBVEgnLCAnRFlM RF9GUkFNRVdPUktfUEFUSCcsICdfX1hQQ19EWUxEX0ZSQU1FV09SS19QQVRIJ106CisgICAgICAg ICAgICBpZiBlbnZpcm9ubWVudC5nZXQoa2V5KToKKyAgICAgICAgICAgICAgICBlbnZpcm9ubWVu dFtrZXldID0gZW52aXJvbm1lbnRba2V5XSArIG9zLnBhdGhzZXAgKyBidWlsZF9yb290X3BhdGgK KyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgZW52aXJvbm1lbnRba2V5XSA9IGJ1 aWxkX3Jvb3RfcGF0aAorCisgICAgICAgIHJldHVybiBlbnZpcm9ubWVudAogCiAgICAgZGVmIF9j aGVja19kcml2ZXIoc2VsZik6CiAgICAgICAgIGRyaXZlcl9wYXRoID0gc2VsZi5fcGF0aF90b19k cml2ZXIoKQo= 383949 2019-11-20 00:05:35 -0800 2019-11-20 00:05:35 -0800 Patch actually landed a.diff text/plain 3776 fujii Y29tbWl0IDFkMmNjN2E5M2JjZGVjNzcyNTBkMWM0YWI5Njg2ZTVjYzMyYzE3MGEKQXV0aG9yOiBq YmVkYXJkQGFwcGxlLmNvbSA8amJlZGFyZEBhcHBsZS5jb21AMjY4ZjQ1Y2MtY2QwOS0wNDEwLWFi M2MtZDUyNjkxYjRkYmZjPgpEYXRlOiAgIFdlZCBTZXAgNCAyMToyNTo1NCAyMDE5ICswMDAwCgog ICAgcnVuLWFwaS10ZXN0czogQWRkIHN1cHBvcnQgZm9yIHNwZWNpZnlpbmcgYWRkaXRpb25hbCBl bnZpcm9ubWVudCB2YXJpYWJsZXMKICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMDEzMTEKICAgIDxyZGFyOi8vcHJvYmxlbS81NDg1MjY5OD4KICAgIAogICAgUmV2 aWV3ZWQgYnkgRGFuaWVsIEJhdGVzLgogICAgCiAgICAqIFNjcmlwdHMvd2Via2l0cHkvYXBpX3Rl c3RzL3J1bl9hcGlfdGVzdHMucHk6CiAgICAocGFyc2VfYXJncyk6IEFkZCAtLWFkZGl0aW9uYWwt ZW52LXZhciBmbGFnLgogICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weToKICAgIChQ b3J0Ll9hcHBlbmRfdmFsdWVfY29sb25fc2VwYXJhdGVkKTogVXNlIG9zLnBhdGhzZXAgaW5zdGVh ZCBvZiAnOicuCiAgICAoUG9ydC5lbnZpcm9ubWVudF9mb3JfYXBpX3Rlc3RzKTogQWRkIHRoZSB2 YWx1ZXMgZnJvbSAtLWFkZGl0aW9uYWwtZW52LXZhciB0byB0aGUKICAgIGVudmlyb25tZW50Lgog ICAgCiAgICAKICAgIGdpdC1zdm4taWQ6IGh0dHA6Ly9zdm4ud2Via2l0Lm9yZy9yZXBvc2l0b3J5 L3dlYmtpdC90cnVua0AyNDk1MDAgMjY4ZjQ1Y2MtY2QwOS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZj CgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDkx YmJjOTYzY2QxLi42ODljNjBmZDVjOSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA5LTA0ICBKb25hdGhhbiBC ZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICBydW4tYXBpLXRlc3RzOiBBZGQg c3VwcG9ydCBmb3Igc3BlY2lmeWluZyBhZGRpdGlvbmFsIGVudmlyb25tZW50IHZhcmlhYmxlcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxMzExCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NDg1MjY5OD4KKworICAgICAgICBSZXZpZXdlZCBieSBE YW5pZWwgQmF0ZXMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2FwaV90ZXN0cy9ydW5f YXBpX3Rlc3RzLnB5OgorICAgICAgICAocGFyc2VfYXJncyk6IEFkZCAtLWFkZGl0aW9uYWwtZW52 LXZhciBmbGFnLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5OgorICAg ICAgICAoUG9ydC5fYXBwZW5kX3ZhbHVlX2NvbG9uX3NlcGFyYXRlZCk6IFVzZSBvcy5wYXRoc2Vw IGluc3RlYWQgb2YgJzonLgorICAgICAgICAoUG9ydC5lbnZpcm9ubWVudF9mb3JfYXBpX3Rlc3Rz KTogQWRkIHRoZSB2YWx1ZXMgZnJvbSAtLWFkZGl0aW9uYWwtZW52LXZhciB0byB0aGUKKyAgICAg ICAgZW52aXJvbm1lbnQuCisKIDIwMTktMDktMDQgIEFha2FzaCBKYWluICA8YWFrYXNoX2phaW5A YXBwbGUuY29tPgogCiAgICAgICAgIEVXUyBidWJibGVzIHNob3VsZCBpbmRpY2F0ZSBidWlsZGVy IHZzIHRlc3RlcgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9hcGlfdGVzdHMv cnVuX2FwaV90ZXN0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYXBpX3Rlc3RzL3J1bl9h cGlfdGVzdHMucHkKaW5kZXggMzFlMjFjZmFkYzYuLjdhODM0YzcwYzRjIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2FwaV90ZXN0cy9ydW5fYXBpX3Rlc3RzLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvYXBpX3Rlc3RzL3J1bl9hcGlfdGVzdHMucHkKQEAgLTEzNiw2 ICsxMzYsOCBAQCBkZWYgcGFyc2VfYXJncyhhcmdzKToKIAogICAgICAgICBvcHRwYXJzZS5tYWtl X29wdGlvbignLS1mb3JjZScsIGFjdGlvbj0nc3RvcmVfdHJ1ZScsIGRlZmF1bHQ9RmFsc2UsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9J1J1biBhbGwgdGVzdHMsIGV2ZW4gRElT QUJMRUQgdGVzdHMnKSwKKyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oJy0tYWRkaXRpb25h bC1lbnYtdmFyJywgdHlwZT0nc3RyaW5nJywgYWN0aW9uPSdhcHBlbmQnLCBkZWZhdWx0PVtdLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBoZWxwPSdQYXNzZXMgdGhhdCBlbnZpcm9ubWVu dCB2YXJpYWJsZSB0byB0aGUgdGVzdHMgKC0tYWRkaXRpb25hbC1lbnYtdmFyPU5BTUU9VkFMVUUp JyksCiAgICAgXSkpCiAgICAgb3B0aW9uX2dyb3VwX2RlZmluaXRpb25zLmFwcGVuZCgoJ1VwbG9h ZCBPcHRpb25zJywgdXBsb2FkX29wdGlvbnMoKSkpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jh c2UucHkKaW5kZXggMzUwNWYxZThlMzYuLmU0YjE0NDQxMTQ4IDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvYmFzZS5weQpAQCAtMjY3LDEyICsyNjcsMTEgQEAgY2xhc3MgUG9ydChvYmplY3QpOgog CiAgICAgZGVmIGVudmlyb25tZW50X2Zvcl9hcGlfdGVzdHMoc2VsZik6CiAgICAgICAgIGJ1aWxk X3Jvb3RfcGF0aCA9IHN0cihzZWxmLl9idWlsZF9wYXRoKCkpCi0gICAgICAgIHJldHVybiB7Ci0g ICAgICAgICAgICAnRFlMRF9MSUJSQVJZX1BBVEgnOiBidWlsZF9yb290X3BhdGgsCi0gICAgICAg ICAgICAnX19YUENfRFlMRF9MSUJSQVJZX1BBVEgnOiBidWlsZF9yb290X3BhdGgsCi0gICAgICAg ICAgICAnRFlMRF9GUkFNRVdPUktfUEFUSCc6IGJ1aWxkX3Jvb3RfcGF0aCwKLSAgICAgICAgICAg ICdfX1hQQ19EWUxEX0ZSQU1FV09SS19QQVRIJzogYnVpbGRfcm9vdF9wYXRoLAotICAgICAgICB9 CisgICAgICAgIGVudmlyb25tZW50ID0gc2VsZi5zZXR1cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIoKQor ICAgICAgICBmb3IgbmFtZSBpbiBbJ0RZTERfTElCUkFSWV9QQVRIJywgJ19fWFBDX0RZTERfTElC UkFSWV9QQVRIJywgJ0RZTERfRlJBTUVXT1JLX1BBVEgnLCAnX19YUENfRFlMRF9GUkFNRVdPUktf UEFUSCddOgorICAgICAgICAgICAgc2VsZi5fYXBwZW5kX3ZhbHVlX2NvbG9uX3NlcGFyYXRlZChl bnZpcm9ubWVudCwgbmFtZSwgYnVpbGRfcm9vdF9wYXRoKQorCisgICAgICAgIHJldHVybiBlbnZp cm9ubWVudAogCiAgICAgZGVmIF9jaGVja19kcml2ZXIoc2VsZik6CiAgICAgICAgIGRyaXZlcl9w YXRoID0gc2VsZi5fcGF0aF90b19kcml2ZXIoKQpAQCAtOTY0LDkgKzk2Myw5IEBAIGNsYXNzIFBv cnQob2JqZWN0KToKIAogICAgIEBzdGF0aWNtZXRob2QKICAgICBkZWYgX2FwcGVuZF92YWx1ZV9j b2xvbl9zZXBhcmF0ZWQoZW52LCBuYW1lLCB2YWx1ZSk6Ci0gICAgICAgIGFzc2VydCAiOiIgbm90 IGluIHZhbHVlCisgICAgICAgIGFzc2VydCBvcy5wYXRoc2VwIG5vdCBpbiB2YWx1ZQogICAgICAg ICBpZiBuYW1lIGluIGVudiBhbmQgZW52W25hbWVdOgotICAgICAgICAgICAgZW52W25hbWVdID0g ZW52W25hbWVdICsgIjoiICsgdmFsdWUKKyAgICAgICAgICAgIGVudltuYW1lXSA9IGVudltuYW1l XSArIG9zLnBhdGhzZXAgKyB2YWx1ZQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgZW52W25h bWVdID0gdmFsdWUKIAo=