229253 2021-08-18 14:56:32 -0700 Add a new option '--show-window' to run-webkit-tests 2021-10-25 17:46:34 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 232059 1 peng.liu6 peng.liu6 ap ews-watchlist glenn jbedard simon.fraser thorton webkit-bug-importer oldest_to_newest 1785233 0 peng.liu6 2021-08-18 14:56:32 -0700 Add a new option '--show-webview' to run-webkit-tests 1785242 1 435805 peng.liu6 2021-08-18 15:19:54 -0700 Created attachment 435805 Patch 1785245 2 435805 simon.fraser 2021-08-18 15:29:12 -0700 Comment on attachment 435805 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=435805&action=review > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:343 > + optparse.make_option('--show-window', action="store_true", default=False, help="If set, a window (with webview) will show up. Helpful for debugging some tests."), I think the help should say "Make the test runner window visible during testing" 1785253 3 435809 peng.liu6 2021-08-18 15:48:38 -0700 Created attachment 435809 Revise the patch based on Simon's comment 1785254 4 435805 peng.liu6 2021-08-18 15:50:14 -0700 Comment on attachment 435805 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=435805&action=review >> Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:343 >> + optparse.make_option('--show-window', action="store_true", default=False, help="If set, a window (with webview) will show up. Helpful for debugging some tests."), > > I think the help should say "Make the test runner window visible during testing" Fixed. Thanks! 1785257 5 435809 jbedard 2021-08-18 15:54:20 -0700 Comment on attachment 435809 Revise the patch based on Simon's comment View in context: https://bugs.webkit.org/attachment.cgi?id=435809&action=review > Tools/WebKitTestRunner/Options.cpp:169 > + optionList.append(Option("--show-window", "Show the WebView during test runs (for debugging)", handleOptionShowWebView)); Why add the new option here instead of just passing --show-webview in the options? If we wanted to keep the option and name aligned, when creating the option, we could do this: optparse.make_option('--show-window', '--show-webview', dest='show_webview', ...) which would make the option inside webkitpy 'show_webview', but the option '--show-window' with an alias '--show-webview' 1785260 6 435809 peng.liu6 2021-08-18 16:04:21 -0700 Comment on attachment 435809 Revise the patch based on Simon's comment View in context: https://bugs.webkit.org/attachment.cgi?id=435809&action=review >> Tools/WebKitTestRunner/Options.cpp:169 >> + optionList.append(Option("--show-window", "Show the WebView during test runs (for debugging)", handleOptionShowWebView)); > > Why add the new option here instead of just passing --show-webview in the options? If we wanted to keep the option and name aligned, when creating the option, we could do this: > > optparse.make_option('--show-window', '--show-webview', dest='show_webview', ...) > > which would make the option inside webkitpy 'show_webview', but the option '--show-window' with an alias '--show-webview' The original plan was to use `--show-window` instead of `--show-webview` in both run-webkit-tests and WebKitTestRunner , and Simon suggested to add an alias. 1785279 7 ap 2021-08-18 17:01:26 -0700 I don't have a string opinion about which name to use, but having two options with identical descriptions is super confusing. If you do this, please change the description to something like "DEPRECATED. Same as --show-window". 1785510 8 435880 peng.liu6 2021-08-19 10:27:54 -0700 Created attachment 435880 Revise the patch based on Alexey's comment 1785537 9 435889 peng.liu6 2021-08-19 11:41:36 -0700 Created attachment 435889 Fix build failures on the win bot 1786487 10 peng.liu6 2021-08-23 11:26:01 -0700 (In reply to Alexey Proskuryakov from comment #7) > I don't have a string opinion about which name to use, but having two > options with identical descriptions is super confusing. > > If you do this, please change the description to something like "DEPRECATED. > Same as --show-window". Agree! Fixed. 1786495 11 ews-feeder 2021-08-23 12:04:32 -0700 Committed r281461 (240840@main): <https://commits.webkit.org/240840@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 435889. 1786496 12 webkit-bug-importer 2021-08-23 12:05:22 -0700 <rdar://problem/82255475> 435805 2021-08-18 15:19:54 -0700 2021-08-19 15:29:55 -0700 Patch bug-229253-20210818151953.patch text/plain 3805 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMDkyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTJlZjUwYTA0MWRhMjBjN2JkZWNhODczNjViODQzZWNm MmExODMzOS4uNDI2MzY3MTY3OTEyNGU3YTkzNzk2M2RkMDAwMjcwY2JjYTkwNDU3YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDIxLTA4LTE4ICBQZW5nIExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAg ICAgQWRkIGEgbmV3IG9wdGlvbiAnLS1zaG93LXdpbmRvdycgdG8gcnVuLXdlYmtpdC10ZXN0cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MjUzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRoZSBu ZXcgb3B0aW9uIHNvIHRoYXQgd2UgY2FuIGxldCBXS1RSIHNob3cgYSB3aW5kb3cgd2l0aCB3ZWJ2 aWV3LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtp dF90ZXN0cy5weToKKyAgICAgICAgKHBhcnNlX2FyZ3MpOgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvcG9ydC9kcml2ZXIucHk6CisgICAgICAgIChEcml2ZXIuY21kX2xpbmUpOgorICAgICAg ICAqIFdlYktpdFRlc3RSdW5uZXIvT3B0aW9ucy5jcHA6CisgICAgICAgIChXVFI6Ok9wdGlvbnNI YW5kbGVyOjpPcHRpb25zSGFuZGxlcik6CisKIDIwMjEtMDgtMTYgIEFsZXggQ2hyaXN0ZW5zZW4g IDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBGaXggQ2F0YWx5c3QgVGVzdFdl YktpdEFQSSBidWlsZApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKaW5kZXggMTJiNmVlNjQ2N2NiZjFkMDJkNTkxNmEw YmVjMzNiYThjMDA4NWYyOS4uYjE1NGMwZDEyOGMzYWYwYmI0OWUyZjc4MDI4ZDFlNzExMGZkZTdh OCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dl YmtpdF90ZXN0cy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9y dW5fd2Via2l0X3Rlc3RzLnB5CkBAIC0zNDAsNiArMzQwLDcgQEAgZGVmIHBhcnNlX2FyZ3MoYXJn cyk6CiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKAogICAgICAgICAgICAgIi0tcHJlZmVy LWludGVncmF0ZWQtZ3B1IiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVmYXVsdD1GYWxzZSwKICAg ICAgICAgICAgIGhlbHA9KCJQcmVmZXIgdXNpbmcgdGhlIGxvd2VyLXBvd2VyIGludGVncmF0ZWQg R1BVIG9uIGEgZHVhbC1HUFUgc3lzdGVtLiBOb3RlIHRoYXQgb3RoZXIgcnVubmluZyBhcHBsaWNh dGlvbnMgYW5kIHRoZSB0ZXN0cyB0aGVtc2VsdmVzIGNhbiBvdmVycmlkZSB0aGlzIHJlcXVlc3Qu IikpLAorICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbignLS1zaG93LXdpbmRvdycsIGFjdGlv bj0ic3RvcmVfdHJ1ZSIsIGRlZmF1bHQ9RmFsc2UsIGhlbHA9IklmIHNldCwgYSB3aW5kb3cgKHdp dGggd2Vidmlldykgd2lsbCBzaG93IHVwLiBIZWxwZnVsIGZvciBkZWJ1Z2dpbmcgc29tZSB0ZXN0 cy4iKSwKICAgICBdKSkKIAogICAgIG9wdGlvbl9ncm91cF9kZWZpbml0aW9ucy5hcHBlbmQoKCJX ZWIgUGxhdGZvcm0gVGVzdCBTZXJ2ZXIgT3B0aW9ucyIsIFsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvZHJpdmVyLnB5CmluZGV4IGVlOTAzYTllYzMwNjE0ODQwYjdiZTZlODMwOGU4YjZlMWVhZjZk Y2MuLjBhMzNhOTZkNmU5YTg0OGExMWE3YTBkMjg0MWUzZWViMTM3NjY5ODcgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9wb3J0L2RyaXZlci5weQpAQCAtNTIzLDYgKzUyMyw4IEBAIGNsYXNzIERyaXZl cihvYmplY3QpOgogICAgICAgICAgICAgY21kLmFwcGVuZCgnLS1uby10aW1lb3V0JykKICAgICAg ICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCdzaG93X3RvdWNoZXMnKToKICAgICAgICAgICAg IGNtZC5hcHBlbmQoJy0tc2hvdy10b3VjaGVzJykKKyAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRf b3B0aW9uKCdzaG93X3dpbmRvdycpOgorICAgICAgICAgICAgY21kLmFwcGVuZCgnLS1zaG93LXdp bmRvdycpCiAgICAgICAgIGlmIHNlbGYuX3BvcnQuZ2V0X29wdGlvbignYWNjZXNzaWJpbGl0eV9p c29sYXRlZF90cmVlJyk6CiAgICAgICAgICAgICBjbWQuYXBwZW5kKCctLWFjY2Vzc2liaWxpdHkt aXNvbGF0ZWQtdHJlZScpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvT3B0 aW9ucy5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL09wdGlvbnMuY3BwCmluZGV4IDkwZWNl ODliZDExZjFhMGE5NzcxZjdlNTIyNmU4ODdhNzA4YTA3YmMuLjRlZWFkY2IzZjllN2FiZDkyMTE1 ODVlNWRhZWIzYWU2YzcxM2IzN2MgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv T3B0aW9ucy5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9PcHRpb25zLmNwcApAQCAt MTY2LDYgKzE2Niw3IEBAIE9wdGlvbnNIYW5kbGVyOjpPcHRpb25zSGFuZGxlcihPcHRpb25zJiBv KQogICAgIG9wdGlvbkxpc3QuYXBwZW5kKE9wdGlvbigiLS1hbGxvd2VkLWhvc3QiLCAiQWxsb3dz IGFjY2VzcyB0byB0aGUgc3BlY2lmaWVkIGhvc3QgZnJvbSB0ZXN0cy4iLCBoYW5kbGVPcHRpb25B bGxvd2VkSG9zdCwgdHJ1ZSkpOwogICAgIG9wdGlvbkxpc3QuYXBwZW5kKE9wdGlvbigiLS1hbGxv dy1hbnktY2VydGlmaWNhdGUtZm9yLWFsbG93ZWQtaG9zdHMiLCAiQWxsb3dzIGFueSBIVFRQUyBj ZXJ0aWZpY2F0ZSBmb3IgYW4gYWxsb3dlZCBob3N0LiIsIGhhbmRsZU9wdGlvbkFsbG93QW55SFRU UFNDZXJ0aWZpY2F0ZUZvckFsbG93ZWRIb3N0cykpOwogICAgIG9wdGlvbkxpc3QuYXBwZW5kKE9w dGlvbigiLS1zaG93LXdlYnZpZXciLCAiU2hvdyB0aGUgV2ViVmlldyBkdXJpbmcgdGVzdCBydW5z IChmb3IgZGVidWdnaW5nKSIsIGhhbmRsZU9wdGlvblNob3dXZWJWaWV3KSk7CisgICAgb3B0aW9u TGlzdC5hcHBlbmQoT3B0aW9uKCItLXNob3ctd2luZG93IiwgIlNob3cgdGhlIFdlYlZpZXcgZHVy aW5nIHRlc3QgcnVucyAoZm9yIGRlYnVnZ2luZykiLCBoYW5kbGVPcHRpb25TaG93V2ViVmlldykp OwogICAgIG9wdGlvbkxpc3QuYXBwZW5kKE9wdGlvbigiLS1zaG93LXRvdWNoZXMiLCAiU2hvdyB0 aGUgdG91Y2hlcyBkdXJpbmcgdGVzdCBydW5zIChmb3IgZGVidWdnaW5nKSIsIGhhbmRsZU9wdGlv blNob3dUb3VjaGVzKSk7CiAgICAgb3B0aW9uTGlzdC5hcHBlbmQoT3B0aW9uKCItLXdvcmxkLWxl YWtzIiwgIkNoZWNrIGZvciBsZWFrcyBvZiB3b3JsZCBvYmplY3RzIChjdXJyZW50bHksIGRvY3Vt ZW50cykiLCBoYW5kbGVPcHRpb25DaGVja0ZvcldvcmxkTGVha3MpKTsKICAgICBvcHRpb25MaXN0 LmFwcGVuZChPcHRpb24oIi0tbm8tZW5hYmxlLWFsbC1leHBlcmltZW50YWwtZmVhdHVyZXMiLCAi RG8gbm90IGVuYWJsZSBhbGwgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGJ5IGRlZmF1bHQiLCBoYW5k bGVPcHRpb25Ob0VuYWJsZUFsbEV4cGVyaW1lbnRhbEZlYXR1cmVzKSk7Cg== 435809 2021-08-18 15:48:38 -0700 2021-08-18 15:48:38 -0700 Revise the patch based on Simon's comment bug-229253-20210818154837.patch text/plain 3775 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMDkyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTJlZjUwYTA0MWRhMjBjN2JkZWNhODczNjViODQzZWNm MmExODMzOS4uN2FlZjM3NGE5ZDcwMGRkMGRhZTU1MmFkYTBhOWFmYzE4ZTFlMjdkMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDIxLTA4LTE4ICBQZW5nIExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAg ICAgQWRkIGEgbmV3IG9wdGlvbiAnLS1zaG93LXdpbmRvdycgdG8gcnVuLXdlYmtpdC10ZXN0cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MjUzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIEFkZCB0aGUgbmV3 IG9wdGlvbiBzbyB0aGF0IHdlIGNhbiBsZXQgV0tUUiBzaG93IGEgd2luZG93IHdpdGggd2Vidmll dy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRf dGVzdHMucHk6CisgICAgICAgIChwYXJzZV9hcmdzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3BvcnQvZHJpdmVyLnB5OgorICAgICAgICAoRHJpdmVyLmNtZF9saW5lKToKKyAgICAgICAg KiBXZWJLaXRUZXN0UnVubmVyL09wdGlvbnMuY3BwOgorICAgICAgICAoV1RSOjpPcHRpb25zSGFu ZGxlcjo6T3B0aW9uc0hhbmRsZXIpOgorCiAyMDIxLTA4LTE2ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IENhdGFseXN0IFRlc3RXZWJL aXRBUEkgYnVpbGQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4IDEyYjZlZTY0NjdjYmYxZDAyZDU5MTZhMGJl YzMzYmE4YzAwODVmMjkuLjZlMDhkMmU5MTdlNGQ2MGMzOWMyODY1Njk5MmJhNWQwZTg3ODk0NTQg MTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJr aXRfdGVzdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVu X3dlYmtpdF90ZXN0cy5weQpAQCAtMzQwLDYgKzM0MCw3IEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3Mp OgogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigKICAgICAgICAgICAgICItLXByZWZlci1p bnRlZ3JhdGVkLWdwdSIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlZmF1bHQ9RmFsc2UsCiAgICAg ICAgICAgICBoZWxwPSgiUHJlZmVyIHVzaW5nIHRoZSBsb3dlci1wb3dlciBpbnRlZ3JhdGVkIEdQ VSBvbiBhIGR1YWwtR1BVIHN5c3RlbS4gTm90ZSB0aGF0IG90aGVyIHJ1bm5pbmcgYXBwbGljYXRp b25zIGFuZCB0aGUgdGVzdHMgdGhlbXNlbHZlcyBjYW4gb3ZlcnJpZGUgdGhpcyByZXF1ZXN0LiIp KSwKKyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oJy0tc2hvdy13aW5kb3cnLCBhY3Rpb249 InN0b3JlX3RydWUiLCBkZWZhdWx0PUZhbHNlLCBoZWxwPSJNYWtlIHRoZSB0ZXN0IHJ1bm5lciB3 aW5kb3cgdmlzaWJsZSBkdXJpbmcgdGVzdGluZy4iKSwKICAgICBdKSkKIAogICAgIG9wdGlvbl9n cm91cF9kZWZpbml0aW9ucy5hcHBlbmQoKCJXZWIgUGxhdGZvcm0gVGVzdCBTZXJ2ZXIgT3B0aW9u cyIsIFsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CmluZGV4IGVlOTAzYTllYzMw NjE0ODQwYjdiZTZlODMwOGU4YjZlMWVhZjZkY2MuLjBhMzNhOTZkNmU5YTg0OGExMWE3YTBkMjg0 MWUzZWViMTM3NjY5ODcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9k cml2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weQpAQCAt NTIzLDYgKzUyMyw4IEBAIGNsYXNzIERyaXZlcihvYmplY3QpOgogICAgICAgICAgICAgY21kLmFw cGVuZCgnLS1uby10aW1lb3V0JykKICAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCdz aG93X3RvdWNoZXMnKToKICAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tc2hvdy10b3VjaGVzJykK KyAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCdzaG93X3dpbmRvdycpOgorICAgICAg ICAgICAgY21kLmFwcGVuZCgnLS1zaG93LXdpbmRvdycpCiAgICAgICAgIGlmIHNlbGYuX3BvcnQu Z2V0X29wdGlvbignYWNjZXNzaWJpbGl0eV9pc29sYXRlZF90cmVlJyk6CiAgICAgICAgICAgICBj bWQuYXBwZW5kKCctLWFjY2Vzc2liaWxpdHktaXNvbGF0ZWQtdHJlZScpCiAKZGlmZiAtLWdpdCBh L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvT3B0aW9ucy5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVu bmVyL09wdGlvbnMuY3BwCmluZGV4IDkwZWNlODliZDExZjFhMGE5NzcxZjdlNTIyNmU4ODdhNzA4 YTA3YmMuLjRlZWFkY2IzZjllN2FiZDkyMTE1ODVlNWRhZWIzYWU2YzcxM2IzN2MgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvT3B0aW9ucy5jcHAKKysrIGIvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9PcHRpb25zLmNwcApAQCAtMTY2LDYgKzE2Niw3IEBAIE9wdGlvbnNIYW5kbGVy OjpPcHRpb25zSGFuZGxlcihPcHRpb25zJiBvKQogICAgIG9wdGlvbkxpc3QuYXBwZW5kKE9wdGlv bigiLS1hbGxvd2VkLWhvc3QiLCAiQWxsb3dzIGFjY2VzcyB0byB0aGUgc3BlY2lmaWVkIGhvc3Qg ZnJvbSB0ZXN0cy4iLCBoYW5kbGVPcHRpb25BbGxvd2VkSG9zdCwgdHJ1ZSkpOwogICAgIG9wdGlv bkxpc3QuYXBwZW5kKE9wdGlvbigiLS1hbGxvdy1hbnktY2VydGlmaWNhdGUtZm9yLWFsbG93ZWQt aG9zdHMiLCAiQWxsb3dzIGFueSBIVFRQUyBjZXJ0aWZpY2F0ZSBmb3IgYW4gYWxsb3dlZCBob3N0 LiIsIGhhbmRsZU9wdGlvbkFsbG93QW55SFRUUFNDZXJ0aWZpY2F0ZUZvckFsbG93ZWRIb3N0cykp OwogICAgIG9wdGlvbkxpc3QuYXBwZW5kKE9wdGlvbigiLS1zaG93LXdlYnZpZXciLCAiU2hvdyB0 aGUgV2ViVmlldyBkdXJpbmcgdGVzdCBydW5zIChmb3IgZGVidWdnaW5nKSIsIGhhbmRsZU9wdGlv blNob3dXZWJWaWV3KSk7CisgICAgb3B0aW9uTGlzdC5hcHBlbmQoT3B0aW9uKCItLXNob3ctd2lu ZG93IiwgIlNob3cgdGhlIFdlYlZpZXcgZHVyaW5nIHRlc3QgcnVucyAoZm9yIGRlYnVnZ2luZyki LCBoYW5kbGVPcHRpb25TaG93V2ViVmlldykpOwogICAgIG9wdGlvbkxpc3QuYXBwZW5kKE9wdGlv bigiLS1zaG93LXRvdWNoZXMiLCAiU2hvdyB0aGUgdG91Y2hlcyBkdXJpbmcgdGVzdCBydW5zIChm b3IgZGVidWdnaW5nKSIsIGhhbmRsZU9wdGlvblNob3dUb3VjaGVzKSk7CiAgICAgb3B0aW9uTGlz dC5hcHBlbmQoT3B0aW9uKCItLXdvcmxkLWxlYWtzIiwgIkNoZWNrIGZvciBsZWFrcyBvZiB3b3Js ZCBvYmplY3RzIChjdXJyZW50bHksIGRvY3VtZW50cykiLCBoYW5kbGVPcHRpb25DaGVja0Zvcldv cmxkTGVha3MpKTsKICAgICBvcHRpb25MaXN0LmFwcGVuZChPcHRpb24oIi0tbm8tZW5hYmxlLWFs bC1leHBlcmltZW50YWwtZmVhdHVyZXMiLCAiRG8gbm90IGVuYWJsZSBhbGwgZXhwZXJpbWVudGFs IGZlYXR1cmVzIGJ5IGRlZmF1bHQiLCBoYW5kbGVPcHRpb25Ob0VuYWJsZUFsbEV4cGVyaW1lbnRh bEZlYXR1cmVzKSk7Cg== 435880 2021-08-19 10:27:54 -0700 2021-08-19 11:23:22 -0700 Revise the patch based on Alexey's comment bug-229253-20210819102753.patch text/plain 9530 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMDkyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTJlZjUwYTA0MWRhMjBjN2JkZWNhODczNjViODQzZWNm MmExODMzOS4uMTFlMzE4NjYwYWNkMzU3YjRhZDdjZmIyNGEzYmY2N2UyZjgxZmQxZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDIxLTA4LTE5ICBQZW5nIExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAg ICAgQWRkIGEgbmV3IG9wdGlvbiAnLS1zaG93LXdpbmRvdycgdG8gcnVuLXdlYmtpdC10ZXN0cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MjUzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIEFkZCB0aGUgbmV3 IG9wdGlvbiBzbyB0aGF0IHdlIGNhbiBsZXQgV0tUUiBzaG93IGEgd2luZG93IHdpdGggd2Vidmll dy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRf dGVzdHMucHk6CisgICAgICAgIChwYXJzZV9hcmdzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3BvcnQvZHJpdmVyLnB5OgorICAgICAgICAoRHJpdmVyLmNtZF9saW5lKToKKyAgICAgICAg KiBXZWJLaXRUZXN0UnVubmVyL09wdGlvbnMuY3BwOgorICAgICAgICAoV1RSOjpoYW5kbGVPcHRp b25TaG93V2luZG93KToKKyAgICAgICAgKFdUUjo6T3B0aW9uc0hhbmRsZXI6Ok9wdGlvbnNIYW5k bGVyKToKKyAgICAgICAgKFdUUjo6aGFuZGxlT3B0aW9uU2hvd1dlYlZpZXcpOiBEZWxldGVkLgor ICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMuY3BwOgorICAgICAgICAoV1RS OjpUZXN0T3B0aW9uczo6ZGVmYXVsdHMpOgorICAgICAgICAoV1RSOjpUZXN0T3B0aW9uczo6a2V5 VHlwZU1hcHBpbmcpOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMuaDoK KyAgICAgICAgKFdUUjo6VGVzdE9wdGlvbnM6OnNob3VsZFNob3dXaW5kb3cgY29uc3QpOgorICAg ICAgICAoV1RSOjpUZXN0T3B0aW9uczo6c2hvdWxkU2hvd1dlYlZpZXcgY29uc3QpOiBEZWxldGVk LgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2NvYS5t bToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OmZpbmlzaENyZWF0aW5nUGxhdGZvcm1X ZWJWaWV3KToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL21hYy9QbGF0Zm9ybVdlYlZpZXdN YWMubW06CisgICAgICAgIChXVFI6OlBsYXRmb3JtV2ViVmlldzo6UGxhdGZvcm1XZWJWaWV3KToK KwogMjAyMS0wOC0xNiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3Jn PgogCiAgICAgICAgIEZpeCBDYXRhbHlzdCBUZXN0V2ViS2l0QVBJIGJ1aWxkCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5w eQppbmRleCAxMmI2ZWU2NDY3Y2JmMWQwMmQ1OTE2YTBiZWMzM2JhOGMwMDg1ZjI5Li42ZTA4ZDJl OTE3ZTRkNjBjMzljMjg2NTY5OTJiYTVkMGU4Nzg5NDU0IDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKQEAgLTM0 MCw2ICszNDAsNyBAQCBkZWYgcGFyc2VfYXJncyhhcmdzKToKICAgICAgICAgb3B0cGFyc2UubWFr ZV9vcHRpb24oCiAgICAgICAgICAgICAiLS1wcmVmZXItaW50ZWdyYXRlZC1ncHUiLCBhY3Rpb249 InN0b3JlX3RydWUiLCBkZWZhdWx0PUZhbHNlLAogICAgICAgICAgICAgaGVscD0oIlByZWZlciB1 c2luZyB0aGUgbG93ZXItcG93ZXIgaW50ZWdyYXRlZCBHUFUgb24gYSBkdWFsLUdQVSBzeXN0ZW0u IE5vdGUgdGhhdCBvdGhlciBydW5uaW5nIGFwcGxpY2F0aW9ucyBhbmQgdGhlIHRlc3RzIHRoZW1z ZWx2ZXMgY2FuIG92ZXJyaWRlIHRoaXMgcmVxdWVzdC4iKSksCisgICAgICAgIG9wdHBhcnNlLm1h a2Vfb3B0aW9uKCctLXNob3ctd2luZG93JywgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVmYXVsdD1G YWxzZSwgaGVscD0iTWFrZSB0aGUgdGVzdCBydW5uZXIgd2luZG93IHZpc2libGUgZHVyaW5nIHRl c3RpbmcuIiksCiAgICAgXSkpCiAKICAgICBvcHRpb25fZ3JvdXBfZGVmaW5pdGlvbnMuYXBwZW5k KCgiV2ViIFBsYXRmb3JtIFRlc3QgU2VydmVyIE9wdGlvbnMiLCBbCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L2RyaXZlci5weQppbmRleCBlZTkwM2E5ZWMzMDYxNDg0MGI3YmU2ZTgzMDhlOGI2ZTFl YWY2ZGNjLi4wYTMzYTk2ZDZlOWE4NDhhMTFhN2EwZDI4NDFlM2VlYjEzNzY2OTg3IDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkKQEAgLTUyMyw2ICs1MjMsOCBAQCBjbGFzcyBE cml2ZXIob2JqZWN0KToKICAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tbm8tdGltZW91dCcpCiAg ICAgICAgIGlmIHNlbGYuX3BvcnQuZ2V0X29wdGlvbignc2hvd190b3VjaGVzJyk6CiAgICAgICAg ICAgICBjbWQuYXBwZW5kKCctLXNob3ctdG91Y2hlcycpCisgICAgICAgIGlmIHNlbGYuX3BvcnQu Z2V0X29wdGlvbignc2hvd193aW5kb3cnKToKKyAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tc2hv dy13aW5kb3cnKQogICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRpb24oJ2FjY2Vzc2liaWxp dHlfaXNvbGF0ZWRfdHJlZScpOgogICAgICAgICAgICAgY21kLmFwcGVuZCgnLS1hY2Nlc3NpYmls aXR5LWlzb2xhdGVkLXRyZWUnKQogCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVy L09wdGlvbnMuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9PcHRpb25zLmNwcAppbmRleCA5 MGVjZTg5YmQxMWYxYTBhOTc3MWY3ZTUyMjZlODg3YTcwOGEwN2JjLi5kNDVlNGIwN2E2ZTY0NzY5 OGJjY2JkODQyOTNkODFkODlhZTBlNjNhIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVu bmVyL09wdGlvbnMuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvT3B0aW9ucy5jcHAK QEAgLTc2LDkgKzc2LDkgQEAgc3RhdGljIGJvb2wgaGFuZGxlT3B0aW9uUmVtb3RlTGF5ZXJUcmVl KE9wdGlvbnMmIG9wdGlvbnMsIGNvbnN0IGNoYXIqLCBjb25zdCBjaGEKICAgICByZXR1cm4gdHJ1 ZTsKIH0KIAotc3RhdGljIGJvb2wgaGFuZGxlT3B0aW9uU2hvd1dlYlZpZXcoT3B0aW9ucyYgb3B0 aW9ucywgY29uc3QgY2hhciosIGNvbnN0IGNoYXIqKQorc3RhdGljIGJvb2wgaGFuZGxlT3B0aW9u U2hvd1dpbmRvdyhPcHRpb25zJiBvcHRpb25zLCBjb25zdCBjaGFyKiwgY29uc3QgY2hhciopCiB7 Ci0gICAgb3B0aW9ucy5mZWF0dXJlcy5ib29sVGVzdFJ1bm5lckZlYXR1cmVzLmluc2VydF9vcl9h c3NpZ24oInNob3VsZFNob3dXZWJWaWV3IiwgdHJ1ZSk7CisgICAgb3B0aW9ucy5mZWF0dXJlcy5i b29sVGVzdFJ1bm5lckZlYXR1cmVzLmluc2VydF9vcl9hc3NpZ24oInNob3VsZFNob3dXaW5kb3ci LCB0cnVlKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtMTY1LDcgKzE2NSw4IEBAIE9wdGlv bnNIYW5kbGVyOjpPcHRpb25zSGFuZGxlcihPcHRpb25zJiBvKQogICAgIG9wdGlvbkxpc3QuYXBw ZW5kKE9wdGlvbigiLS1yZW1vdGUtbGF5ZXItdHJlZSIsICJVc2UgcmVtb3RlIGxheWVyIHRyZWUu IiwgaGFuZGxlT3B0aW9uUmVtb3RlTGF5ZXJUcmVlKSk7CiAgICAgb3B0aW9uTGlzdC5hcHBlbmQo T3B0aW9uKCItLWFsbG93ZWQtaG9zdCIsICJBbGxvd3MgYWNjZXNzIHRvIHRoZSBzcGVjaWZpZWQg aG9zdCBmcm9tIHRlc3RzLiIsIGhhbmRsZU9wdGlvbkFsbG93ZWRIb3N0LCB0cnVlKSk7CiAgICAg b3B0aW9uTGlzdC5hcHBlbmQoT3B0aW9uKCItLWFsbG93LWFueS1jZXJ0aWZpY2F0ZS1mb3ItYWxs b3dlZC1ob3N0cyIsICJBbGxvd3MgYW55IEhUVFBTIGNlcnRpZmljYXRlIGZvciBhbiBhbGxvd2Vk IGhvc3QuIiwgaGFuZGxlT3B0aW9uQWxsb3dBbnlIVFRQU0NlcnRpZmljYXRlRm9yQWxsb3dlZEhv c3RzKSk7Ci0gICAgb3B0aW9uTGlzdC5hcHBlbmQoT3B0aW9uKCItLXNob3ctd2VidmlldyIsICJT aG93IHRoZSBXZWJWaWV3IGR1cmluZyB0ZXN0IHJ1bnMgKGZvciBkZWJ1Z2dpbmcpIiwgaGFuZGxl T3B0aW9uU2hvd1dlYlZpZXcpKTsKKyAgICBvcHRpb25MaXN0LmFwcGVuZChPcHRpb24oIi0tc2hv dy13ZWJ2aWV3IiwgIkRFUFJFQ0FURUQuIFNhbWUgYXMgLS1zaG93LXdpbmRvdyIsIGhhbmRsZU9w dGlvblNob3dXaW5kb3cpKTsKKyAgICBvcHRpb25MaXN0LmFwcGVuZChPcHRpb24oIi0tc2hvdy13 aW5kb3ciLCAiTWFrZSB0aGUgdGVzdCBydW5uZXIgd2luZG93IHZpc2libGUgZHVyaW5nIHRlc3Rp bmciLCBoYW5kbGVPcHRpb25TaG93V2luZG93KSk7CiAgICAgb3B0aW9uTGlzdC5hcHBlbmQoT3B0 aW9uKCItLXNob3ctdG91Y2hlcyIsICJTaG93IHRoZSB0b3VjaGVzIGR1cmluZyB0ZXN0IHJ1bnMg KGZvciBkZWJ1Z2dpbmcpIiwgaGFuZGxlT3B0aW9uU2hvd1RvdWNoZXMpKTsKICAgICBvcHRpb25M aXN0LmFwcGVuZChPcHRpb24oIi0td29ybGQtbGVha3MiLCAiQ2hlY2sgZm9yIGxlYWtzIG9mIHdv cmxkIG9iamVjdHMgKGN1cnJlbnRseSwgZG9jdW1lbnRzKSIsIGhhbmRsZU9wdGlvbkNoZWNrRm9y V29ybGRMZWFrcykpOwogICAgIG9wdGlvbkxpc3QuYXBwZW5kKE9wdGlvbigiLS1uby1lbmFibGUt YWxsLWV4cGVyaW1lbnRhbC1mZWF0dXJlcyIsICJEbyBub3QgZW5hYmxlIGFsbCBleHBlcmltZW50 YWwgZmVhdHVyZXMgYnkgZGVmYXVsdCIsIGhhbmRsZU9wdGlvbk5vRW5hYmxlQWxsRXhwZXJpbWVu dGFsRmVhdHVyZXMpKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdE9w dGlvbnMuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0T3B0aW9ucy5jcHAKaW5kZXgg MjEyNmYzY2I5Njc1MGU5MjA2ODJmOTgwNTk3ODdjOTE0ZGQzMWZiNy4uMzg2NzY1ZTlkZTY1NzU0 M2U0MDZkZDI5YTA0MDQzZTkzNzQxOTljNSAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9UZXN0T3B0aW9ucy5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0T3B0 aW9ucy5jcHAKQEAgLTE0OCw3ICsxNDgsNyBAQCBjb25zdCBUZXN0RmVhdHVyZXMmIFRlc3RPcHRp b25zOjpkZWZhdWx0cygpCiAgICAgICAgICAgICB7ICJzaG91bGRIYW5kbGVSdW5PcGVuUGFuZWwi LCB0cnVlIH0sCiAgICAgICAgICAgICB7ICJzaG91bGRQcmVzZW50UG9wb3ZlcnMiLCB0cnVlIH0s CiAgICAgICAgICAgICB7ICJzaG91bGRTaG93VG91Y2hlcyIsIGZhbHNlIH0sCi0gICAgICAgICAg ICB7ICJzaG91bGRTaG93V2ViVmlldyIsIGZhbHNlIH0sCisgICAgICAgICAgICB7ICJzaG91bGRT aG93V2luZG93IiwgZmFsc2UgfSwKICAgICAgICAgICAgIHsgInNwZWxsQ2hlY2tpbmdEb3RzIiwg ZmFsc2UgfSwKICAgICAgICAgICAgIHsgInRleHRJbnRlcmFjdGlvbkVuYWJsZWQiLCB0cnVlIH0s CiAgICAgICAgICAgICB7ICJ1c2VDaGFyYWN0ZXJTZWxlY3Rpb25HcmFudWxhcml0eSIsIGZhbHNl IH0sCkBAIC0yMDIsNyArMjAyLDcgQEAgY29uc3Qgc3RkOjp1bm9yZGVyZWRfbWFwPHN0ZDo6c3Ry aW5nLCBUZXN0SGVhZGVyS2V5VHlwZT4mIFRlc3RPcHRpb25zOjprZXlUeXBlTWEKICAgICAgICAg eyAic2hvdWxkSGFuZGxlUnVuT3BlblBhbmVsIiwgVGVzdEhlYWRlcktleVR5cGU6OkJvb2xUZXN0 UnVubmVyIH0sCiAgICAgICAgIHsgInNob3VsZFByZXNlbnRQb3BvdmVycyIsIFRlc3RIZWFkZXJL ZXlUeXBlOjpCb29sVGVzdFJ1bm5lciB9LAogICAgICAgICB7ICJzaG91bGRTaG93VG91Y2hlcyIs IFRlc3RIZWFkZXJLZXlUeXBlOjpCb29sVGVzdFJ1bm5lciB9LAotICAgICAgICB7ICJzaG91bGRT aG93V2ViVmlldyIsIFRlc3RIZWFkZXJLZXlUeXBlOjpCb29sVGVzdFJ1bm5lciB9LAorICAgICAg ICB7ICJzaG91bGRTaG93V2luZG93IiwgVGVzdEhlYWRlcktleVR5cGU6OkJvb2xUZXN0UnVubmVy IH0sCiAgICAgICAgIHsgInNwZWxsQ2hlY2tpbmdEb3RzIiwgVGVzdEhlYWRlcktleVR5cGU6OkJv b2xUZXN0UnVubmVyIH0sCiAgICAgICAgIHsgInRleHRJbnRlcmFjdGlvbkVuYWJsZWQiLCBUZXN0 SGVhZGVyS2V5VHlwZTo6Qm9vbFRlc3RSdW5uZXIgfSwKICAgICAgICAgeyAidXNlQ2hhcmFjdGVy U2VsZWN0aW9uR3JhbnVsYXJpdHkiLCBUZXN0SGVhZGVyS2V5VHlwZTo6Qm9vbFRlc3RSdW5uZXIg fSwKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMuaCBiL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMuaAppbmRleCA1MGQwYWQ4ODMyNDBhNmJm YjdlNTdmODIyMzkzOTNhMjM3YWRmNDYzLi5lYzA2NDYwYWIwMjgwNTllYjc3NDBjZWZlZTkzNjc2 NTdiZGQ3ZDhjIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RPcHRpb25z LmgKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0T3B0aW9ucy5oCkBAIC02NSw3ICs2 NSw3IEBAIHB1YmxpYzoKICAgICBib29sIHNob3VsZFByZXNlbnRQb3BvdmVycygpIGNvbnN0IHsg cmV0dXJuIGJvb2xUZXN0UnVubmVyRmVhdHVyZVZhbHVlKCJzaG91bGRQcmVzZW50UG9wb3ZlcnMi KTsgfQogICAgIGJvb2wgc2hvdWxkU2hvd1NwZWxsQ2hlY2tpbmdEb3RzKCkgY29uc3QgeyByZXR1 cm4gYm9vbFRlc3RSdW5uZXJGZWF0dXJlVmFsdWUoInNwZWxsQ2hlY2tpbmdEb3RzIik7IH0KICAg ICBib29sIHNob3VsZFNob3dUb3VjaGVzKCkgY29uc3QgeyByZXR1cm4gYm9vbFRlc3RSdW5uZXJG ZWF0dXJlVmFsdWUoInNob3VsZFNob3dUb3VjaGVzIik7IH0KLSAgICBib29sIHNob3VsZFNob3dX ZWJWaWV3KCkgY29uc3QgeyByZXR1cm4gYm9vbFRlc3RSdW5uZXJGZWF0dXJlVmFsdWUoInNob3Vs ZFNob3dXZWJWaWV3Iik7IH0KKyAgICBib29sIHNob3VsZFNob3dXaW5kb3coKSBjb25zdCB7IHJl dHVybiBib29sVGVzdFJ1bm5lckZlYXR1cmVWYWx1ZSgic2hvdWxkU2hvd1dpbmRvdyIpOyB9CiAg ICAgYm9vbCB0ZXh0SW50ZXJhY3Rpb25FbmFibGVkKCkgY29uc3QgeyByZXR1cm4gYm9vbFRlc3RS dW5uZXJGZWF0dXJlVmFsdWUoInRleHRJbnRlcmFjdGlvbkVuYWJsZWQiKTsgfQogICAgIGJvb2wg dXNlQ2hhcmFjdGVyU2VsZWN0aW9uR3JhbnVsYXJpdHkoKSBjb25zdCB7IHJldHVybiBib29sVGVz dFJ1bm5lckZlYXR1cmVWYWx1ZSgidXNlQ2hhcmFjdGVyU2VsZWN0aW9uR3JhbnVsYXJpdHkiKTsg fQogICAgIGJvb2wgdXNlRGF0YURldGVjdGlvbigpIGNvbnN0IHsgcmV0dXJuIGJvb2xUZXN0UnVu bmVyRmVhdHVyZVZhbHVlKCJ1c2VEYXRhRGV0ZWN0aW9uIik7IH0KZGlmZiAtLWdpdCBhL1Rvb2xz L1dlYktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2NvYS5tbSBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2NvYS5tbQppbmRleCAxZDg1ZDJh ZGZlMDEyNTVlMzkyZGE4NzM2NmJhY2ZkODY5NGMxNTYwLi5iYTE1ZTk1ODdlY2Q4MmMyZTZkM2Rm YTY3ZTA4MTNlY2MwNTcwYTBlIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2Nv Y29hL1Rlc3RDb250cm9sbGVyQ29jb2EubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9j b2NvYS9UZXN0Q29udHJvbGxlckNvY29hLm1tCkBAIC0yMTcsNyArMjE3LDcgQEAgUGxhdGZvcm1X ZWJWaWV3KiBUZXN0Q29udHJvbGxlcjo6cGxhdGZvcm1DcmVhdGVPdGhlclBhZ2UoUGxhdGZvcm1X ZWJWaWV3KiBwYXJlbnQKIHZvaWQgVGVzdENvbnRyb2xsZXI6OmZpbmlzaENyZWF0aW5nUGxhdGZv cm1XZWJWaWV3KFBsYXRmb3JtV2ViVmlldyogdmlldywgY29uc3QgVGVzdE9wdGlvbnMmIG9wdGlv bnMpCiB7CiAjaWYgUExBVEZPUk0oTUFDKQotICAgIGlmIChvcHRpb25zLnNob3VsZFNob3dXZWJW aWV3KCkpCisgICAgaWYgKG9wdGlvbnMuc2hvdWxkU2hvd1dpbmRvdygpKQogICAgICAgICBbdmll dy0+cGxhdGZvcm1XaW5kb3coKSBvcmRlckZyb250Om5pbF07CiAgICAgZWxzZQogICAgICAgICBb dmlldy0+cGxhdGZvcm1XaW5kb3coKSBvcmRlckJhY2s6bmlsXTsKZGlmZiAtLWdpdCBhL1Rvb2xz L1dlYktpdFRlc3RSdW5uZXIvbWFjL1BsYXRmb3JtV2ViVmlld01hYy5tbSBiL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvbWFjL1BsYXRmb3JtV2ViVmlld01hYy5tbQppbmRleCAzZDJhNjgxMDIxMDRl MjMyY2U5ZDk0N2RhZmYzZWIyZWQwOGE4YWI3Li5mNzdkMTM5YzllNjhjODA0ZDc4ZjVhNjRlMzE1 MjZjNGNkODQyNzM1IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL21hYy9QbGF0 Zm9ybVdlYlZpZXdNYWMubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9tYWMvUGxhdGZv cm1XZWJWaWV3TWFjLm1tCkBAIC03Myw3ICs3Myw3IEBAIFBsYXRmb3JtV2ViVmlldzo6UGxhdGZv cm1XZWJWaWV3KFdLV2ViVmlld0NvbmZpZ3VyYXRpb24qIGNvbmZpZ3VyYXRpb24sIGNvbnN0IFRl CiAgICAgW21fdmlldyBfc2V0V2luZG93T2NjbHVzaW9uRGV0ZWN0aW9uRW5hYmxlZDpOT107CiAK ICAgICBOU1NjcmVlbiAqZmlyc3RTY3JlZW4gPSBbW05TU2NyZWVuIHNjcmVlbnNdIG9iamVjdEF0 SW5kZXg6MF07Ci0gICAgTlNSZWN0IHdpbmRvd1JlY3QgPSBtX29wdGlvbnMuc2hvdWxkU2hvd1dl YlZpZXcoKSA/IE5TT2Zmc2V0UmVjdChyZWN0LCAxMDAsIDEwMCkgOiBOU09mZnNldFJlY3QocmVj dCwgLTEwMDAwLCBbZmlyc3RTY3JlZW4gZnJhbWVdLnNpemUuaGVpZ2h0IC0gcmVjdC5zaXplLmhl aWdodCArIDEwMDAwKTsKKyAgICBOU1JlY3Qgd2luZG93UmVjdCA9IG1fb3B0aW9ucy5zaG91bGRT aG93V2luZG93KCkgPyBOU09mZnNldFJlY3QocmVjdCwgMTAwLCAxMDApIDogTlNPZmZzZXRSZWN0 KHJlY3QsIC0xMDAwMCwgW2ZpcnN0U2NyZWVuIGZyYW1lXS5zaXplLmhlaWdodCAtIHJlY3Quc2l6 ZS5oZWlnaHQgKyAxMDAwMCk7CiAgICAgbV93aW5kb3cgPSBbW1dlYktpdFRlc3RSdW5uZXJXaW5k b3cgYWxsb2NdIGluaXRXaXRoQ29udGVudFJlY3Q6d2luZG93UmVjdCBzdHlsZU1hc2s6TlNXaW5k b3dTdHlsZU1hc2tCb3JkZXJsZXNzIGJhY2tpbmc6KE5TQmFja2luZ1N0b3JlVHlwZSlfTlNCYWNr aW5nU3RvcmVVbmJ1ZmZlcmVkIGRlZmVyOllFU107CiAgICAgbV93aW5kb3cucGxhdGZvcm1XZWJW aWV3ID0gdGhpczsKICAgICBbbV93aW5kb3cgc2V0Q29sb3JTcGFjZTpbZmlyc3RTY3JlZW4gY29s b3JTcGFjZV1dOwo= 435889 2021-08-19 11:41:36 -0700 2021-08-23 12:04:33 -0700 Fix build failures on the win bot bug-229253-20210819114135.patch text/plain 10336 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMDkyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTJlZjUwYTA0MWRhMjBjN2JkZWNhODczNjViODQzZWNm MmExODMzOS4uZjM1MGFmNmFhZDM1NmE1NmVjMWFiNTNjNzI2MmQyN2JmYzYzZDI3MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMz IEBACisyMDIxLTA4LTE5ICBQZW5nIExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAg ICAgQWRkIGEgbmV3IG9wdGlvbiAnLS1zaG93LXdpbmRvdycgdG8gcnVuLXdlYmtpdC10ZXN0cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MjUzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIEFkZCB0aGUgbmV3 IG9wdGlvbiBzbyB0aGF0IHdlIGNhbiBsZXQgV0tUUiBzaG93IGEgd2luZG93IHdpdGggd2Vidmll dy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRf dGVzdHMucHk6CisgICAgICAgIChwYXJzZV9hcmdzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3BvcnQvZHJpdmVyLnB5OgorICAgICAgICAoRHJpdmVyLmNtZF9saW5lKToKKyAgICAgICAg KiBXZWJLaXRUZXN0UnVubmVyL09wdGlvbnMuY3BwOgorICAgICAgICAoV1RSOjpoYW5kbGVPcHRp b25TaG93V2luZG93KToKKyAgICAgICAgKFdUUjo6T3B0aW9uc0hhbmRsZXI6Ok9wdGlvbnNIYW5k bGVyKToKKyAgICAgICAgKFdUUjo6aGFuZGxlT3B0aW9uU2hvd1dlYlZpZXcpOiBEZWxldGVkLgor ICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMuY3BwOgorICAgICAgICAoV1RS OjpUZXN0T3B0aW9uczo6ZGVmYXVsdHMpOgorICAgICAgICAoV1RSOjpUZXN0T3B0aW9uczo6a2V5 VHlwZU1hcHBpbmcpOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMuaDoK KyAgICAgICAgKFdUUjo6VGVzdE9wdGlvbnM6OnNob3VsZFNob3dXaW5kb3cgY29uc3QpOgorICAg ICAgICAoV1RSOjpUZXN0T3B0aW9uczo6c2hvdWxkU2hvd1dlYlZpZXcgY29uc3QpOiBEZWxldGVk LgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2NvYS5t bToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OmZpbmlzaENyZWF0aW5nUGxhdGZvcm1X ZWJWaWV3KToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL21hYy9QbGF0Zm9ybVdlYlZpZXdN YWMubW06CisgICAgICAgIChXVFI6OlBsYXRmb3JtV2ViVmlldzo6UGxhdGZvcm1XZWJWaWV3KToK KyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL3dpbi9QbGF0Zm9ybVdlYlZpZXdXaW4uY3BwOgor ICAgICAgICAoV1RSOjpQbGF0Zm9ybVdlYlZpZXc6OnNldFdpbmRvd0ZyYW1lKToKKwogMjAyMS0w OC0xNiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAg ICAgIEZpeCBDYXRhbHlzdCBUZXN0V2ViS2l0QVBJIGJ1aWxkCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQppbmRleCAx MmI2ZWU2NDY3Y2JmMWQwMmQ1OTE2YTBiZWMzM2JhOGMwMDg1ZjI5Li42ZTA4ZDJlOTE3ZTRkNjBj MzljMjg2NTY5OTJiYTVkMGU4Nzg5NDU0IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKQEAgLTM0MCw2ICszNDAs NyBAQCBkZWYgcGFyc2VfYXJncyhhcmdzKToKICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24o CiAgICAgICAgICAgICAiLS1wcmVmZXItaW50ZWdyYXRlZC1ncHUiLCBhY3Rpb249InN0b3JlX3Ry dWUiLCBkZWZhdWx0PUZhbHNlLAogICAgICAgICAgICAgaGVscD0oIlByZWZlciB1c2luZyB0aGUg bG93ZXItcG93ZXIgaW50ZWdyYXRlZCBHUFUgb24gYSBkdWFsLUdQVSBzeXN0ZW0uIE5vdGUgdGhh dCBvdGhlciBydW5uaW5nIGFwcGxpY2F0aW9ucyBhbmQgdGhlIHRlc3RzIHRoZW1zZWx2ZXMgY2Fu IG92ZXJyaWRlIHRoaXMgcmVxdWVzdC4iKSksCisgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9u KCctLXNob3ctd2luZG93JywgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVmYXVsdD1GYWxzZSwgaGVs cD0iTWFrZSB0aGUgdGVzdCBydW5uZXIgd2luZG93IHZpc2libGUgZHVyaW5nIHRlc3RpbmcuIiks CiAgICAgXSkpCiAKICAgICBvcHRpb25fZ3JvdXBfZGVmaW5pdGlvbnMuYXBwZW5kKCgiV2ViIFBs YXRmb3JtIFRlc3QgU2VydmVyIE9wdGlvbnMiLCBbCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Ry aXZlci5weQppbmRleCBlZTkwM2E5ZWMzMDYxNDg0MGI3YmU2ZTgzMDhlOGI2ZTFlYWY2ZGNjLi4w YTMzYTk2ZDZlOWE4NDhhMTFhN2EwZDI4NDFlM2VlYjEzNzY2OTg3IDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC9kcml2ZXIucHkKQEAgLTUyMyw2ICs1MjMsOCBAQCBjbGFzcyBEcml2ZXIob2Jq ZWN0KToKICAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tbm8tdGltZW91dCcpCiAgICAgICAgIGlm IHNlbGYuX3BvcnQuZ2V0X29wdGlvbignc2hvd190b3VjaGVzJyk6CiAgICAgICAgICAgICBjbWQu YXBwZW5kKCctLXNob3ctdG91Y2hlcycpCisgICAgICAgIGlmIHNlbGYuX3BvcnQuZ2V0X29wdGlv bignc2hvd193aW5kb3cnKToKKyAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tc2hvdy13aW5kb3cn KQogICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRpb24oJ2FjY2Vzc2liaWxpdHlfaXNvbGF0 ZWRfdHJlZScpOgogICAgICAgICAgICAgY21kLmFwcGVuZCgnLS1hY2Nlc3NpYmlsaXR5LWlzb2xh dGVkLXRyZWUnKQogCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL09wdGlvbnMu Y3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9PcHRpb25zLmNwcAppbmRleCA5MGVjZTg5YmQx MWYxYTBhOTc3MWY3ZTUyMjZlODg3YTcwOGEwN2JjLi5kNDVlNGIwN2E2ZTY0NzY5OGJjY2JkODQy OTNkODFkODlhZTBlNjNhIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL09wdGlv bnMuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvT3B0aW9ucy5jcHAKQEAgLTc2LDkg Kzc2LDkgQEAgc3RhdGljIGJvb2wgaGFuZGxlT3B0aW9uUmVtb3RlTGF5ZXJUcmVlKE9wdGlvbnMm IG9wdGlvbnMsIGNvbnN0IGNoYXIqLCBjb25zdCBjaGEKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAot c3RhdGljIGJvb2wgaGFuZGxlT3B0aW9uU2hvd1dlYlZpZXcoT3B0aW9ucyYgb3B0aW9ucywgY29u c3QgY2hhciosIGNvbnN0IGNoYXIqKQorc3RhdGljIGJvb2wgaGFuZGxlT3B0aW9uU2hvd1dpbmRv dyhPcHRpb25zJiBvcHRpb25zLCBjb25zdCBjaGFyKiwgY29uc3QgY2hhciopCiB7Ci0gICAgb3B0 aW9ucy5mZWF0dXJlcy5ib29sVGVzdFJ1bm5lckZlYXR1cmVzLmluc2VydF9vcl9hc3NpZ24oInNo b3VsZFNob3dXZWJWaWV3IiwgdHJ1ZSk7CisgICAgb3B0aW9ucy5mZWF0dXJlcy5ib29sVGVzdFJ1 bm5lckZlYXR1cmVzLmluc2VydF9vcl9hc3NpZ24oInNob3VsZFNob3dXaW5kb3ciLCB0cnVlKTsK ICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtMTY1LDcgKzE2NSw4IEBAIE9wdGlvbnNIYW5kbGVy OjpPcHRpb25zSGFuZGxlcihPcHRpb25zJiBvKQogICAgIG9wdGlvbkxpc3QuYXBwZW5kKE9wdGlv bigiLS1yZW1vdGUtbGF5ZXItdHJlZSIsICJVc2UgcmVtb3RlIGxheWVyIHRyZWUuIiwgaGFuZGxl T3B0aW9uUmVtb3RlTGF5ZXJUcmVlKSk7CiAgICAgb3B0aW9uTGlzdC5hcHBlbmQoT3B0aW9uKCIt LWFsbG93ZWQtaG9zdCIsICJBbGxvd3MgYWNjZXNzIHRvIHRoZSBzcGVjaWZpZWQgaG9zdCBmcm9t IHRlc3RzLiIsIGhhbmRsZU9wdGlvbkFsbG93ZWRIb3N0LCB0cnVlKSk7CiAgICAgb3B0aW9uTGlz dC5hcHBlbmQoT3B0aW9uKCItLWFsbG93LWFueS1jZXJ0aWZpY2F0ZS1mb3ItYWxsb3dlZC1ob3N0 cyIsICJBbGxvd3MgYW55IEhUVFBTIGNlcnRpZmljYXRlIGZvciBhbiBhbGxvd2VkIGhvc3QuIiwg aGFuZGxlT3B0aW9uQWxsb3dBbnlIVFRQU0NlcnRpZmljYXRlRm9yQWxsb3dlZEhvc3RzKSk7Ci0g ICAgb3B0aW9uTGlzdC5hcHBlbmQoT3B0aW9uKCItLXNob3ctd2VidmlldyIsICJTaG93IHRoZSBX ZWJWaWV3IGR1cmluZyB0ZXN0IHJ1bnMgKGZvciBkZWJ1Z2dpbmcpIiwgaGFuZGxlT3B0aW9uU2hv d1dlYlZpZXcpKTsKKyAgICBvcHRpb25MaXN0LmFwcGVuZChPcHRpb24oIi0tc2hvdy13ZWJ2aWV3 IiwgIkRFUFJFQ0FURUQuIFNhbWUgYXMgLS1zaG93LXdpbmRvdyIsIGhhbmRsZU9wdGlvblNob3dX aW5kb3cpKTsKKyAgICBvcHRpb25MaXN0LmFwcGVuZChPcHRpb24oIi0tc2hvdy13aW5kb3ciLCAi TWFrZSB0aGUgdGVzdCBydW5uZXIgd2luZG93IHZpc2libGUgZHVyaW5nIHRlc3RpbmciLCBoYW5k bGVPcHRpb25TaG93V2luZG93KSk7CiAgICAgb3B0aW9uTGlzdC5hcHBlbmQoT3B0aW9uKCItLXNo b3ctdG91Y2hlcyIsICJTaG93IHRoZSB0b3VjaGVzIGR1cmluZyB0ZXN0IHJ1bnMgKGZvciBkZWJ1 Z2dpbmcpIiwgaGFuZGxlT3B0aW9uU2hvd1RvdWNoZXMpKTsKICAgICBvcHRpb25MaXN0LmFwcGVu ZChPcHRpb24oIi0td29ybGQtbGVha3MiLCAiQ2hlY2sgZm9yIGxlYWtzIG9mIHdvcmxkIG9iamVj dHMgKGN1cnJlbnRseSwgZG9jdW1lbnRzKSIsIGhhbmRsZU9wdGlvbkNoZWNrRm9yV29ybGRMZWFr cykpOwogICAgIG9wdGlvbkxpc3QuYXBwZW5kKE9wdGlvbigiLS1uby1lbmFibGUtYWxsLWV4cGVy aW1lbnRhbC1mZWF0dXJlcyIsICJEbyBub3QgZW5hYmxlIGFsbCBleHBlcmltZW50YWwgZmVhdHVy ZXMgYnkgZGVmYXVsdCIsIGhhbmRsZU9wdGlvbk5vRW5hYmxlQWxsRXhwZXJpbWVudGFsRmVhdHVy ZXMpKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMuY3Bw IGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0T3B0aW9ucy5jcHAKaW5kZXggMjEyNmYzY2I5 Njc1MGU5MjA2ODJmOTgwNTk3ODdjOTE0ZGQzMWZiNy4uMzg2NzY1ZTlkZTY1NzU0M2U0MDZkZDI5 YTA0MDQzZTkzNzQxOTljNSAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0 T3B0aW9ucy5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0T3B0aW9ucy5jcHAK QEAgLTE0OCw3ICsxNDgsNyBAQCBjb25zdCBUZXN0RmVhdHVyZXMmIFRlc3RPcHRpb25zOjpkZWZh dWx0cygpCiAgICAgICAgICAgICB7ICJzaG91bGRIYW5kbGVSdW5PcGVuUGFuZWwiLCB0cnVlIH0s CiAgICAgICAgICAgICB7ICJzaG91bGRQcmVzZW50UG9wb3ZlcnMiLCB0cnVlIH0sCiAgICAgICAg ICAgICB7ICJzaG91bGRTaG93VG91Y2hlcyIsIGZhbHNlIH0sCi0gICAgICAgICAgICB7ICJzaG91 bGRTaG93V2ViVmlldyIsIGZhbHNlIH0sCisgICAgICAgICAgICB7ICJzaG91bGRTaG93V2luZG93 IiwgZmFsc2UgfSwKICAgICAgICAgICAgIHsgInNwZWxsQ2hlY2tpbmdEb3RzIiwgZmFsc2UgfSwK ICAgICAgICAgICAgIHsgInRleHRJbnRlcmFjdGlvbkVuYWJsZWQiLCB0cnVlIH0sCiAgICAgICAg ICAgICB7ICJ1c2VDaGFyYWN0ZXJTZWxlY3Rpb25HcmFudWxhcml0eSIsIGZhbHNlIH0sCkBAIC0y MDIsNyArMjAyLDcgQEAgY29uc3Qgc3RkOjp1bm9yZGVyZWRfbWFwPHN0ZDo6c3RyaW5nLCBUZXN0 SGVhZGVyS2V5VHlwZT4mIFRlc3RPcHRpb25zOjprZXlUeXBlTWEKICAgICAgICAgeyAic2hvdWxk SGFuZGxlUnVuT3BlblBhbmVsIiwgVGVzdEhlYWRlcktleVR5cGU6OkJvb2xUZXN0UnVubmVyIH0s CiAgICAgICAgIHsgInNob3VsZFByZXNlbnRQb3BvdmVycyIsIFRlc3RIZWFkZXJLZXlUeXBlOjpC b29sVGVzdFJ1bm5lciB9LAogICAgICAgICB7ICJzaG91bGRTaG93VG91Y2hlcyIsIFRlc3RIZWFk ZXJLZXlUeXBlOjpCb29sVGVzdFJ1bm5lciB9LAotICAgICAgICB7ICJzaG91bGRTaG93V2ViVmll dyIsIFRlc3RIZWFkZXJLZXlUeXBlOjpCb29sVGVzdFJ1bm5lciB9LAorICAgICAgICB7ICJzaG91 bGRTaG93V2luZG93IiwgVGVzdEhlYWRlcktleVR5cGU6OkJvb2xUZXN0UnVubmVyIH0sCiAgICAg ICAgIHsgInNwZWxsQ2hlY2tpbmdEb3RzIiwgVGVzdEhlYWRlcktleVR5cGU6OkJvb2xUZXN0UnVu bmVyIH0sCiAgICAgICAgIHsgInRleHRJbnRlcmFjdGlvbkVuYWJsZWQiLCBUZXN0SGVhZGVyS2V5 VHlwZTo6Qm9vbFRlc3RSdW5uZXIgfSwKICAgICAgICAgeyAidXNlQ2hhcmFjdGVyU2VsZWN0aW9u R3JhbnVsYXJpdHkiLCBUZXN0SGVhZGVyS2V5VHlwZTo6Qm9vbFRlc3RSdW5uZXIgfSwKZGlmZiAt LWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMuaCBiL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMuaAppbmRleCA1MGQwYWQ4ODMyNDBhNmJmYjdlNTdmODIy MzkzOTNhMjM3YWRmNDYzLi5lYzA2NDYwYWIwMjgwNTllYjc3NDBjZWZlZTkzNjc2NTdiZGQ3ZDhj IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RPcHRpb25zLmgKKysrIGIv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0T3B0aW9ucy5oCkBAIC02NSw3ICs2NSw3IEBAIHB1 YmxpYzoKICAgICBib29sIHNob3VsZFByZXNlbnRQb3BvdmVycygpIGNvbnN0IHsgcmV0dXJuIGJv b2xUZXN0UnVubmVyRmVhdHVyZVZhbHVlKCJzaG91bGRQcmVzZW50UG9wb3ZlcnMiKTsgfQogICAg IGJvb2wgc2hvdWxkU2hvd1NwZWxsQ2hlY2tpbmdEb3RzKCkgY29uc3QgeyByZXR1cm4gYm9vbFRl c3RSdW5uZXJGZWF0dXJlVmFsdWUoInNwZWxsQ2hlY2tpbmdEb3RzIik7IH0KICAgICBib29sIHNo b3VsZFNob3dUb3VjaGVzKCkgY29uc3QgeyByZXR1cm4gYm9vbFRlc3RSdW5uZXJGZWF0dXJlVmFs dWUoInNob3VsZFNob3dUb3VjaGVzIik7IH0KLSAgICBib29sIHNob3VsZFNob3dXZWJWaWV3KCkg Y29uc3QgeyByZXR1cm4gYm9vbFRlc3RSdW5uZXJGZWF0dXJlVmFsdWUoInNob3VsZFNob3dXZWJW aWV3Iik7IH0KKyAgICBib29sIHNob3VsZFNob3dXaW5kb3coKSBjb25zdCB7IHJldHVybiBib29s VGVzdFJ1bm5lckZlYXR1cmVWYWx1ZSgic2hvdWxkU2hvd1dpbmRvdyIpOyB9CiAgICAgYm9vbCB0 ZXh0SW50ZXJhY3Rpb25FbmFibGVkKCkgY29uc3QgeyByZXR1cm4gYm9vbFRlc3RSdW5uZXJGZWF0 dXJlVmFsdWUoInRleHRJbnRlcmFjdGlvbkVuYWJsZWQiKTsgfQogICAgIGJvb2wgdXNlQ2hhcmFj dGVyU2VsZWN0aW9uR3JhbnVsYXJpdHkoKSBjb25zdCB7IHJldHVybiBib29sVGVzdFJ1bm5lckZl YXR1cmVWYWx1ZSgidXNlQ2hhcmFjdGVyU2VsZWN0aW9uR3JhbnVsYXJpdHkiKTsgfQogICAgIGJv b2wgdXNlRGF0YURldGVjdGlvbigpIGNvbnN0IHsgcmV0dXJuIGJvb2xUZXN0UnVubmVyRmVhdHVy ZVZhbHVlKCJ1c2VEYXRhRGV0ZWN0aW9uIik7IH0KZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2NvYS5tbSBiL1Rvb2xzL1dlYktpdFRlc3RS dW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2NvYS5tbQppbmRleCAxZDg1ZDJhZGZlMDEyNTVl MzkyZGE4NzM2NmJhY2ZkODY5NGMxNTYwLi5iYTE1ZTk1ODdlY2Q4MmMyZTZkM2RmYTY3ZTA4MTNl Y2MwNTcwYTBlIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2NvY29hL1Rlc3RD b250cm9sbGVyQ29jb2EubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9UZXN0 Q29udHJvbGxlckNvY29hLm1tCkBAIC0yMTcsNyArMjE3LDcgQEAgUGxhdGZvcm1XZWJWaWV3KiBU ZXN0Q29udHJvbGxlcjo6cGxhdGZvcm1DcmVhdGVPdGhlclBhZ2UoUGxhdGZvcm1XZWJWaWV3KiBw YXJlbnQKIHZvaWQgVGVzdENvbnRyb2xsZXI6OmZpbmlzaENyZWF0aW5nUGxhdGZvcm1XZWJWaWV3 KFBsYXRmb3JtV2ViVmlldyogdmlldywgY29uc3QgVGVzdE9wdGlvbnMmIG9wdGlvbnMpCiB7CiAj aWYgUExBVEZPUk0oTUFDKQotICAgIGlmIChvcHRpb25zLnNob3VsZFNob3dXZWJWaWV3KCkpCisg ICAgaWYgKG9wdGlvbnMuc2hvdWxkU2hvd1dpbmRvdygpKQogICAgICAgICBbdmlldy0+cGxhdGZv cm1XaW5kb3coKSBvcmRlckZyb250Om5pbF07CiAgICAgZWxzZQogICAgICAgICBbdmlldy0+cGxh dGZvcm1XaW5kb3coKSBvcmRlckJhY2s6bmlsXTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvbWFjL1BsYXRmb3JtV2ViVmlld01hYy5tbSBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvbWFjL1BsYXRmb3JtV2ViVmlld01hYy5tbQppbmRleCAzZDJhNjgxMDIxMDRlMjMyY2U5ZDk0 N2RhZmYzZWIyZWQwOGE4YWI3Li5mNzdkMTM5YzllNjhjODA0ZDc4ZjVhNjRlMzE1MjZjNGNkODQy NzM1IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL21hYy9QbGF0Zm9ybVdlYlZp ZXdNYWMubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9tYWMvUGxhdGZvcm1XZWJWaWV3 TWFjLm1tCkBAIC03Myw3ICs3Myw3IEBAIFBsYXRmb3JtV2ViVmlldzo6UGxhdGZvcm1XZWJWaWV3 KFdLV2ViVmlld0NvbmZpZ3VyYXRpb24qIGNvbmZpZ3VyYXRpb24sIGNvbnN0IFRlCiAgICAgW21f dmlldyBfc2V0V2luZG93T2NjbHVzaW9uRGV0ZWN0aW9uRW5hYmxlZDpOT107CiAKICAgICBOU1Nj cmVlbiAqZmlyc3RTY3JlZW4gPSBbW05TU2NyZWVuIHNjcmVlbnNdIG9iamVjdEF0SW5kZXg6MF07 Ci0gICAgTlNSZWN0IHdpbmRvd1JlY3QgPSBtX29wdGlvbnMuc2hvdWxkU2hvd1dlYlZpZXcoKSA/ IE5TT2Zmc2V0UmVjdChyZWN0LCAxMDAsIDEwMCkgOiBOU09mZnNldFJlY3QocmVjdCwgLTEwMDAw LCBbZmlyc3RTY3JlZW4gZnJhbWVdLnNpemUuaGVpZ2h0IC0gcmVjdC5zaXplLmhlaWdodCArIDEw MDAwKTsKKyAgICBOU1JlY3Qgd2luZG93UmVjdCA9IG1fb3B0aW9ucy5zaG91bGRTaG93V2luZG93 KCkgPyBOU09mZnNldFJlY3QocmVjdCwgMTAwLCAxMDApIDogTlNPZmZzZXRSZWN0KHJlY3QsIC0x MDAwMCwgW2ZpcnN0U2NyZWVuIGZyYW1lXS5zaXplLmhlaWdodCAtIHJlY3Quc2l6ZS5oZWlnaHQg KyAxMDAwMCk7CiAgICAgbV93aW5kb3cgPSBbW1dlYktpdFRlc3RSdW5uZXJXaW5kb3cgYWxsb2Nd IGluaXRXaXRoQ29udGVudFJlY3Q6d2luZG93UmVjdCBzdHlsZU1hc2s6TlNXaW5kb3dTdHlsZU1h c2tCb3JkZXJsZXNzIGJhY2tpbmc6KE5TQmFja2luZ1N0b3JlVHlwZSlfTlNCYWNraW5nU3RvcmVV bmJ1ZmZlcmVkIGRlZmVyOllFU107CiAgICAgbV93aW5kb3cucGxhdGZvcm1XZWJWaWV3ID0gdGhp czsKICAgICBbbV93aW5kb3cgc2V0Q29sb3JTcGFjZTpbZmlyc3RTY3JlZW4gY29sb3JTcGFjZV1d OwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci93aW4vUGxhdGZvcm1XZWJWaWV3 V2luLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvd2luL1BsYXRmb3JtV2ViVmlld1dpbi5j cHAKaW5kZXggNDI4NTE1OGYxMDU4YzM2YTEwNGM2ZWVjMTkxYjYyNWNjNzc1MGY4Mi4uNTJiMDcz ZDg4MGZkZWFhMmJkYWU0OWE5ZjViZDQyMTEyNmQyNDFhMCAxMDA2NDQKLS0tIGEvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci93aW4vUGxhdGZvcm1XZWJWaWV3V2luLmNwcAorKysgYi9Ub29scy9XZWJL aXRUZXN0UnVubmVyL3dpbi9QbGF0Zm9ybVdlYlZpZXdXaW4uY3BwCkBAIC0xNDUsNyArMTQ1LDcg QEAgdm9pZCBQbGF0Zm9ybVdlYlZpZXc6OnNldFdpbmRvd0ZyYW1lKFdLUmVjdCBmcmFtZSwgV2Vi Vmlld1NpemluZ01vZGUpCiAgICAgICAgIFNXUF9OT01PVkUgfCBTV1BfTk9aT1JERVIgfCBTV1Bf Tk9BQ1RJVkFURSB8IFNXUF9OT0NPUFlCSVRTKTsKIAogICAgIFVJTlQgZmxhZ3MgPSBTV1BfTk9a T1JERVIgfCBTV1BfTk9BQ1RJVkFURSB8IFNXUF9OT0NPUFlCSVRTOwotICAgIGlmIChtX29wdGlv bnMuc2hvdWxkU2hvd1dlYlZpZXcoKSkKKyAgICBpZiAobV9vcHRpb25zLnNob3VsZFNob3dXaW5k b3coKSkKICAgICAgICAgZmxhZ3MgfD0gU1dQX05PTU9WRTsKICAgICA6OlNldFdpbmRvd1BvcygK ICAgICAgICAgbV93aW5kb3csCg==