220347 2021-01-05 16:59:23 -0800 Stop using MediaRecorder in API test WebKit2.SpeechRecognitionErrorWhenStartingAudioCaptureOnDifferentPage 2021-01-08 11:57:15 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu ryanhaddad webkit-bug-importer youennf oldest_to_newest 1717546 0 sihui_liu 2021-01-05 16:59:23 -0800 ... 1717548 1 417057 sihui_liu 2021-01-05 17:01:05 -0800 Created attachment 417057 Patch 1717681 2 417057 youennf 2021-01-06 09:37:07 -0800 Comment on attachment 417057 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417057&action=review > Tools/TestWebKitAPI/Tests/WebKitCocoa/SpeechRecognition.mm:130 > + for (_WKExperimentalFeature *feature in [WKPreferences _experimentalFeatures]) { It might be best to not use media recorder or to make the test work in both cases (MediaRecorder on or off). WTR can use MediaRecorder with a mock backend in all platforms but the real backend is only supported for recent MacOS versions. 1717702 3 417100 sihui_liu 2021-01-06 10:44:17 -0800 Created attachment 417100 Patch 1717965 4 sihui_liu 2021-01-07 09:00:10 -0800 (In reply to youenn fablet from comment #2) > Comment on attachment 417057 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=417057&action=review > > > Tools/TestWebKitAPI/Tests/WebKitCocoa/SpeechRecognition.mm:130 > > + for (_WKExperimentalFeature *feature in [WKPreferences _experimentalFeatures]) { > > It might be best to not use media recorder or to make the test work in both > cases (MediaRecorder on or off). > WTR can use MediaRecorder with a mock backend in all platforms but the real > backend is only supported for recent MacOS versions. Removed media recorder and use audio element instead. 1718030 5 sihui_liu 2021-01-07 12:07:29 -0800 *** Bug 220425 has been marked as a duplicate of this bug. *** 1718233 6 417100 youennf 2021-01-08 00:12:32 -0800 Comment on attachment 417100 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417100&action=review > Tools/TestWebKitAPI/Tests/WebKitCocoa/SpeechRecognition.mm:34 > +#import <WebKit/_WKExperimentalFeature.h> No longer needed. > Tools/TestWebKitAPI/Tests/WebKitCocoa/speechrecognition-basic.html:32 > + }; I would simplify this and just do: audio.play(); It might be best also to add the audio element to the DOM. Maybe just add something like: <audio id="audio" autoplay></audio> And then write audio.play() here. 1718319 7 417273 sihui_liu 2021-01-08 09:44:51 -0800 Created attachment 417273 Patch for landing 1718321 8 417274 sihui_liu 2021-01-08 09:45:29 -0800 Created attachment 417274 Patch for landing 1718368 9 ews-feeder 2021-01-08 11:49:50 -0800 Found 1 new test failure: media/controls/showControlsButton.html 1718372 10 ews-feeder 2021-01-08 11:56:14 -0800 Committed r271311: <https://trac.webkit.org/changeset/271311> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417274. 1718374 11 webkit-bug-importer 2021-01-08 11:57:15 -0800 <rdar://problem/72938893> 417057 2021-01-05 17:01:05 -0800 2021-01-06 10:44:16 -0800 Patch bug-220347-20210105170105.patch text/plain 2149 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMTc5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTFjMmVkNDhiZTFhNTY3ZDdmMWNjODZhYzBkOGYzOTI2 MmEyZjYwYS4uNzA5OTc1Yzg2ODYyYjg2YzRkZWU0Y2EzNmM1OTU4ZTAwMGJlMTI1MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDIxLTAxLTA1ICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwZS5jb20+CisKKyAgICAg ICAgRW5hYmxlIE1lZGlhUmVjb3JkZXIgaW4gYXBpIHRlc3QgV2ViS2l0Mi5TcGVlY2hSZWNvZ25p dGlvbkVycm9yV2hlblN0YXJ0aW5nQXVkaW9DYXB0dXJlT25EaWZmZXJlbnRQYWdlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjAzNDcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvU3BlZWNoUmVjb2duaXRpb24ubW06CisgICAgICAgIChUZXN0V2Vi S2l0QVBJOjpURVNUKToKKwogMjAyMS0wMS0wNSAgQW5nZWxvcyBPaWtvbm9tb3BvdWxvcyAgPGFu Z2Vsb3NAaWdhbGlhLmNvbT4KIAogICAgICAgICBbSlNDXSBhbGxvdyBzdHJlc3MgdGVzdHMgdG8g b3B0IG91dCBvZiBwYXJhbGxlbCBleGVjdXRpb24KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU3BlZWNoUmVjb2duaXRpb24ubW0gYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NwZWVjaFJlY29nbml0aW9uLm1tCmluZGV4IDk5 ZmFkNjY5NmYyMGMyYmZlNTlmZWZjMDczYjY2MTEwODE5NjllOTQuLjAxNWQ3NGNkODNiNWRmMzA1 YWRmZjQ2ZWQ3ZmVhODAyM2NiNTQxYzkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvU3BlZWNoUmVjb2duaXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TcGVlY2hSZWNvZ25pdGlvbi5tbQpAQCAtMzEsNiAr MzEsNyBAQAogI2ltcG9ydCA8V2ViS2l0L1dLVUlEZWxlZ2F0ZVByaXZhdGUuaD4KICNpbXBvcnQg PFdlYktpdC9XS1dlYlZpZXcuaD4KICNpbXBvcnQgPFdlYktpdC9XS1dlYlZpZXdDb25maWd1cmF0 aW9uUHJpdmF0ZS5oPgorI2ltcG9ydCA8V2ViS2l0L19XS0V4cGVyaW1lbnRhbEZlYXR1cmUuaD4K ICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KIAogc3RhdGljIGJvb2wgc2hvdWxkR3JhbnRQZXJt aXNzaW9uUmVxdWVzdCA9IHRydWU7CkBAIC0xMjYsNiArMTI3LDEyIEBAIFRFU1QoV2ViS2l0Miwg U3BlZWNoUmVjb2duaXRpb25FcnJvcldoZW5TdGFydGluZ0F1ZGlvQ2FwdHVyZU9uRGlmZmVyZW50 UGFnZSkKICAgICBhdXRvIHByZWZlcmVuY2VzID0gW2NvbmZpZ3VyYXRpb24gcHJlZmVyZW5jZXNd OwogICAgIHByZWZlcmVuY2VzLl9tb2NrQ2FwdHVyZURldmljZXNFbmFibGVkID0gWUVTOwogICAg IHByZWZlcmVuY2VzLl9zcGVlY2hSZWNvZ25pdGlvbkVuYWJsZWQgPSBZRVM7CisgICAgZm9yIChf V0tFeHBlcmltZW50YWxGZWF0dXJlICpmZWF0dXJlIGluIFtXS1ByZWZlcmVuY2VzIF9leHBlcmlt ZW50YWxGZWF0dXJlc10pIHsKKyAgICAgICAgaWYgKFtmZWF0dXJlLmtleSBpc0VxdWFsVG9TdHJp bmc6QCJNZWRpYVJlY29yZGVyRW5hYmxlZCJdKSB7CisgICAgICAgICAgICBbW2NvbmZpZ3VyYXRp b24gcHJlZmVyZW5jZXNdIF9zZXRFbmFibGVkOllFUyBmb3JFeHBlcmltZW50YWxGZWF0dXJlOmZl YXR1cmVdOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICB9CiAgICAgcHJlZmVy ZW5jZXMuX21lZGlhQ2FwdHVyZVJlcXVpcmVzU2VjdXJlQ29ubmVjdGlvbiA9IE5POwogICAgIGF1 dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtbU3BlZWNoUmVjb2duaXRpb25QZXJtaXNzaW9uVUlEZWxl Z2F0ZSBhbGxvY10gaW5pdF0pOwogICAgIGF1dG8gZmlyc3RXZWJWaWV3ID0gYWRvcHROUyhbW1Rl c3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCA4MDAsIDYw MCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpXSk7Cg== 417100 2021-01-06 10:44:17 -0800 2021-01-08 09:44:49 -0800 Patch bug-220347-20210106104417.patch text/plain 4513 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMjAzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWQ3NmE5YzkzMjI5MmYyYjZjZjk0YWNjODY2YjBmNGYx MzY0ZTY0Zi4uNTczMmZiOGEyMjk0MDQyMmM4ZWM5MmJjYzA0NTg2NGUyMmQ0Yjg5MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIxLTAxLTA2ICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwZS5jb20+CisKKyAgICAg ICAgU3RvcCB1c2luZyBNZWRpYVJlY29yZGVyIGluIEFQSSB0ZXN0IFdlYktpdDIuU3BlZWNoUmVj b2duaXRpb25FcnJvcldoZW5TdGFydGluZ0F1ZGlvQ2FwdHVyZU9uRGlmZmVyZW50UGFnZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwMzQ3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQmVjYXVzZSBNZWRp YVJlY29yZGVyICh3aXRoIHJlYWwgYmFja2VuZCkgaXMgb25seSBzdXBwb3J0ZWQgaW4gc29tZSBy ZWNlbnQgTWFjT1MgdmVyc2lvbnMgbm93LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9TcGVlY2hSZWNvZ25pdGlvbi5tbToKKyAgICAgICAgKFRlc3RXZWJLaXRB UEk6OlRFU1QpOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Evc3Bl ZWNocmVjb2duaXRpb24tYmFzaWMuaHRtbDoKKwogMjAyMS0wMS0wNiAgSm9uYXRoYW4gQmVkYXJk IDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBbd2Via2l0c2NtcHldIEFkZCBjb21tYW5k IHRvIGNhbm9uaWNhbGl6ZSB1bnB1c2hlZCBjb21taXRzIChGb2xsb3ctdXAgZml4KQpkaWZmIC0t Z2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TcGVlY2hSZWNvZ25p dGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU3BlZWNoUmVj b2duaXRpb24ubW0KaW5kZXggOTlmYWQ2Njk2ZjIwYzJiZmU1OWZlZmMwNzNiNjYxMTA4MTk2OWU5 NC4uZjIwMDIxODAyNTYwNTA2YzA0NWI3ODM4MTU1Y2Y2YjUyODk3NTY5NiAxMDA2NDQKLS0tIGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TcGVlY2hSZWNvZ25pdGlvbi5t bQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NwZWVjaFJlY29n bml0aW9uLm1tCkBAIC0zMSw2ICszMSw3IEBACiAjaW1wb3J0IDxXZWJLaXQvV0tVSURlbGVnYXRl UHJpdmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dLV2ViVmlldy5oPgogI2ltcG9ydCA8V2ViS2l0 L1dLV2ViVmlld0NvbmZpZ3VyYXRpb25Qcml2YXRlLmg+CisjaW1wb3J0IDxXZWJLaXQvX1dLRXhw ZXJpbWVudGFsRmVhdHVyZS5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgogCiBzdGF0aWMg Ym9vbCBzaG91bGRHcmFudFBlcm1pc3Npb25SZXF1ZXN0ID0gdHJ1ZTsKQEAgLTE1Niw3ICsxNTcs NyBAQCBURVNUKFdlYktpdDIsIFNwZWVjaFJlY29nbml0aW9uRXJyb3JXaGVuU3RhcnRpbmdBdWRp b0NhcHR1cmVPbkRpZmZlcmVudFBhZ2UpCiAgICAgLy8gRmlyc3QgcGFnZSBpcyBtdXRlZCB3aGVu IHNlY29uZCBwYWdlIHN0YXJ0cyBtZWRpYSByZWNvcmRlci4KICAgICByZWNlaXZlZFNjcmlwdE1l c3NhZ2UgPSBmYWxzZTsKICAgICBbc2Vjb25kV2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZFRlc3RQ YWdlTmFtZWQ6QCJzcGVlY2hyZWNvZ25pdGlvbi1iYXNpYyJdOwotICAgIFtzZWNvbmRXZWJWaWV3 IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJzdGFydFJlY29yZGVyKCkiXTsKKyAgICBb c2Vjb25kV2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAic3RhcnRBdWRpbygp Il07CiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZyZWNlaXZlZFNjcmlwdE1lc3NhZ2Up OwogICAgIEVYUEVDVF9XS19TVFJFUShAIkVycm9yOiBhdWRpby1jYXB0dXJlIC0gU291cmNlIGlz IG11dGVkIiwgW2xhc3RTY3JpcHRNZXNzYWdlIGJvZHldKTsKIApAQCAtMTY0LDcgKzE2NSw3IEBA IFRFU1QoV2ViS2l0MiwgU3BlZWNoUmVjb2duaXRpb25FcnJvcldoZW5TdGFydGluZ0F1ZGlvQ2Fw dHVyZU9uRGlmZmVyZW50UGFnZSkKICAgICByZWNlaXZlZFNjcmlwdE1lc3NhZ2UgPSBmYWxzZTsK ICAgICBbZmlyc3RXZWJWaWV3IHN5bmNocm9ub3VzbHlMb2FkSFRNTFN0cmluZzpAIjxzY3JpcHQ+ c3BlZWNoUmVjb2duaXRpb24gPSBuZXcgd2Via2l0U3BlZWNoUmVjb2duaXRpb24oKTsgc3BlZWNo UmVjb2duaXRpb24uc3RhcnQoKTs8L3NjcmlwdD4iIGJhc2VVUkw6W05TVVJMIFVSTFdpdGhTdHJp bmc6QCJodHRwczovL3dlYmtpdC5vcmciXV07CiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVu KCZyZWNlaXZlZFNjcmlwdE1lc3NhZ2UpOwotICAgIEVYUEVDVF9XS19TVFJFUShAIlJlY29yZGVy IE11dGUiLCBbbGFzdFNjcmlwdE1lc3NhZ2UgYm9keV0pOworICAgIEVYUEVDVF9XS19TVFJFUShA IkF1ZGlvIE11dGUiLCBbbGFzdFNjcmlwdE1lc3NhZ2UgYm9keV0pOwogfQogCiB9IC8vIG5hbWVz cGFjZSBUZXN0V2ViS2l0QVBJCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL3NwZWVjaHJlY29nbml0aW9uLWJhc2ljLmh0bWwgYi9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL3NwZWVjaHJlY29nbml0aW9uLWJhc2ljLmh0bWwKaW5k ZXggMGNlNmY2YWMzNTliMjFlMmUyYTRlYWE3Yzc5ZGNmYmNhZmQwYjU5Mi4uM2RjODI3ZDkxY2E4 OGZlYjFiZjAxMGJkYzBiODI3YThkMmQ4OWVmYSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9zcGVlY2hyZWNvZ25pdGlvbi1iYXNpYy5odG1sCisrKyBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Evc3BlZWNocmVjb2duaXRpb24t YmFzaWMuaHRtbApAQCAtMjQsMzIgKzI0LDIyIEBAIGZ1bmN0aW9uIHN0b3AoKQogZnVuY3Rpb24g Z290TWVkaWEoc3RyZWFtKSB7CiAgICAgdHJ5IHsKICAgICAgICAgdmFyIHRyYWNrcyA9IHN0cmVh bS5nZXRBdWRpb1RyYWNrcygpOwotICAgICAgICB0cmFja3NbMF0ub25tdXRlID0gKCkgPT4gd2lu ZG93LndlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UoIlJlY29y ZGVyIE11dGUiKTsKLQotICAgICAgICBpZiAoIXJlY29yZGVyKQotICAgICAgICAgICAgcmVjb3Jk ZXIgPSBuZXcgTWVkaWFSZWNvcmRlcihzdHJlYW0pOwotCi0gICAgICAgIHJlY29yZGVyLm9uZXJy b3IgPSAoZXZlbnQpID0+IHdpbmRvdy53ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVy LnBvc3RNZXNzYWdlKCJSZWNvcmRlciBFcnJvcjogIiArIGV2ZW50LmNvZGUgKyAiIC0gIiArICBl dmVudC5tZXNzYWdlKTsKLSAgICAgICAgcmVjb3JkZXIuc3RhcnQoKTsKKyAgICAgICAgdHJhY2tz WzBdLm9ubXV0ZSA9ICgpID0+IHdpbmRvdy53ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5k bGVyLnBvc3RNZXNzYWdlKCJBdWRpbyBNdXRlIik7CisgICAgICAgIHZhciBhdWRpbyA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoJ2F1ZGlvJyk7CisgICAgICAgIGF1ZGlvLnNyY09iamVjdCA9IHN0 cmVhbTsKKyAgICAgICAgYXVkaW8ub25sb2FkZWRtZXRhZGF0YSA9IGZ1bmN0aW9uKGUpIHsKKyAg ICAgICAgICAgIGF1ZGlvLnBsYXkoKTsKKyAgICAgICAgfTsKICAgICB9IGNhdGNoKGUpIHsKLSAg ICAgICAgd2luZG93LndlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3Nh Z2UoIlJlY29yZGVyIEVycm9yIDogIiArIGUpOworICAgICAgICB3aW5kb3cud2Via2l0Lm1lc3Nh Z2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgiZ290TWVkaWEgRXJyb3IgOiAiICsg ZSk7CiAgICAgfQogfQogCi1mdW5jdGlvbiBzdGFydFJlY29yZGVyKCkgewotICAgIGlmIChyZWNv cmRlcikgewotICAgICAgICByZWNvcmRlci5zdGFydCgpOwotICAgICAgICByZXR1cm47Ci0gICAg fQotCitmdW5jdGlvbiBzdGFydEF1ZGlvKCkKK3sKICAgICBuYXZpZ2F0b3IubWVkaWFEZXZpY2Vz LmdldFVzZXJNZWRpYSh7IGF1ZGlvOiB0cnVlIH0pCiAgICAgLnRoZW4oZ290TWVkaWEpCi0gICAg LmNhdGNoKGUgPT4geyB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5w b3N0TWVzc2FnZSgiVXNlck1lZGlhIEVycm9yOiAiICsgZSk7IH0pOwotfQotCi1mdW5jdGlvbiBz dG9wUmVjb3JkZXIoKSB7Ci0gICAgaWYgKHJlY29yZGVyKQotICAgICAgICByZWNvcmRlci5zdG9w KCk7CisgICAgLmNhdGNoKGUgPT4geyB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0 SGFuZGxlci5wb3N0TWVzc2FnZSgic3RhcnRBdWRpbyBFcnJvcjogIiArIGUpOyB9KTsKIH0KIAog PC9zY3JpcHQ+Cg== 417273 2021-01-08 09:44:51 -0800 2021-01-08 09:45:27 -0800 Patch for landing bug-220347-20210108094450.patch text/plain 4594 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMjk5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzg4NGJjZTNkMzY3YmQxNDdkYWFlOGE1MDQ2Y2RlNDcx ODQ5MTQ3Ni4uYjEzN2RhNTQ0MzIyMGQ2MGE5YzI1YzMxMTJhNTMzZWVlNzk4Nzk3OCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIxLTAxLTA4ICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwZS5jb20+CisKKyAgICAg ICAgU3RvcCB1c2luZyBNZWRpYVJlY29yZGVyIGluIEFQSSB0ZXN0IFdlYktpdDIuU3BlZWNoUmVj b2duaXRpb25FcnJvcldoZW5TdGFydGluZ0F1ZGlvQ2FwdHVyZU9uRGlmZmVyZW50UGFnZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwMzQ3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgWW91ZW5uIEZhYmxldC4KKworICAgICAgICBCZWNhdXNlIE1lZGlh UmVjb3JkZXIgKHdpdGggcmVhbCBiYWNrZW5kKSBpcyBvbmx5IHN1cHBvcnRlZCBpbiBzb21lIHJl Y2VudCBNYWNPUyB2ZXJzaW9ucyBub3cuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL1NwZWVjaFJlY29nbml0aW9uLm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQ STo6VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9zcGVl Y2hyZWNvZ25pdGlvbi1iYXNpYy5odG1sOgorCiAyMDIxLTAxLTA4ICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBpdCBzYWZlIHRvIHJlLWVudGVyIEhhc2hN YXA6OmNsZWFyKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvU3BlZWNoUmVjb2duaXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1NwZWVjaFJlY29nbml0aW9uLm1tCmluZGV4IDRhYmEwZWE2MGM5NDkzMjNmYzk1 NTQxMmYyODg3ZTJkMGY0NDkzYjEuLmQ1MTExNThhNmVkYTIyYmY1YTVmYTI5NmE2NDg2MjhiMDc0 YjIzMTcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev U3BlZWNoUmVjb2duaXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9TcGVlY2hSZWNvZ25pdGlvbi5tbQpAQCAtMzIsNiArMzIsNyBAQAogI2ltcG9ydCA8 V2ViS2l0L1dLVUlEZWxlZ2F0ZVByaXZhdGUuaD4KICNpbXBvcnQgPFdlYktpdC9XS1dlYlZpZXcu aD4KICNpbXBvcnQgPFdlYktpdC9XS1dlYlZpZXdDb25maWd1cmF0aW9uUHJpdmF0ZS5oPgorI2lt cG9ydCA8V2ViS2l0L19XS0V4cGVyaW1lbnRhbEZlYXR1cmUuaD4KICNpbXBvcnQgPHd0Zi9SZXRh aW5QdHIuaD4KIAogc3RhdGljIGJvb2wgc2hvdWxkR3JhbnRQZXJtaXNzaW9uUmVxdWVzdCA9IHRy dWU7CkBAIC0xODMsNyArMTg0LDcgQEAgVEVTVChXZWJLaXQyLCBTcGVlY2hSZWNvZ25pdGlvbkVy cm9yV2hlblN0YXJ0aW5nQXVkaW9DYXB0dXJlT25EaWZmZXJlbnRQYWdlKQogICAgIC8vIEZpcnN0 IHBhZ2UgaXMgbXV0ZWQgd2hlbiBzZWNvbmQgcGFnZSBzdGFydHMgbWVkaWEgcmVjb3JkZXIuCiAg ICAgcmVjZWl2ZWRTY3JpcHRNZXNzYWdlID0gZmFsc2U7CiAgICAgW3NlY29uZFdlYlZpZXcgc3lu Y2hyb25vdXNseUxvYWRUZXN0UGFnZU5hbWVkOkAic3BlZWNocmVjb2duaXRpb24tYmFzaWMiXTsK LSAgICBbc2Vjb25kV2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAic3RhcnRS ZWNvcmRlcigpIl07CisgICAgW3NlY29uZFdlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNj cmlwdDpAInN0YXJ0QXVkaW8oKSJdOwogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVj ZWl2ZWRTY3JpcHRNZXNzYWdlKTsKICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJFcnJvcjogYXVkaW8t Y2FwdHVyZSAtIFNvdXJjZSBpcyBtdXRlZCIsIFtsYXN0U2NyaXB0TWVzc2FnZSBib2R5XSk7CiAK QEAgLTE5MSw3ICsxOTIsNyBAQCBURVNUKFdlYktpdDIsIFNwZWVjaFJlY29nbml0aW9uRXJyb3JX aGVuU3RhcnRpbmdBdWRpb0NhcHR1cmVPbkRpZmZlcmVudFBhZ2UpCiAgICAgcmVjZWl2ZWRTY3Jp cHRNZXNzYWdlID0gZmFsc2U7CiAgICAgW2ZpcnN0V2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZEhU TUxTdHJpbmc6QCI8c2NyaXB0PnNwZWVjaFJlY29nbml0aW9uID0gbmV3IHdlYmtpdFNwZWVjaFJl Y29nbml0aW9uKCk7IHNwZWVjaFJlY29nbml0aW9uLnN0YXJ0KCk7PC9zY3JpcHQ+IiBiYXNlVVJM OltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiaHR0cHM6Ly93ZWJraXQub3JnIl1dOwogICAgIFRlc3RX ZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVjZWl2ZWRTY3JpcHRNZXNzYWdlKTsKLSAgICBFWFBFQ1Rf V0tfU1RSRVEoQCJSZWNvcmRlciBNdXRlIiwgW2xhc3RTY3JpcHRNZXNzYWdlIGJvZHldKTsKKyAg ICBFWFBFQ1RfV0tfU1RSRVEoQCJBdWRpbyBNdXRlIiwgW2xhc3RTY3JpcHRNZXNzYWdlIGJvZHld KTsKIH0KIAogLy8gRklYTUU6IGVuYWJsZSB0aGlzIHRlc3Qgb24gaU9TIHdoZW4gaHR0cHM6Ly93 ZWJraXQub3JnL2IvMTc1MjA0IGlzIGZpeGVkLgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9zcGVlY2hyZWNvZ25pdGlvbi1iYXNpYy5odG1sIGIvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9zcGVlY2hyZWNvZ25pdGlvbi1iYXNp Yy5odG1sCmluZGV4IDBjZTZmNmFjMzU5YjIxZTJlMmE0ZWFhN2M3OWRjZmJjYWZkMGI1OTIuLmM2 N2QwYzcxMDYyYjljNDE2YWY4MWFmMmY4ZTIxZDY5ZmI0MDYzMzMgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Evc3BlZWNocmVjb2duaXRpb24tYmFzaWMu aHRtbAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL3NwZWVjaHJl Y29nbml0aW9uLWJhc2ljLmh0bWwKQEAgLTEsNCArMSw3IEBACiA8aHRtbD4KKzxib2R5PgorPGF1 ZGlvIGlkPSJhdWRpbyIgYXV0b3BsYXk+PC9hdWRpbz4KKwogPHNjcmlwdD4KIAogdmFyIHNwZWVj aFJlY29nbml0aW9uID0gbnVsbDsKQEAgLTI0LDMzICsyNywyMyBAQCBmdW5jdGlvbiBzdG9wKCkK IGZ1bmN0aW9uIGdvdE1lZGlhKHN0cmVhbSkgewogICAgIHRyeSB7CiAgICAgICAgIHZhciB0cmFj a3MgPSBzdHJlYW0uZ2V0QXVkaW9UcmFja3MoKTsKLSAgICAgICAgdHJhY2tzWzBdLm9ubXV0ZSA9 ICgpID0+IHdpbmRvdy53ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNz YWdlKCJSZWNvcmRlciBNdXRlIik7Ci0KLSAgICAgICAgaWYgKCFyZWNvcmRlcikKLSAgICAgICAg ICAgIHJlY29yZGVyID0gbmV3IE1lZGlhUmVjb3JkZXIoc3RyZWFtKTsKLQotICAgICAgICByZWNv cmRlci5vbmVycm9yID0gKGV2ZW50KSA9PiB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50 ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgiUmVjb3JkZXIgRXJyb3I6ICIgKyBldmVudC5jb2RlICsg IiAtICIgKyAgZXZlbnQubWVzc2FnZSk7Ci0gICAgICAgIHJlY29yZGVyLnN0YXJ0KCk7CisgICAg ICAgIHRyYWNrc1swXS5vbm11dGUgPSAoKSA9PiB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVy cy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgiQXVkaW8gTXV0ZSIpOworICAgICAgICB2YXIgYXVk aW8gPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnYXVkaW8nKTsKKyAgICAgICAgYXVkaW8uc3Jj T2JqZWN0ID0gc3RyZWFtOworICAgICAgICBhdWRpby5wbGF5KCk7CiAgICAgfSBjYXRjaChlKSB7 Ci0gICAgICAgIHdpbmRvdy53ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RN ZXNzYWdlKCJSZWNvcmRlciBFcnJvciA6ICIgKyBlKTsKKyAgICAgICAgd2luZG93LndlYmtpdC5t ZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UoImdvdE1lZGlhIEVycm9yIDog IiArIGUpOwogICAgIH0KIH0KIAotZnVuY3Rpb24gc3RhcnRSZWNvcmRlcigpIHsKLSAgICBpZiAo cmVjb3JkZXIpIHsKLSAgICAgICAgcmVjb3JkZXIuc3RhcnQoKTsKLSAgICAgICAgcmV0dXJuOwot ICAgIH0KLQorZnVuY3Rpb24gc3RhcnRBdWRpbygpCit7CiAgICAgbmF2aWdhdG9yLm1lZGlhRGV2 aWNlcy5nZXRVc2VyTWVkaWEoeyBhdWRpbzogdHJ1ZSB9KQogICAgIC50aGVuKGdvdE1lZGlhKQot ICAgIC5jYXRjaChlID0+IHsgd2luZG93LndlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRs ZXIucG9zdE1lc3NhZ2UoIlVzZXJNZWRpYSBFcnJvcjogIiArIGUpOyB9KTsKLX0KLQotZnVuY3Rp b24gc3RvcFJlY29yZGVyKCkgewotICAgIGlmIChyZWNvcmRlcikKLSAgICAgICAgcmVjb3JkZXIu c3RvcCgpOworICAgIC5jYXRjaChlID0+IHsgd2luZG93LndlYmtpdC5tZXNzYWdlSGFuZGxlcnMu dGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UoInN0YXJ0QXVkaW8gRXJyb3I6ICIgKyBlKTsgfSk7CiB9 CiAKIDwvc2NyaXB0PgorCis8L2JvZHk+CiA8L2h0bWw+Cg== 417274 2021-01-08 09:45:29 -0800 2021-01-08 11:56:15 -0800 Patch for landing bug-220347-20210108094528.patch text/plain 4334 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMjk5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzg4NGJjZTNkMzY3YmQxNDdkYWFlOGE1MDQ2Y2RlNDcx ODQ5MTQ3Ni4uYjEzN2RhNTQ0MzIyMGQ2MGE5YzI1YzMxMTJhNTMzZWVlNzk4Nzk3OCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIxLTAxLTA4ICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwZS5jb20+CisKKyAgICAg ICAgU3RvcCB1c2luZyBNZWRpYVJlY29yZGVyIGluIEFQSSB0ZXN0IFdlYktpdDIuU3BlZWNoUmVj b2duaXRpb25FcnJvcldoZW5TdGFydGluZ0F1ZGlvQ2FwdHVyZU9uRGlmZmVyZW50UGFnZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwMzQ3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgWW91ZW5uIEZhYmxldC4KKworICAgICAgICBCZWNhdXNlIE1lZGlh UmVjb3JkZXIgKHdpdGggcmVhbCBiYWNrZW5kKSBpcyBvbmx5IHN1cHBvcnRlZCBpbiBzb21lIHJl Y2VudCBNYWNPUyB2ZXJzaW9ucyBub3cuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL1NwZWVjaFJlY29nbml0aW9uLm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQ STo6VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9zcGVl Y2hyZWNvZ25pdGlvbi1iYXNpYy5odG1sOgorCiAyMDIxLTAxLTA4ICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBpdCBzYWZlIHRvIHJlLWVudGVyIEhhc2hN YXA6OmNsZWFyKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvU3BlZWNoUmVjb2duaXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1NwZWVjaFJlY29nbml0aW9uLm1tCmluZGV4IDRhYmEwZWE2MGM5NDkzMjNmYzk1 NTQxMmYyODg3ZTJkMGY0NDkzYjEuLmUwYjQ2NjhlYTMzYzk2MTVhZGZmNWE1YjlmZmIzOGUyNTY0 NzU5MjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev U3BlZWNoUmVjb2duaXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9TcGVlY2hSZWNvZ25pdGlvbi5tbQpAQCAtMTgzLDcgKzE4Myw3IEBAIFRFU1QoV2Vi S2l0MiwgU3BlZWNoUmVjb2duaXRpb25FcnJvcldoZW5TdGFydGluZ0F1ZGlvQ2FwdHVyZU9uRGlm ZmVyZW50UGFnZSkKICAgICAvLyBGaXJzdCBwYWdlIGlzIG11dGVkIHdoZW4gc2Vjb25kIHBhZ2Ug c3RhcnRzIG1lZGlhIHJlY29yZGVyLgogICAgIHJlY2VpdmVkU2NyaXB0TWVzc2FnZSA9IGZhbHNl OwogICAgIFtzZWNvbmRXZWJWaWV3IHN5bmNocm9ub3VzbHlMb2FkVGVzdFBhZ2VOYW1lZDpAInNw ZWVjaHJlY29nbml0aW9uLWJhc2ljIl07Ci0gICAgW3NlY29uZFdlYlZpZXcgc3RyaW5nQnlFdmFs dWF0aW5nSmF2YVNjcmlwdDpAInN0YXJ0UmVjb3JkZXIoKSJdOworICAgIFtzZWNvbmRXZWJWaWV3 IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJzdGFydEF1ZGlvKCkiXTsKICAgICBUZXN0 V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkU2NyaXB0TWVzc2FnZSk7CiAgICAgRVhQRUNU X1dLX1NUUkVRKEAiRXJyb3I6IGF1ZGlvLWNhcHR1cmUgLSBTb3VyY2UgaXMgbXV0ZWQiLCBbbGFz dFNjcmlwdE1lc3NhZ2UgYm9keV0pOwogCkBAIC0xOTEsNyArMTkxLDcgQEAgVEVTVChXZWJLaXQy LCBTcGVlY2hSZWNvZ25pdGlvbkVycm9yV2hlblN0YXJ0aW5nQXVkaW9DYXB0dXJlT25EaWZmZXJl bnRQYWdlKQogICAgIHJlY2VpdmVkU2NyaXB0TWVzc2FnZSA9IGZhbHNlOwogICAgIFtmaXJzdFdl YlZpZXcgc3luY2hyb25vdXNseUxvYWRIVE1MU3RyaW5nOkAiPHNjcmlwdD5zcGVlY2hSZWNvZ25p dGlvbiA9IG5ldyB3ZWJraXRTcGVlY2hSZWNvZ25pdGlvbigpOyBzcGVlY2hSZWNvZ25pdGlvbi5z dGFydCgpOzwvc2NyaXB0PiIgYmFzZVVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImh0dHBzOi8v d2Via2l0Lm9yZyJdXTsKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkU2Ny aXB0TWVzc2FnZSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAiUmVjb3JkZXIgTXV0ZSIsIFtsYXN0 U2NyaXB0TWVzc2FnZSBib2R5XSk7CisgICAgRVhQRUNUX1dLX1NUUkVRKEAiQXVkaW8gTXV0ZSIs IFtsYXN0U2NyaXB0TWVzc2FnZSBib2R5XSk7CiB9CiAKIC8vIEZJWE1FOiBlbmFibGUgdGhpcyB0 ZXN0IG9uIGlPUyB3aGVuIGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE3NTIwNCBpcyBmaXhlZC4KZGlm ZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Evc3BlZWNocmVj b2duaXRpb24tYmFzaWMuaHRtbCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2Evc3BlZWNocmVjb2duaXRpb24tYmFzaWMuaHRtbAppbmRleCAwY2U2ZjZhYzM1OWIyMWUyZTJh NGVhYTdjNzlkY2ZiY2FmZDBiNTkyLi5jNjdkMGM3MTA2MmI5YzQxNmFmODFhZjJmOGUyMWQ2OWZi NDA2MzMzIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L3NwZWVjaHJlY29nbml0aW9uLWJhc2ljLmh0bWwKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9zcGVlY2hyZWNvZ25pdGlvbi1iYXNpYy5odG1sCkBAIC0xLDQgKzEs NyBAQAogPGh0bWw+Cis8Ym9keT4KKzxhdWRpbyBpZD0iYXVkaW8iIGF1dG9wbGF5PjwvYXVkaW8+ CisKIDxzY3JpcHQ+CiAKIHZhciBzcGVlY2hSZWNvZ25pdGlvbiA9IG51bGw7CkBAIC0yNCwzMyAr MjcsMjMgQEAgZnVuY3Rpb24gc3RvcCgpCiBmdW5jdGlvbiBnb3RNZWRpYShzdHJlYW0pIHsKICAg ICB0cnkgewogICAgICAgICB2YXIgdHJhY2tzID0gc3RyZWFtLmdldEF1ZGlvVHJhY2tzKCk7Ci0g ICAgICAgIHRyYWNrc1swXS5vbm11dGUgPSAoKSA9PiB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5k bGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgiUmVjb3JkZXIgTXV0ZSIpOwotCi0gICAgICAg IGlmICghcmVjb3JkZXIpCi0gICAgICAgICAgICByZWNvcmRlciA9IG5ldyBNZWRpYVJlY29yZGVy KHN0cmVhbSk7Ci0KLSAgICAgICAgcmVjb3JkZXIub25lcnJvciA9IChldmVudCkgPT4gd2luZG93 LndlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UoIlJlY29yZGVy IEVycm9yOiAiICsgZXZlbnQuY29kZSArICIgLSAiICsgIGV2ZW50Lm1lc3NhZ2UpOwotICAgICAg ICByZWNvcmRlci5zdGFydCgpOworICAgICAgICB0cmFja3NbMF0ub25tdXRlID0gKCkgPT4gd2lu ZG93LndlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UoIkF1ZGlv IE11dGUiKTsKKyAgICAgICAgdmFyIGF1ZGlvID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2F1 ZGlvJyk7CisgICAgICAgIGF1ZGlvLnNyY09iamVjdCA9IHN0cmVhbTsKKyAgICAgICAgYXVkaW8u cGxheSgpOwogICAgIH0gY2F0Y2goZSkgewotICAgICAgICB3aW5kb3cud2Via2l0Lm1lc3NhZ2VI YW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgiUmVjb3JkZXIgRXJyb3IgOiAiICsgZSk7 CisgICAgICAgIHdpbmRvdy53ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RN ZXNzYWdlKCJnb3RNZWRpYSBFcnJvciA6ICIgKyBlKTsKICAgICB9CiB9CiAKLWZ1bmN0aW9uIHN0 YXJ0UmVjb3JkZXIoKSB7Ci0gICAgaWYgKHJlY29yZGVyKSB7Ci0gICAgICAgIHJlY29yZGVyLnN0 YXJ0KCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KK2Z1bmN0aW9uIHN0YXJ0QXVkaW8oKQor ewogICAgIG5hdmlnYXRvci5tZWRpYURldmljZXMuZ2V0VXNlck1lZGlhKHsgYXVkaW86IHRydWUg fSkKICAgICAudGhlbihnb3RNZWRpYSkKLSAgICAuY2F0Y2goZSA9PiB7IHdpbmRvdy53ZWJraXQu bWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNzYWdlKCJVc2VyTWVkaWEgRXJyb3I6 ICIgKyBlKTsgfSk7Ci19Ci0KLWZ1bmN0aW9uIHN0b3BSZWNvcmRlcigpIHsKLSAgICBpZiAocmVj b3JkZXIpCi0gICAgICAgIHJlY29yZGVyLnN0b3AoKTsKKyAgICAuY2F0Y2goZSA9PiB7IHdpbmRv dy53ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNzYWdlKCJzdGFydEF1 ZGlvIEVycm9yOiAiICsgZSk7IH0pOwogfQogCiA8L3NjcmlwdD4KKworPC9ib2R5PgogPC9odG1s Pgo=