205214 2019-12-13 11:55:04 -0800 Add an option to run_webkit_tests.py to enable all GPU process related features and choose the additional expectations 2019-12-13 17:20:55 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified NEW https://bugs.webkit.org/show_bug.cgi?id=205229 InRadar P2 Normal --- 1 peng.liu6 jbedard commit-queue ews-watchlist glenn jbedard thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1598427 0 peng.liu6 2019-12-13 11:55:04 -0800 Add an option to run_webkit_tests.py to enable all GPU process related features and choose the additional expectations 1598430 1 webkit-bug-importer 2019-12-13 11:57:20 -0800 <rdar://problem/57920116> 1598431 2 jbedard 2019-12-13 11:57:58 -0800 This option should also set the flavor of the result upload. 1598437 3 385628 peng.liu6 2019-12-13 12:06:20 -0800 Created attachment 385628 WIP 1598438 4 385628 jbedard 2019-12-13 12:11:49 -0800 Comment on attachment 385628 WIP View in context: https://bugs.webkit.org/attachment.cgi?id=385628&action=review > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:379 > + options.internal_feature.append('CaptureAudioInGPUProcessEnabled') Actually, we're only missing result-report-flavor....just adding: if options.result_report_flavor: raise RuntimeError('--gpu-process-features implicitly sets the result flavor, this should not be overridden') options.result_report_flavor = 'gpuprocess' 1598444 5 385628 thorton 2019-12-13 12:16:07 -0800 Comment on attachment 385628 WIP View in context: https://bugs.webkit.org/attachment.cgi?id=385628&action=review > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:328 > + "--gpu-process-features", action="store_true", default=False, IMO "--use-gpu-process" 1598463 6 385636 peng.liu6 2019-12-13 13:13:26 -0800 Created attachment 385636 Patch 1598464 7 385628 peng.liu6 2019-12-13 13:15:18 -0800 Comment on attachment 385628 WIP View in context: https://bugs.webkit.org/attachment.cgi?id=385628&action=review >> Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:328 >> + "--gpu-process-features", action="store_true", default=False, > > IMO "--use-gpu-process" Fixed. >> Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:379 >> + options.internal_feature.append('CaptureAudioInGPUProcessEnabled') > > Actually, we're only missing result-report-flavor....just adding: > > if options.result_report_flavor: > raise RuntimeError('--gpu-process-features implicitly sets the result flavor, this should not be overridden') > options.result_report_flavor = 'gpuprocess' Got it, thanks! 1598467 8 385636 thorton 2019-12-13 13:28:43 -0800 Comment on attachment 385636 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=385636&action=review > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:329 > + help=("Enable all GPU process related features. Equivalent to '--internal-feature=useGPUProcessForMedia --internal-feature=CaptureAudioInGPUProcessEnabled --additional-expectations=LayoutTests/gpu-process/TestExpectations'")), I wonder if we should avoid listing the --internal-features in the help here, because people are going to change the set, and probably not change this list. ALSO, you still have a lower-case u in "useGPUProcessForMedia" here. 1598476 9 385638 peng.liu6 2019-12-13 13:37:53 -0800 Created attachment 385638 Patch 1598477 10 385636 peng.liu6 2019-12-13 13:38:43 -0800 Comment on attachment 385636 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=385636&action=review >> Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:329 >> + help=("Enable all GPU process related features. Equivalent to '--internal-feature=useGPUProcessForMedia --internal-feature=CaptureAudioInGPUProcessEnabled --additional-expectations=LayoutTests/gpu-process/TestExpectations'")), > > I wonder if we should avoid listing the --internal-features in the help here, because people are going to change the set, and probably not change this list. ALSO, you still have a lower-case u in "useGPUProcessForMedia" here. Right! 1598565 11 385638 commit-queue 2019-12-13 17:20:55 -0800 Comment on attachment 385638 Patch Clearing flags on attachment: 385638 Committed r253512: <https://trac.webkit.org/changeset/253512> 385628 2019-12-13 12:06:20 -0800 2019-12-13 13:13:25 -0800 WIP bug-205214-20191213120619.patch text/plain 2579 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNDgzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmQ0MmI4MmIxY2ZkNThjZjc5MjMyMjhkMWRhZTJjYjFj NzA0Yzc4Yi4uMDAwZGE5ZTIzMDE5NmJlM2NmMDBhYTM5ZGJjZTQ1ZWQ1NjU1NzM2YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDE5LTEyLTEzICBQZW5nIExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAg ICAgQWRkIGFuIG9wdGlvbiB0byBydW5fd2Via2l0X3Rlc3RzLnB5IHRvIGVuYWJsZSBhbGwgR1BV IHByb2Nlc3MgcmVsYXRlZCBmZWF0dXJlcyBhbmQgY2hvb3NlIHRoZSBhZGRpdGlvbmFsIGV4cGVj dGF0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjA1MjE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorICAg ICAgICAocGFyc2VfYXJncyk6CisKIDIwMTktMTItMTMgIERldmluIFJvdXNzbyAgPGRyb3Vzc29A YXBwbGUuY29tPgogCiAgICAgICAgIFByZWZpeCBDU1Mgc2VsZWN0b3JzIHdpdGggYWxsIGFwcGxp Y2FibGUgQ1NTIGdyb3VwaW5ncyB3aGVuIGdlbmVyYXRpbmcgYSBDaGFuZ2VMb2cKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3Rz LnB5CmluZGV4IDE4NWQ4NGM1MmIxZjU4NDY1ZTAzYzA3MGUxNTlhZjQ0NThlZjVlODIuLjRhY2Fh YmY3YTkwMzk1MWI0NzNjYmUwOGU0OTU3NmIwNTcyOTA0YzEgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQpAQCAt MzI0LDYgKzMyNCw5IEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3MpOgogICAgICAgICBvcHRwYXJzZS5t YWtlX29wdGlvbigKICAgICAgICAgICAgICItLXdlYmdsLXRlc3Qtc3VpdGUiLCBhY3Rpb249InN0 b3JlX3RydWUiLCBkZWZhdWx0PUZhbHNlLAogICAgICAgICAgICAgaGVscD0oIlJ1biBleGhhdXN0 aXZlIHdlYmdsIGxpc3QsIGluY2x1ZGluZyB0ZXN0IG9yZGluYXJpbHkgc2tpcHBlZCBmb3IgcGVy Zm9ybWFuY2UgcmVhc29ucy4gRXF1aXZhbGVudCB0byAnLS1hZGRpdGlvbmFsLWV4cGVjdGF0aW9u cz1MYXlvdXRUZXN0cy93ZWJnbC9UZXN0RXhwZWN0YXRpb25zIHdlYmdsJyIpKSwKKyAgICAgICAg b3B0cGFyc2UubWFrZV9vcHRpb24oCisgICAgICAgICAgICAiLS1ncHUtcHJvY2Vzcy1mZWF0dXJl cyIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlZmF1bHQ9RmFsc2UsCisgICAgICAgICAgICBoZWxw PSgiRW5hYmxlIGFsbCBHUFUgcHJvY2VzcyByZWxhdGVkIGZlYXR1cmVzLiBFcXVpdmFsZW50IHRv ICctLWludGVybmFsLWZlYXR1cmU9dXNlR1BVUHJvY2Vzc0Zvck1lZGlhIC0taW50ZXJuYWwtZmVh dHVyZT1DYXB0dXJlQXVkaW9JbkdQVVByb2Nlc3NFbmFibGVkIC0tYWRkaXRpb25hbC1leHBlY3Rh dGlvbnM9TGF5b3V0VGVzdHMvZ3B1LXByb2Nlc3MvVGVzdEV4cGVjdGF0aW9ucyciKSksCiAgICAg XSkpCiAKICAgICBvcHRpb25fZ3JvdXBfZGVmaW5pdGlvbnMuYXBwZW5kKCgiV2ViIFBsYXRmb3Jt IFRlc3QgU2VydmVyIE9wdGlvbnMiLCBbCkBAIC0zNjUsNiArMzY4LDE2IEBAIGRlZiBwYXJzZV9h cmdzKGFyZ3MpOgogICAgICAgICBob3N0ID0gSG9zdCgpCiAgICAgICAgIGhvc3QuaW5pdGlhbGl6 ZV9zY20oKQogICAgICAgICBvcHRpb25zLmFkZGl0aW9uYWxfZXhwZWN0YXRpb25zLmluc2VydCgw LCBob3N0LmZpbGVzeXN0ZW0uam9pbihob3N0LnNjbSgpLmNoZWNrb3V0X3Jvb3QsICdMYXlvdXRU ZXN0cy93ZWJnbC9UZXN0RXhwZWN0YXRpb25zJykpCisKKyAgICBpZiBvcHRpb25zLmdwdV9wcm9j ZXNzX2ZlYXR1cmVzOgorICAgICAgICBob3N0ID0gSG9zdCgpCisgICAgICAgIGhvc3QuaW5pdGlh bGl6ZV9zY20oKQorICAgICAgICBvcHRpb25zLmFkZGl0aW9uYWxfZXhwZWN0YXRpb25zLmluc2Vy dCgwLCBob3N0LmZpbGVzeXN0ZW0uam9pbihob3N0LnNjbSgpLmNoZWNrb3V0X3Jvb3QsICdMYXlv dXRUZXN0cy9ncHUtcHJvY2Vzcy9UZXN0RXhwZWN0YXRpb25zJykpCisgICAgICAgIGlmIG5vdCBv cHRpb25zLmludGVybmFsX2ZlYXR1cmU6CisgICAgICAgICAgICBvcHRpb25zLmludGVybmFsX2Zl YXR1cmUgPSBbXQorICAgICAgICBvcHRpb25zLmludGVybmFsX2ZlYXR1cmUuYXBwZW5kKCd1c2VH UFVQcm9jZXNzRm9yTWVkaWEnKQorICAgICAgICBvcHRpb25zLmludGVybmFsX2ZlYXR1cmUuYXBw ZW5kKCdDYXB0dXJlQXVkaW9JbkdQVVByb2Nlc3NFbmFibGVkJykKKwogICAgIHJldHVybiBvcHRp b25zLCBhcmdzCiAKIAo= 385636 2019-12-13 13:13:26 -0800 2019-12-13 15:18:47 -0800 Patch bug-205214-20191213131325.patch text/plain 2845 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNDgzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmQ0MmI4MmIxY2ZkNThjZjc5MjMyMjhkMWRhZTJjYjFj NzA0Yzc4Yi4uYmE3MDdlNGJiNDJkYjk0MDhmOGEzZjBhODM2OTkzMjgxMzNiMjk2OSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE5LTEyLTEzICBQZW5nIExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAg ICAgQWRkIGFuIG9wdGlvbiB0byBydW5fd2Via2l0X3Rlc3RzLnB5IHRvIGVuYWJsZSBhbGwgR1BV IHByb2Nlc3MgcmVsYXRlZCBmZWF0dXJlcyBhbmQgY2hvb3NlIHRoZSBhZGRpdGlvbmFsIGV4cGVj dGF0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjA1MjE0CisKKyAgICAgICAgVGhlIG9wdGlvbiBhbHNvIHNwZWNpZmllcyB0aGUgcmVzdWx0LXJl cG9ydC1mbGF2b3IuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5 OgorICAgICAgICAocGFyc2VfYXJncyk6CisKIDIwMTktMTItMTMgIERldmluIFJvdXNzbyAgPGRy b3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFByZWZpeCBDU1Mgc2VsZWN0b3JzIHdpdGggYWxs IGFwcGxpY2FibGUgQ1NTIGdyb3VwaW5ncyB3aGVuIGdlbmVyYXRpbmcgYSBDaGFuZ2VMb2cKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRf dGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0 X3Rlc3RzLnB5CmluZGV4IDE4NWQ4NGM1MmIxZjU4NDY1ZTAzYzA3MGUxNTlhZjQ0NThlZjVlODIu LmY3ZDViYjk1ZDExODA4NTNhMjQ5MTYyMThhZmUyZGFhMzE2ZDJmMjggMTAwNzU1Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5w eQpAQCAtMzI0LDYgKzMyNCw5IEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3MpOgogICAgICAgICBvcHRw YXJzZS5tYWtlX29wdGlvbigKICAgICAgICAgICAgICItLXdlYmdsLXRlc3Qtc3VpdGUiLCBhY3Rp b249InN0b3JlX3RydWUiLCBkZWZhdWx0PUZhbHNlLAogICAgICAgICAgICAgaGVscD0oIlJ1biBl eGhhdXN0aXZlIHdlYmdsIGxpc3QsIGluY2x1ZGluZyB0ZXN0IG9yZGluYXJpbHkgc2tpcHBlZCBm b3IgcGVyZm9ybWFuY2UgcmVhc29ucy4gRXF1aXZhbGVudCB0byAnLS1hZGRpdGlvbmFsLWV4cGVj dGF0aW9ucz1MYXlvdXRUZXN0cy93ZWJnbC9UZXN0RXhwZWN0YXRpb25zIHdlYmdsJyIpKSwKKyAg ICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oCisgICAgICAgICAgICAiLS11c2UtZ3B1LXByb2Nl c3MiLCBhY3Rpb249InN0b3JlX3RydWUiLCBkZWZhdWx0PUZhbHNlLAorICAgICAgICAgICAgaGVs cD0oIkVuYWJsZSBhbGwgR1BVIHByb2Nlc3MgcmVsYXRlZCBmZWF0dXJlcy4gRXF1aXZhbGVudCB0 byAnLS1pbnRlcm5hbC1mZWF0dXJlPXVzZUdQVVByb2Nlc3NGb3JNZWRpYSAtLWludGVybmFsLWZl YXR1cmU9Q2FwdHVyZUF1ZGlvSW5HUFVQcm9jZXNzRW5hYmxlZCAtLWFkZGl0aW9uYWwtZXhwZWN0 YXRpb25zPUxheW91dFRlc3RzL2dwdS1wcm9jZXNzL1Rlc3RFeHBlY3RhdGlvbnMnIikpLAogICAg IF0pKQogCiAgICAgb3B0aW9uX2dyb3VwX2RlZmluaXRpb25zLmFwcGVuZCgoIldlYiBQbGF0Zm9y bSBUZXN0IFNlcnZlciBPcHRpb25zIiwgWwpAQCAtMzY1LDYgKzM2OCwxOSBAQCBkZWYgcGFyc2Vf YXJncyhhcmdzKToKICAgICAgICAgaG9zdCA9IEhvc3QoKQogICAgICAgICBob3N0LmluaXRpYWxp emVfc2NtKCkKICAgICAgICAgb3B0aW9ucy5hZGRpdGlvbmFsX2V4cGVjdGF0aW9ucy5pbnNlcnQo MCwgaG9zdC5maWxlc3lzdGVtLmpvaW4oaG9zdC5zY20oKS5jaGVja291dF9yb290LCAnTGF5b3V0 VGVzdHMvd2ViZ2wvVGVzdEV4cGVjdGF0aW9ucycpKQorCisgICAgaWYgb3B0aW9ucy51c2VfZ3B1 X3Byb2Nlc3M6CisgICAgICAgIGhvc3QgPSBIb3N0KCkKKyAgICAgICAgaG9zdC5pbml0aWFsaXpl X3NjbSgpCisgICAgICAgIG9wdGlvbnMuYWRkaXRpb25hbF9leHBlY3RhdGlvbnMuaW5zZXJ0KDAs IGhvc3QuZmlsZXN5c3RlbS5qb2luKGhvc3Quc2NtKCkuY2hlY2tvdXRfcm9vdCwgJ0xheW91dFRl c3RzL2dwdS1wcm9jZXNzL1Rlc3RFeHBlY3RhdGlvbnMnKSkKKyAgICAgICAgaWYgbm90IG9wdGlv bnMuaW50ZXJuYWxfZmVhdHVyZToKKyAgICAgICAgICAgIG9wdGlvbnMuaW50ZXJuYWxfZmVhdHVy ZSA9IFtdCisgICAgICAgIG9wdGlvbnMuaW50ZXJuYWxfZmVhdHVyZS5hcHBlbmQoJ1VzZUdQVVBy b2Nlc3NGb3JNZWRpYScpCisgICAgICAgIG9wdGlvbnMuaW50ZXJuYWxfZmVhdHVyZS5hcHBlbmQo J0NhcHR1cmVBdWRpb0luR1BVUHJvY2Vzc0VuYWJsZWQnKQorICAgICAgICBpZiBvcHRpb25zLnJl c3VsdF9yZXBvcnRfZmxhdm9yOgorICAgICAgICAgICAgcmFpc2UgUnVudGltZUVycm9yKCctLXVz ZS1ncHUtcHJvY2VzcyBpbXBsaWNpdGx5IHNldHMgdGhlIHJlc3VsdCBmbGF2b3IsIHRoaXMgc2hv dWxkIG5vdCBiZSBvdmVycmlkZGVuJykKKyAgICAgICAgb3B0aW9ucy5yZXN1bHRfcmVwb3J0X2Zs YXZvciA9ICdncHVwcm9jZXNzJworCiAgICAgcmV0dXJuIG9wdGlvbnMsIGFyZ3MKIAogCg== 385638 2019-12-13 13:37:53 -0800 2019-12-13 17:20:55 -0800 Patch bug-205214-20191213133753.patch text/plain 2729 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNDgzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmQ0MmI4MmIxY2ZkNThjZjc5MjMyMjhkMWRhZTJjYjFj NzA0Yzc4Yi4uNTljMmM1Njg3YjcyNzM3OTdlYjNjZGRjYTM1YzMyZTExMzdjYTIwYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE5LTEyLTEzICBQZW5nIExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAg ICAgQWRkIGFuIG9wdGlvbiB0byBydW5fd2Via2l0X3Rlc3RzLnB5IHRvIGVuYWJsZSBhbGwgR1BV IHByb2Nlc3MgcmVsYXRlZCBmZWF0dXJlcyBhbmQgY2hvb3NlIHRoZSBhZGRpdGlvbmFsIGV4cGVj dGF0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjA1MjE0CisKKyAgICAgICAgVGhlIG9wdGlvbiBhbHNvIHNwZWNpZmllcyB0aGUgcmVzdWx0LXJl cG9ydC1mbGF2b3IuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6Cisg ICAgICAgIChwYXJzZV9hcmdzKToKKwogMjAxOS0xMi0xMyAgRGV2aW4gUm91c3NvICA8ZHJvdXNz b0BhcHBsZS5jb20+CiAKICAgICAgICAgUHJlZml4IENTUyBzZWxlY3RvcnMgd2l0aCBhbGwgYXBw bGljYWJsZSBDU1MgZ3JvdXBpbmdzIHdoZW4gZ2VuZXJhdGluZyBhIENoYW5nZUxvZwpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0 cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVz dHMucHkKaW5kZXggMTg1ZDg0YzUyYjFmNTg0NjVlMDNjMDcwZTE1OWFmNDQ1OGVmNWU4Mi4uMjAx MzEzYTBhNDIzNjMyZWQwYTgwZTQ2MWI1N2IxZWQ4MGZjMTZiNyAxMDA3NTUKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CkBA IC0zMjQsNiArMzI0LDkgQEAgZGVmIHBhcnNlX2FyZ3MoYXJncyk6CiAgICAgICAgIG9wdHBhcnNl Lm1ha2Vfb3B0aW9uKAogICAgICAgICAgICAgIi0td2ViZ2wtdGVzdC1zdWl0ZSIsIGFjdGlvbj0i c3RvcmVfdHJ1ZSIsIGRlZmF1bHQ9RmFsc2UsCiAgICAgICAgICAgICBoZWxwPSgiUnVuIGV4aGF1 c3RpdmUgd2ViZ2wgbGlzdCwgaW5jbHVkaW5nIHRlc3Qgb3JkaW5hcmlseSBza2lwcGVkIGZvciBw ZXJmb3JtYW5jZSByZWFzb25zLiBFcXVpdmFsZW50IHRvICctLWFkZGl0aW9uYWwtZXhwZWN0YXRp b25zPUxheW91dFRlc3RzL3dlYmdsL1Rlc3RFeHBlY3RhdGlvbnMgd2ViZ2wnIikpLAorICAgICAg ICBvcHRwYXJzZS5tYWtlX29wdGlvbigKKyAgICAgICAgICAgICItLXVzZS1ncHUtcHJvY2VzcyIs IGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlZmF1bHQ9RmFsc2UsCisgICAgICAgICAgICBoZWxwPSgi RW5hYmxlIGFsbCBHUFUgcHJvY2VzcyByZWxhdGVkIGZlYXR1cmVzLCBhbHNvIHNldCBhZGRpdGlv bmFsIGV4cGVjdGF0aW9ucyBhbmQgdGhlIHJlc3VsdCByZXBvcnQgZmxhdm9yLiIpKSwKICAgICBd KSkKIAogICAgIG9wdGlvbl9ncm91cF9kZWZpbml0aW9ucy5hcHBlbmQoKCJXZWIgUGxhdGZvcm0g VGVzdCBTZXJ2ZXIgT3B0aW9ucyIsIFsKQEAgLTM2NSw2ICszNjgsMTkgQEAgZGVmIHBhcnNlX2Fy Z3MoYXJncyk6CiAgICAgICAgIGhvc3QgPSBIb3N0KCkKICAgICAgICAgaG9zdC5pbml0aWFsaXpl X3NjbSgpCiAgICAgICAgIG9wdGlvbnMuYWRkaXRpb25hbF9leHBlY3RhdGlvbnMuaW5zZXJ0KDAs IGhvc3QuZmlsZXN5c3RlbS5qb2luKGhvc3Quc2NtKCkuY2hlY2tvdXRfcm9vdCwgJ0xheW91dFRl c3RzL3dlYmdsL1Rlc3RFeHBlY3RhdGlvbnMnKSkKKworICAgIGlmIG9wdGlvbnMudXNlX2dwdV9w cm9jZXNzOgorICAgICAgICBob3N0ID0gSG9zdCgpCisgICAgICAgIGhvc3QuaW5pdGlhbGl6ZV9z Y20oKQorICAgICAgICBvcHRpb25zLmFkZGl0aW9uYWxfZXhwZWN0YXRpb25zLmluc2VydCgwLCBo b3N0LmZpbGVzeXN0ZW0uam9pbihob3N0LnNjbSgpLmNoZWNrb3V0X3Jvb3QsICdMYXlvdXRUZXN0 cy9ncHUtcHJvY2Vzcy9UZXN0RXhwZWN0YXRpb25zJykpCisgICAgICAgIGlmIG5vdCBvcHRpb25z LmludGVybmFsX2ZlYXR1cmU6CisgICAgICAgICAgICBvcHRpb25zLmludGVybmFsX2ZlYXR1cmUg PSBbXQorICAgICAgICBvcHRpb25zLmludGVybmFsX2ZlYXR1cmUuYXBwZW5kKCdVc2VHUFVQcm9j ZXNzRm9yTWVkaWEnKQorICAgICAgICBvcHRpb25zLmludGVybmFsX2ZlYXR1cmUuYXBwZW5kKCdD YXB0dXJlQXVkaW9JbkdQVVByb2Nlc3NFbmFibGVkJykKKyAgICAgICAgaWYgb3B0aW9ucy5yZXN1 bHRfcmVwb3J0X2ZsYXZvcjoKKyAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcignLS11c2Ut Z3B1LXByb2Nlc3MgaW1wbGljaXRseSBzZXRzIHRoZSByZXN1bHQgZmxhdm9yLCB0aGlzIHNob3Vs ZCBub3QgYmUgb3ZlcnJpZGRlbicpCisgICAgICAgIG9wdGlvbnMucmVzdWx0X3JlcG9ydF9mbGF2 b3IgPSAnZ3B1cHJvY2VzcycKKwogICAgIHJldHVybiBvcHRpb25zLCBhcmdzCiAKIAo=