229032 2021-08-12 04:04:22 -0700 [GTK] Simplify TestWebKitAccessibility 2021-08-20 03:23:54 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk, InRadar P2 Normal --- 1 cgarcia webkit-unassigned annulen bugs-noreply ews-watchlist gyuyoung.kim mcatanzaro mcrha ryuan.choi sergio webkit-bug-importer oldest_to_newest 1783777 0 cgarcia 2021-08-12 04:04:22 -0700 We don't really need to have a different process to test a11y. We can remove AccessibilityTestServer and use the same test executable. That way we don't need to spawn a process and use DBus for the communication. 1783781 1 435413 cgarcia 2021-08-12 04:09:00 -0700 Created attachment 435413 Patch 1783783 2 435414 cgarcia 2021-08-12 04:15:40 -0700 Created attachment 435414 Patch 1783809 3 435414 mcatanzaro 2021-08-12 06:26:38 -0700 Comment on attachment 435414 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=435414&action=review Heh, nice! > Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp:41 > + // We can get warnings from atspi when trying to connect to applications. > + Test::removeLogFatalFlag(G_LOG_LEVEL_WARNING); > int childCount = atspi_accessible_get_child_count(desktop.get(), nullptr); > + Test::addLogFatalFlag(G_LOG_LEVEL_WARNING); What sort of warnings? Certainly not failing the test is good to do, but they probably pollute the test log, don't they? 1783814 4 cgarcia 2021-08-12 06:48:33 -0700 (In reply to Michael Catanzaro from comment #3) > Comment on attachment 435414 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=435414&action=review > > Heh, nice! > > > Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp:41 > > + // We can get warnings from atspi when trying to connect to applications. > > + Test::removeLogFatalFlag(G_LOG_LEVEL_WARNING); > > int childCount = atspi_accessible_get_child_count(desktop.get(), nullptr); > > + Test::addLogFatalFlag(G_LOG_LEVEL_WARNING); > > What sort of warnings? > (TestWebKitAccessibility:23612): dbind-WARNING **: 09:35:59.141: AT-SPI: Unable to open bus connection: Failed to connect to socket /run/user/1001/at-spi2-12MT70/socket: No such file or directory > Certainly not failing the test is good to do, but they probably pollute the > test log, don't they? It happens once, it seems related to a specific app, it also happens when starting accerciser. 1783818 5 cgarcia 2021-08-12 06:53:54 -0700 Committed r280966 (240472@main): <https://commits.webkit.org/240472@main> 1783819 6 webkit-bug-importer 2021-08-12 06:54:17 -0700 <rdar://problem/81846710> 1784062 7 cgarcia 2021-08-13 02:18:39 -0700 (In reply to Carlos Garcia Campos from comment #4) > (In reply to Michael Catanzaro from comment #3) > > Comment on attachment 435414 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=435414&action=review > > > > Heh, nice! > > > > > Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp:41 > > > + // We can get warnings from atspi when trying to connect to applications. > > > + Test::removeLogFatalFlag(G_LOG_LEVEL_WARNING); > > > int childCount = atspi_accessible_get_child_count(desktop.get(), nullptr); > > > + Test::addLogFatalFlag(G_LOG_LEVEL_WARNING); > > > > What sort of warnings? > > > > (TestWebKitAccessibility:23612): dbind-WARNING **: 09:35:59.141: AT-SPI: > Unable to open bus connection: Failed to connect to socket > /run/user/1001/at-spi2-12MT70/socket: No such file or directory > > > Certainly not failing the test is good to do, but they probably pollute the > > test log, don't they? > > It happens once, it seems related to a specific app, it also happens when > starting accerciser. It turned out to be evolution that is replying to atspi GetApplicationBusAddress message with an invalid address. Any idea Milan? 1784071 8 cgarcia 2021-08-13 04:03:29 -0700 (In reply to Carlos Garcia Campos from comment #7) > (In reply to Carlos Garcia Campos from comment #4) > > (In reply to Michael Catanzaro from comment #3) > > > Comment on attachment 435414 [details] > > > Patch > > > > > > View in context: > > > https://bugs.webkit.org/attachment.cgi?id=435414&action=review > > > > > > Heh, nice! > > > > > > > Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp:41 > > > > + // We can get warnings from atspi when trying to connect to applications. > > > > + Test::removeLogFatalFlag(G_LOG_LEVEL_WARNING); > > > > int childCount = atspi_accessible_get_child_count(desktop.get(), nullptr); > > > > + Test::addLogFatalFlag(G_LOG_LEVEL_WARNING); > > > > > > What sort of warnings? > > > > > > > (TestWebKitAccessibility:23612): dbind-WARNING **: 09:35:59.141: AT-SPI: > > Unable to open bus connection: Failed to connect to socket > > /run/user/1001/at-spi2-12MT70/socket: No such file or directory > > > > > Certainly not failing the test is good to do, but they probably pollute the > > > test log, don't they? > > > > It happens once, it seems related to a specific app, it also happens when > > starting accerciser. > > It turned out to be evolution that is replying to atspi > GetApplicationBusAddress message with an invalid address. Any idea Milan? It happens with devhelp too... 1784187 9 mcatanzaro 2021-08-13 12:36:32 -0700 (In reply to Carlos Garcia Campos from comment #8) > It happens with devhelp too... Sounds like either GTK or WebKit itself is to blame then, right? I doubt devhelp has any a11y-related code at all. 1785768 10 cgarcia 2021-08-20 03:11:16 -0700 (In reply to Michael Catanzaro from comment #9) > (In reply to Carlos Garcia Campos from comment #8) > > It happens with devhelp too... > > Sounds like either GTK or WebKit itself is to blame then, right? I doubt > devhelp has any a11y-related code at all. I've found the common point, the WebKit bubblewrap sandbox. For some reason atk bridge is creating a dbus server for a socket path that is never created. I don't know what fails exactly, but I would say dbus_server_listen() should fail instead of returning a server for a socket path that doesn't actually exist. 1785773 11 cgarcia 2021-08-20 03:23:54 -0700 (In reply to Carlos Garcia Campos from comment #10) > (In reply to Michael Catanzaro from comment #9) > > (In reply to Carlos Garcia Campos from comment #8) > > > It happens with devhelp too... > > > > Sounds like either GTK or WebKit itself is to blame then, right? I doubt > > devhelp has any a11y-related code at all. > > I've found the common point, the WebKit bubblewrap sandbox. For some reason > atk bridge is creating a dbus server for a socket path that is never > created. I don't know what fails exactly, but I would say > dbus_server_listen() should fail instead of returning a server for a socket > path that doesn't actually exist. It seems the path exists right after the server is created, that's why it doesn't fail, but it's later removed. 435413 2021-08-12 04:09:00 -0700 2021-08-12 04:15:40 -0700 Patch wkgtk-a11y-test.diff text/plain 14355 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjM2Yw ODFkMDRmMjguLjI1ZGRjYTgyMGNlMyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA4LTEyICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBTaW1wbGlm eSBUZXN0V2ViS2l0QWNjZXNzaWJpbGl0eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MDMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgV2UgZG9uJ3QgcmVhbGx5IG5lZWQgdG8gaGF2ZSBhIGRpZmZlcmVu dCBwcm9jZXNzIHRvIHRlc3QgYTExeS4gV2UgY2FuIHJlbW92ZSBBY2Nlc3NpYmlsaXR5VGVzdFNl cnZlciBhbmQgdXNlIHRoZQorICAgICAgICBzYW1lIHRlc3QgZXhlY3V0YWJsZS4gVGhhdCB3YXkg d2UgZG9uJ3QgbmVlZCB0byBzcGF3biBhIHByb2Nlc3MgYW5kIHVzZSBEQnVzIGZvciB0aGUgY29t bXVuaWNhdGlvbi4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL0Fj Y2Vzc2liaWxpdHlUZXN0U2VydmVyLmNwcDogUmVtb3ZlZC4KKyAgICAgICAgKiBUZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdEd0ay9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eS5jcHA6CisgICAgICAg IChBY2Nlc3NpYmlsaXR5VGVzdDo6ZmluZFRlc3RBcHBsaWNhdGlvbik6IEZpbmQgdGhlIGFjY2Vz c2libGUgYXBwbGljYXRpb24gY29ycmVzcG9uZGluZyB0byB0aGUgdGVzdCBleGVjdXRhYmxlLgor ICAgICAgICAoQWNjZXNzaWJpbGl0eVRlc3Q6OndhaXRVbnRpbENoaWxkcmVuUmVtb3ZlZCk6IFVz ZSB0aGUgV2ViVmlld1Rlc3QgbWFpbiBsb29wLgorICAgICAgICAodGVzdEF0c3BpQmFzaWNIaWVy YXJjaHkpOiBVc2UgV2ViVmlld1Rlc3Q6OmxvYWRIdG1sLgorICAgICAgICAqIFRlc3RXZWJLaXRB UEkvZ2xpYi9QbGF0Zm9ybUdUSy5jbWFrZToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2dsaWIv V2ViS2l0R0xpYi9UZXN0TWFpbi5jcHA6CisgICAgICAgIChtYWluKTogU2V0IHRoZSBwcm9ncmFt IG5hbWUgdG8gdGhlIGV4ZWN1dGFibGUgbmFtZS4gSXQgaGVscHMgdG8gYTExeSB0ZXN0IHRvIGZp bmQgdGhlIGFjY2Vzc2libGUgYXBwLgorCiAyMDIxLTA4LTEyICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBydW4tZ3RrLXRlc3RzIGFs d2F5cyBmYWlscyB0byBzdGFydCBhY2Nlc3NpYmlsaXR5IGRhZW1vbnMKZGlmZiAtLWdpdCBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL0FjY2Vzc2liaWxpdHlUZXN0U2VydmVy LmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL0FjY2Vzc2liaWxpdHlU ZXN0U2VydmVyLmNwcApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNDI3MTUwN2UwZWVh Li4wMDAwMDAwMDAwMDAKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHdGsv QWNjZXNzaWJpbGl0eVRlc3RTZXJ2ZXIuY3BwCisrKyAvZGV2L251bGwKQEAgLTEsMTA3ICswLDAg QEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTIsIDIwMTkgSWdhbGlhIFMuTC4KLSAqCi0gKiBU aGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5k L29yCi0gKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVy YWwgUHVibGljCi0gKiBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBG b3VuZGF0aW9uOyBlaXRoZXIKLSAqIHZlcnNpb24gMiwxIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQg eW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgotICoKLSAqIFRoaXMgbGlicmFyeSBpcyBk aXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAotICogYnV0IFdJ VEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YK LSAqIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4g IFNlZSB0aGUgR05VCi0gKiBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUg ZGV0YWlscy4KLSAqCi0gKiBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBH TlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCi0gKiBhbG9uZyB3aXRoIHRoaXMgbGli cmFyeTsgc2VlIHRoZSBmaWxlIENPUFlJTkcuTElCLiAgSWYgbm90LCB3cml0ZSB0bwotICogdGhl IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0 aCBGbG9vciwKLSAqIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgotICovCi0KLSNpbmNsdWRl ICJjb25maWcuaCIKLQotI2luY2x1ZGUgPFdlYkNvcmUvR3RrVmVyc2lvbmluZy5oPgotI2luY2x1 ZGUgPHdlYmtpdDIvd2Via2l0Mi5oPgotI2luY2x1ZGUgPHd0Zi9nbGliL0dSZWZQdHIuaD4KLQot c3RhdGljIGNvbnN0IGNoYXIgaW50cm9zcGVjdGlvblhNTFtdID0KLSAgICAiPG5vZGU+IgotICAg ICIgPGludGVyZmFjZSBuYW1lPSdvcmcud2Via2l0Lmd0ay5BY2Nlc3NpYmlsaXR5VGVzdCc+Igot ICAgICIgIDxtZXRob2QgbmFtZT0nTG9hZEhUTUwnPiIKLSAgICAiICAgPGFyZyB0eXBlPSdzJyBu YW1lPSdodG1sJyBkaXJlY3Rpb249J2luJy8+IgotICAgICIgICA8YXJnIHR5cGU9J3MnIG5hbWU9 J2Jhc2VVUkknIGRpcmVjdGlvbj0naW4nLz4iCi0gICAgIiAgPC9tZXRob2Q+IgotICAgICIgPC9p bnRlcmZhY2U+IgotICAgICI8L25vZGU+IjsKLQotc3RhdGljIHZvaWQgbG9hZENoYW5nZWRDYWxs YmFjayhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXRMb2FkRXZlbnQgbG9hZEV2ZW50LCBH REJ1c01ldGhvZEludm9jYXRpb24qIGludm9jYXRpb24pCi17Ci0gICAgaWYgKGxvYWRFdmVudCAh PSBXRUJLSVRfTE9BRF9GSU5JU0hFRCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgZ19zaWduYWxf aGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5jKHdlYlZpZXcsIHJlaW50ZXJwcmV0X2Nhc3Q8dm9p ZCo+KGxvYWRDaGFuZ2VkQ2FsbGJhY2spLCBpbnZvY2F0aW9uKTsKLSAgICBnX2RidXNfbWV0aG9k X2ludm9jYXRpb25fcmV0dXJuX3ZhbHVlKGludm9jYXRpb24sIG51bGxwdHIpOwotfQotCi1zdGF0 aWMgY29uc3QgR0RCdXNJbnRlcmZhY2VWVGFibGUgaW50ZXJmYWNlVmlydHVhbFRhYmxlID0gewot ICAgIC8vIG1ldGhvZENhbGwKLSAgICBbXShHREJ1c0Nvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIGNv bnN0IGNoYXIqIHNlbmRlciwgY29uc3QgY2hhciogb2JqZWN0UGF0aCwgY29uc3QgY2hhciogaW50 ZXJmYWNlTmFtZSwgY29uc3QgY2hhciogbWV0aG9kTmFtZSwgR1ZhcmlhbnQqIHBhcmFtZXRlcnMs IEdEQnVzTWV0aG9kSW52b2NhdGlvbiogaW52b2NhdGlvbiwgZ3BvaW50ZXIgdXNlckRhdGEpIHsK LSAgICAgICAgaWYgKGdfc3RyY21wMChpbnRlcmZhY2VOYW1lLCAib3JnLndlYmtpdC5ndGsuQWNj ZXNzaWJpbGl0eVRlc3QiKSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBhdXRvKiB3 ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXKHVzZXJEYXRhKTsKLQotICAgICAgICBpZiAoIWdfc3Ry Y21wMChtZXRob2ROYW1lLCAiTG9hZEhUTUwiKSkgewotICAgICAgICAgICAgY29uc3QgY2hhciog aHRtbDsKLSAgICAgICAgICAgIGNvbnN0IGNoYXIqIGJhc2VVUkk7Ci0gICAgICAgICAgICBnX3Zh cmlhbnRfZ2V0KHBhcmFtZXRlcnMsICIoJnMmcykiLCAmaHRtbCwgJmJhc2VVUkkpOwotICAgICAg ICAgICAgZ19zaWduYWxfY29ubmVjdCh3ZWJWaWV3LCAibG9hZC1jaGFuZ2VkIiwgR19DQUxMQkFD Syhsb2FkQ2hhbmdlZENhbGxiYWNrKSwgaW52b2NhdGlvbik7Ci0gICAgICAgICAgICB3ZWJraXRf d2ViX3ZpZXdfbG9hZF9odG1sKHdlYlZpZXcsIGh0bWwsIGJhc2VVUkkgJiYgKmJhc2VVUkkgPyBi YXNlVVJJIDogbnVsbHB0cik7Ci0gICAgICAgIH0KLSAgICB9LAotICAgIG51bGxwdHIsCi0gICAg bnVsbHB0ciwKLSAgICB7IDAsIH0KLX07Ci0KLWludCBtYWluKGludCBhcmdjLCBjaGFyKiogYXJn dikKLXsKLSAgICAvLyBNYWtlIHN1cmUgdGhhdCB0aGUgQVRLIGJyaWRnZSBpcyBsb2FkZWQuCi0g ICAgZ19zZXRlbnYoIkdUS19NT0RVTEVTIiwgImF0ay1icmlkZ2UiLCBUUlVFKTsKLSAgICBnX3Nl dGVudigiV0VCS0lUX0VYRUNfUEFUSCIsIFdFQktJVF9FWEVDX1BBVEgsIEZBTFNFKTsKLSAgICBn X3NldGVudigiV0VCS0lUX0lOSkVDVEVEX0JVTkRMRV9QQVRIIiwgV0VCS0lUX0lOSkVDVEVEX0JV TkRMRV9QQVRILCBGQUxTRSk7Ci0KLSAgICBndGtfaW5pdCgmYXJnYywgJmFyZ3YpOwotCi0gICAg R3RrV2lkZ2V0KiB3ZWJWaWV3ID0gd2Via2l0X3dlYl92aWV3X25ldygpOwotI2lmIFVTRShHVEs0 KQotICAgIEd0a1dpZGdldCogd2luZG93ID0gZ3RrX3dpbmRvd19uZXcoKTsKLSAgICBndGtfd2lu ZG93X3NldF9jaGlsZChHVEtfV0lORE9XKHdpbmRvdyksIEdUS19XSURHRVQod2ViVmlldykpOwot I2Vsc2UKLSAgICBHdGtXaWRnZXQqIHdpbmRvdyA9IGd0a193aW5kb3dfbmV3KEdUS19XSU5ET1df VE9QTEVWRUwpOwotICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2luZG93LCAiZGVsZXRlLWV2ZW50Iiwg R19DQUxMQkFDSyhndGtfbWFpbl9xdWl0KSwgbnVsbHB0cik7Ci0gICAgZ3RrX2NvbnRhaW5lcl9h ZGQoR1RLX0NPTlRBSU5FUih3aW5kb3cpLCBHVEtfV0lER0VUKHdlYlZpZXcpKTsKLSAgICBndGtf d2lkZ2V0X3Nob3coR1RLX1dJREdFVCh3ZWJWaWV3KSk7Ci0jZW5kaWYKLSAgICBndGtfd2lkZ2V0 X3Nob3cod2luZG93KTsKLQotICAgIHByaW50ZiAoIkRCRzogY29ubmVjdCB0byAlc1xuIiwgYXJn dlsxXSk7Ci0gICAgZ19kYnVzX2Nvbm5lY3Rpb25fbmV3X2Zvcl9hZGRyZXNzKGFyZ3ZbMV0sIEdf REJVU19DT05ORUNUSU9OX0ZMQUdTX0FVVEhFTlRJQ0FUSU9OX0NMSUVOVCwgbnVsbHB0ciwgbnVs bHB0ciwKLSAgICAgICAgW10oR09iamVjdCosIEdBc3luY1Jlc3VsdCogcmVzdWx0LCBncG9pbnRl ciB1c2VyRGF0YSkgewotICAgICAgICAgICAgR0RCdXNDb25uZWN0aW9uKiBjb25uZWN0aW9uID0g Z19kYnVzX2Nvbm5lY3Rpb25fbmV3X2Zvcl9hZGRyZXNzX2ZpbmlzaChyZXN1bHQsIG51bGxwdHIp OwotCi0gICAgICAgICAgICBzdGF0aWMgR0RCdXNOb2RlSW5mbyAqaW50cm9zcGVjdGlvbkRhdGEg PSBudWxscHRyOwotICAgICAgICAgICAgaWYgKCFpbnRyb3NwZWN0aW9uRGF0YSkKLSAgICAgICAg ICAgICAgICBpbnRyb3NwZWN0aW9uRGF0YSA9IGdfZGJ1c19ub2RlX2luZm9fbmV3X2Zvcl94bWwo aW50cm9zcGVjdGlvblhNTCwgbnVsbHB0cik7Ci0KLSAgICAgICAgICAgIGdfZGJ1c19jb25uZWN0 aW9uX3JlZ2lzdGVyX29iamVjdChjb25uZWN0aW9uLCAiL29yZy93ZWJraXQvZ3RrL0FjY2Vzc2li aWxpdHlUZXN0IiwgaW50cm9zcGVjdGlvbkRhdGEtPmludGVyZmFjZXNbMF0sCi0gICAgICAgICAg ICAgICAgJmludGVyZmFjZVZpcnR1YWxUYWJsZSwgdXNlckRhdGEsIG51bGxwdHIsIG51bGxwdHIp OwotICAgICAgICAgICAgcHJpbnRmICgiREJHOiBvYmplY3QgcmVnaXN0cmVkXG4iKTsKLSAgICAg ICAgfSwgd2ViVmlldyk7Ci0KLSNpZiBVU0UoR1RLNCkKLSAgICBHUmVmUHRyPEdNYWluTG9vcD4g bG9vcCA9IGFkb3B0R1JlZihnX21haW5fbG9vcF9uZXcobnVsbHB0ciwgVFJVRSkpOwotICAgIGdf bWFpbl9sb29wX3J1bihsb29wLmdldCgpKTsKLSNlbHNlCi0gICAgZ3RrX21haW4oKTsKLSNlbmRp ZgotfQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHdGsvVGVz dFdlYktpdEFjY2Vzc2liaWxpdHkuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRHdGsvVGVzdFdlYktpdEFjY2Vzc2liaWxpdHkuY3BwCmluZGV4IGU3YjViZDdiM2E5Yi4uMWE0 NTZiODBkMzgxIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEd0 ay9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eS5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRHdGsvVGVzdFdlYktpdEFjY2Vzc2liaWxpdHkuY3BwCkBAIC0xOSw1OCArMTks MjkgQEAKIAogI2luY2x1ZGUgImNvbmZpZy5oIgogCi0jaW5jbHVkZSAiVGVzdE1haW4uaCIKKyNp bmNsdWRlICJXZWJWaWV3VGVzdC5oIgogCiAvLyBUaGUgbGliYXRzcGkgaGVhZGVycyBkb24ndCB1 c2UgR19CRUdJTl9ERUNMUwogZXh0ZXJuICJDIiB7CiAjaW5jbHVkZSA8YXRzcGkvYXRzcGkuaD4K IH0KIAotY2xhc3MgQWNjZXNzaWJpbGl0eVRlc3QgOiBwdWJsaWMgVGVzdCB7CitjbGFzcyBBY2Nl c3NpYmlsaXR5VGVzdCA6IHB1YmxpYyBXZWJWaWV3VGVzdCB7CiBwdWJsaWM6CiAgICAgTUFLRV9H TElCX1RFU1RfRklYVFVSRShBY2Nlc3NpYmlsaXR5VGVzdCk7CiAKLSAgICBBY2Nlc3NpYmlsaXR5 VGVzdCgpCisgICAgR1JlZlB0cjxBdHNwaUFjY2Vzc2libGU+IGZpbmRUZXN0QXBwbGljYXRpb24o KQogICAgIHsKLSAgICAgICAgR1VuaXF1ZVB0cjxjaGFyPiB0ZXN0U2VydmVyUGF0aChnX2J1aWxk X2ZpbGVuYW1lKFdFQktJVF9FWEVDX1BBVEgsICJUZXN0V2ViS2l0QVBJIiwgIldlYktpdDJHdGsi LCAiQWNjZXNzaWJpbGl0eVRlc3RTZXJ2ZXIiLCBudWxscHRyKSk7Ci0gICAgICAgIGNoYXIqIGFy Z3NbM107Ci0gICAgICAgIGFyZ3NbMF0gPSB0ZXN0U2VydmVyUGF0aC5nZXQoKTsKLSAgICAgICAg YXJnc1sxXSA9IGNvbnN0X2Nhc3Q8Y2hhcio+KGdfZGJ1c19zZXJ2ZXJfZ2V0X2NsaWVudF9hZGRy ZXNzKHNfZGJ1c1NlcnZlci5nZXQoKSkpOwotICAgICAgICBhcmdzWzJdID0gbnVsbHB0cjsKLQot ICAgICAgICBnX2Fzc2VydF90cnVlKGdfc3Bhd25fYXN5bmMobnVsbHB0ciwgYXJncywgbnVsbHB0 ciwgR19TUEFXTl9ERUZBVUxULCBudWxscHRyLCBudWxscHRyLCAmbV9jaGlsZFByb2Nlc3NJRCwg bnVsbHB0cikpOwotICAgICAgICBnX3VzbGVlcCgxICogR19VU0VDX1BFUl9TRUMpOwotICAgIH0K LQotICAgIH5BY2Nlc3NpYmlsaXR5VGVzdCgpCi0gICAgewotICAgICAgICBpZiAobV9jaGlsZFBy b2Nlc3NJRCkgewotICAgICAgICAgICAgZ19zcGF3bl9jbG9zZV9waWQobV9jaGlsZFByb2Nlc3NJ RCk7Ci0gICAgICAgICAgICBraWxsKG1fY2hpbGRQcm9jZXNzSUQsIFNJR1RFUk0pOwotICAgICAg ICB9Ci0gICAgfQotCi0gICAgdm9pZCBsb2FkSFRNTEFuZFdhaXRVbnRpbEZpbmlzaGVkKGNvbnN0 IGNoYXIqIGh0bWwsIGNvbnN0IGNoYXIqIGJhc2VVUkkpCi0gICAgewotICAgICAgICBlbnN1cmVQ cm94eSgpOwotCi0gICAgICAgIEdVbmlxdWVPdXRQdHI8R0Vycm9yPiBlcnJvcjsKLSAgICAgICAg R1JlZlB0cjxHVmFyaWFudD4gcmVzdWx0ID0gYWRvcHRHUmVmKGdfZGJ1c19wcm94eV9jYWxsX3N5 bmMobV9wcm94eS5nZXQoKSwgIkxvYWRIVE1MIiwKLSAgICAgICAgICAgIGdfdmFyaWFudF9uZXco IihzcykiLCBodG1sLCBiYXNlVVJJID8gYmFzZVVSSSA6ICIiKSwgR19EQlVTX0NBTExfRkxBR1Nf Tk9ORSwgLTEsIG51bGxwdHIsICZlcnJvci5vdXRQdHIoKSkpOwotICAgICAgICBnX2Fzc2VydF9u b19lcnJvcihlcnJvci5nZXQoKSk7Ci0gICAgfQotCi0gICAgR1JlZlB0cjxBdHNwaUFjY2Vzc2li bGU+IGZpbmRUZXN0U2VydmVyQXBwbGljYXRpb24oKQotICAgIHsKLSAgICAgICAgVGVzdDo6cmVt b3ZlTG9nRmF0YWxGbGFnKEdfTE9HX0xFVkVMX1dBUk5JTkcpOwogICAgICAgICAvLyBPbmx5IG9u ZSBkZXNrdG9wIGlzIHN1cHBvcnRlZCBieSBBVFNQSSBhdCB0aGUgbW9tZW50LgogICAgICAgICBH UmVmUHRyPEF0c3BpQWNjZXNzaWJsZT4gZGVza3RvcCA9IGFkb3B0R1JlZihhdHNwaV9nZXRfZGVz a3RvcCgwKSk7CiAKKyAgICAgICAgLy8gV2UgY2FuIGdldCB3YXJuaW5ncyBmcm9tIGF0c3BpIHdo ZW4gdHJ5aW5nIHRvIGNvbm5lY3QgdG8gYXBwbGljYXRpb25zLgorICAgICAgICBUZXN0OjpyZW1v dmVMb2dGYXRhbEZsYWcoR19MT0dfTEVWRUxfV0FSTklORyk7CiAgICAgICAgIGludCBjaGlsZENv dW50ID0gYXRzcGlfYWNjZXNzaWJsZV9nZXRfY2hpbGRfY291bnQoZGVza3RvcC5nZXQoKSwgbnVs bHB0cik7CiAgICAgICAgIFRlc3Q6OmFkZExvZ0ZhdGFsRmxhZyhHX0xPR19MRVZFTF9XQVJOSU5H KTsKICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBjaGlsZENvdW50OyArK2kpIHsKICAgICAg ICAgICAgIEdSZWZQdHI8QXRzcGlBY2Nlc3NpYmxlPiBjdXJyZW50ID0gYWRvcHRHUmVmKGF0c3Bp X2FjY2Vzc2libGVfZ2V0X2NoaWxkX2F0X2luZGV4KGRlc2t0b3AuZ2V0KCksIGksIG51bGxwdHIp KTsKLSAgICAgICAgICAgIGlmICghZ19zdHJjbXAwKGF0c3BpX2FjY2Vzc2libGVfZ2V0X25hbWUo Y3VycmVudC5nZXQoKSwgbnVsbHB0ciksICJBY2Nlc3NpYmlsaXR5VGVzdFNlcnZlciIpKQorICAg ICAgICAgICAgaWYgKCFnX3N0cmNtcDAoYXRzcGlfYWNjZXNzaWJsZV9nZXRfbmFtZShjdXJyZW50 LmdldCgpLCBudWxscHRyKSwgIlRlc3RXZWJLaXRBY2Nlc3NpYmlsaXR5IikpCiAgICAgICAgICAg ICAgICAgcmV0dXJuIGN1cnJlbnQ7CiAgICAgICAgIH0KIApAQCAtMTEwLDQ2ICs4MSwyMSBAQCBw dWJsaWM6CiAgICAgICAgICAgICBbXShBdHNwaUV2ZW50KiBldmVudCwgZ3BvaW50ZXIgdXNlckRh dGEpIHsKICAgICAgICAgICAgICAgICBhdXRvKiB0ZXN0ID0gc3RhdGljX2Nhc3Q8QWNjZXNzaWJp bGl0eVRlc3QqPih1c2VyRGF0YSk7CiAgICAgICAgICAgICAgICAgaWYgKGV2ZW50LT5zb3VyY2Ug PT0gdGVzdC0+bV9ldmVudFNvdXJjZSkKLSAgICAgICAgICAgICAgICAgICAgZ19tYWluX2xvb3Bf cXVpdCh0ZXN0LT5tX21haW5Mb29wLmdldCgpKTsKKyAgICAgICAgICAgICAgICAgICAgZ19tYWlu X2xvb3BfcXVpdCh0ZXN0LT5tX21haW5Mb29wKTsKICAgICAgICAgfSwgdGhpcywgbnVsbHB0cikp OwogICAgICAgICBhdHNwaV9ldmVudF9saXN0ZW5lcl9yZWdpc3RlcihsaXN0ZW5lci5nZXQoKSwg Im9iamVjdDpjaGlsZHJlbi1jaGFuZ2VkOnJlbW92ZSIsIG51bGxwdHIpOwotICAgICAgICBnX21h aW5fbG9vcF9ydW4obV9tYWluTG9vcC5nZXQoKSk7CisgICAgICAgIGdfbWFpbl9sb29wX3J1biht X21haW5Mb29wKTsKICAgICAgICAgbV9ldmVudFNvdXJjZSA9IG51bGxwdHI7CiAgICAgfQogCiBw cml2YXRlOgotICAgIHZvaWQgZW5zdXJlUHJveHkoKQotICAgIHsKLSAgICAgICAgaWYgKG1fcHJv eHkpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgbV9tYWluTG9vcCA9IGFkb3B0R1Jl ZihnX21haW5fbG9vcF9uZXcobnVsbHB0ciwgRkFMU0UpKTsKLQotICAgICAgICBpZiAoc19kYnVz Q29ubmVjdGlvbnMuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICBnX2lkbGVfYWRkKFtdKGdwb2lu dGVyIHVzZXJEYXRhKSAtPiBnYm9vbGVhbiB7Ci0gICAgICAgICAgICAgICAgaWYgKHNfZGJ1c0Nv bm5lY3Rpb25zLmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFRSVUU7Ci0K LSAgICAgICAgICAgICAgICBnX21haW5fbG9vcF9xdWl0KHN0YXRpY19jYXN0PEdNYWluTG9vcCo+ KHVzZXJEYXRhKSk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIEZBTFNFOwotICAgICAgICAgICAg fSwgbV9tYWluTG9vcC5nZXQoKSk7Ci0gICAgICAgICAgICBnX21haW5fbG9vcF9ydW4obV9tYWlu TG9vcC5nZXQoKSk7Ci0gICAgICAgIH0KLQotICAgICAgICBtX3Byb3h5ID0gYWRvcHRHUmVmKGdf ZGJ1c19wcm94eV9uZXdfc3luYyhzX2RidXNDb25uZWN0aW9uc1swXS5nZXQoKSwgc3RhdGljX2Nh c3Q8R0RCdXNQcm94eUZsYWdzPihHX0RCVVNfUFJPWFlfRkxBR1NfRE9fTk9UX0xPQURfUFJPUEVS VElFUyB8IEdfREJVU19QUk9YWV9GTEFHU19ET19OT1RfQ09OTkVDVF9TSUdOQUxTKSwKLSAgICAg ICAgICAgIG51bGxwdHIsIG51bGxwdHIsICIvb3JnL3dlYmtpdC9ndGsvQWNjZXNzaWJpbGl0eVRl c3QiLCAib3JnLndlYmtpdC5ndGsuQWNjZXNzaWJpbGl0eVRlc3QiLCBudWxscHRyLCBudWxscHRy KSk7Ci0gICAgICAgIGdfYXNzZXJ0X3RydWUoR19JU19EQlVTX1BST1hZKG1fcHJveHkuZ2V0KCkp KTsKLSAgICB9Ci0KLSAgICBHUGlkIG1fY2hpbGRQcm9jZXNzSUQgeyAwIH07Ci0gICAgR1JlZlB0 cjxHREJ1c1Byb3h5PiBtX3Byb3h5OwotICAgIEdSZWZQdHI8R01haW5Mb29wPiBtX21haW5Mb29w OwogICAgIEF0c3BpQWNjZXNzaWJsZSogbV9ldmVudFNvdXJjZSB7IG51bGxwdHIgfTsKIH07CiAK IHN0YXRpYyB2b2lkIHRlc3RBdHNwaUJhc2ljSGllcmFyY2h5KEFjY2Vzc2liaWxpdHlUZXN0KiB0 ZXN0LCBnY29uc3Rwb2ludGVyKQogewotICAgIHRlc3QtPmxvYWRIVE1MQW5kV2FpdFVudGlsRmlu aXNoZWQoCisgICAgdGVzdC0+c2hvd0luV2luZG93KCk7CisgICAgdGVzdC0+bG9hZEh0bWwoCiAg ICAgICAgICI8aHRtbD4iCiAgICAgICAgICIgIDxib2R5PiIKICAgICAgICAgIiAgIDxoMT5UaGlz IGlzIGEgdGVzdDwvaDE+IgpAQCAtMTU4LDE0ICsxMDQsMTUgQEAgc3RhdGljIHZvaWQgdGVzdEF0 c3BpQmFzaWNIaWVyYXJjaHkoQWNjZXNzaWJpbGl0eVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIp CiAgICAgICAgICIgIDwvYm9keT4iCiAgICAgICAgICI8L2h0bWw+IiwKICAgICAgICAgbnVsbHB0 cik7CisgICAgdGVzdC0+d2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CiAKLSAgICBhdXRvIHRlc3RT ZXJ2ZXJBcHAgPSB0ZXN0LT5maW5kVGVzdFNlcnZlckFwcGxpY2F0aW9uKCk7Ci0gICAgZ19hc3Nl cnRfdHJ1ZShBVFNQSV9JU19BQ0NFU1NJQkxFKHRlc3RTZXJ2ZXJBcHAuZ2V0KCkpKTsKLSAgICBH VW5pcXVlUHRyPGNoYXI+IG5hbWUoYXRzcGlfYWNjZXNzaWJsZV9nZXRfbmFtZSh0ZXN0U2VydmVy QXBwLmdldCgpLCBudWxscHRyKSk7Ci0gICAgZ19hc3NlcnRfY21wc3RyKG5hbWUuZ2V0KCksID09 LCAiQWNjZXNzaWJpbGl0eVRlc3RTZXJ2ZXIiKTsKLSAgICBnX2Fzc2VydF9jbXBpbnQoYXRzcGlf YWNjZXNzaWJsZV9nZXRfcm9sZSh0ZXN0U2VydmVyQXBwLmdldCgpLCBudWxscHRyKSwgPT0sIEFU U1BJX1JPTEVfQVBQTElDQVRJT04pOworICAgIGF1dG8gdGVzdEFwcCA9IHRlc3QtPmZpbmRUZXN0 QXBwbGljYXRpb24oKTsKKyAgICBnX2Fzc2VydF90cnVlKEFUU1BJX0lTX0FDQ0VTU0lCTEUodGVz dEFwcC5nZXQoKSkpOworICAgIEdVbmlxdWVQdHI8Y2hhcj4gbmFtZShhdHNwaV9hY2Nlc3NpYmxl X2dldF9uYW1lKHRlc3RBcHAuZ2V0KCksIG51bGxwdHIpKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIo bmFtZS5nZXQoKSwgPT0sICJUZXN0V2ViS2l0QWNjZXNzaWJpbGl0eSIpOworICAgIGdfYXNzZXJ0 X2NtcGludChhdHNwaV9hY2Nlc3NpYmxlX2dldF9yb2xlKHRlc3RBcHAuZ2V0KCksIG51bGxwdHIp LCA9PSwgQVRTUElfUk9MRV9BUFBMSUNBVElPTik7CiAKLSAgICBhdXRvIHJvb3RPYmplY3QgPSB0 ZXN0LT5maW5kUm9vdE9iamVjdCh0ZXN0U2VydmVyQXBwLmdldCgpKTsKKyAgICBhdXRvIHJvb3RP YmplY3QgPSB0ZXN0LT5maW5kUm9vdE9iamVjdCh0ZXN0QXBwLmdldCgpKTsKICAgICBnX2Fzc2Vy dF90cnVlKEFUU1BJX0lTX0FDQ0VTU0lCTEUocm9vdE9iamVjdC5nZXQoKSkpOwogICAgIGdfYXNz ZXJ0X2NtcGludChhdHNwaV9hY2Nlc3NpYmxlX2dldF9yb2xlKHJvb3RPYmplY3QuZ2V0KCksIG51 bGxwdHIpLCA9PSwgQVRTUElfUk9MRV9GSUxMRVIpOwogCkBAIC0xOTcsNyArMTQ0LDcgQEAgc3Rh dGljIHZvaWQgdGVzdEF0c3BpQmFzaWNIaWVyYXJjaHkoQWNjZXNzaWJpbGl0eVRlc3QqIHRlc3Qs IGdjb25zdHBvaW50ZXIpCiAgICAgZ19hc3NlcnRfY21wc3RyKG5hbWUuZ2V0KCksID09LCAiYSBs aW5rIik7CiAgICAgZ19hc3NlcnRfY21waW50KGF0c3BpX2FjY2Vzc2libGVfZ2V0X3JvbGUobGlu ay5nZXQoKSwgbnVsbHB0ciksID09LCBBVFNQSV9ST0xFX0xJTkspOwogCi0gICAgdGVzdC0+bG9h ZEhUTUxBbmRXYWl0VW50aWxGaW5pc2hlZCgKKyAgICB0ZXN0LT5sb2FkSHRtbCgKICAgICAgICAg IjxodG1sPiIKICAgICAgICAgIiAgPGJvZHk+IgogICAgICAgICAiICAgPGgxPlRoaXMgaXMgYW5v dGhlciB0ZXN0PC9oMT4iCkBAIC0yMDUsMTIgKzE1MiwxMSBAQCBzdGF0aWMgdm9pZCB0ZXN0QXRz cGlCYXNpY0hpZXJhcmNoeShBY2Nlc3NpYmlsaXR5VGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikK ICAgICAgICAgIiAgPC9ib2R5PiIKICAgICAgICAgIjwvaHRtbD4iLAogICAgICAgICBudWxscHRy KTsKLQogICAgIC8vIENoZWNrIHRoYXQgY2hpbGRyZW4tY2hhbmdlZDo6cmVtb3ZlIGlzIGVtaXR0 ZWQgb24gdGhlIHJvb3Qgb2JqZWN0IG9uIG5hdmlnYXRpb24sCiAgICAgLy8gYW5kIHRoZSBhMTF5 IGhpZXJhcmNoeSBpcyB1cGRhdGVkLgogICAgIHRlc3QtPndhaXRVbnRpbENoaWxkcmVuUmVtb3Zl ZChyb290T2JqZWN0LmdldCgpKTsKIAotICAgIGRvY3VtZW50V2ViID0gdGVzdC0+ZmluZERvY3Vt ZW50V2ViKHRlc3RTZXJ2ZXJBcHAuZ2V0KCkpOworICAgIGRvY3VtZW50V2ViID0gdGVzdC0+Zmlu ZERvY3VtZW50V2ViKHRlc3RBcHAuZ2V0KCkpOwogICAgIGdfYXNzZXJ0X3RydWUoQVRTUElfSVNf QUNDRVNTSUJMRShkb2N1bWVudFdlYi5nZXQoKSkpOwogICAgIGdfYXNzZXJ0X2NtcGludChhdHNw aV9hY2Nlc3NpYmxlX2dldF9yb2xlKGRvY3VtZW50V2ViLmdldCgpLCBudWxscHRyKSwgPT0sIEFU U1BJX1JPTEVfRE9DVU1FTlRfV0VCKTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQ SS9nbGliL1BsYXRmb3JtR1RLLmNtYWtlIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1BsYXRm b3JtR1RLLmNtYWtlCmluZGV4IGY2MDMzMzBhZmVjNy4uYzVhMzk5MTc0MWQwIDEwMDY0NAotLS0g YS9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvUGxhdGZvcm1HVEsuY21ha2UKKysrIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9nbGliL1BsYXRmb3JtR1RLLmNtYWtlCkBAIC00OCw2ICs0OCw1IEBAIEFE RF9XSzJfVEVTVChUZXN0V2ViS2l0VmVyc2lvbiAke1RPT0xTX0RJUn0vVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRHdGsvVGVzdFdlCiBBRERfV0syX1RFU1QoVGVzdFdlYlZpZXdFZGl0b3IgJHtU T09MU19ESVJ9L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL1Rlc3RXZWJWaWV3RWRpdG9y LmNwcCkKIAogaWYgKEFUU1BJX0ZPVU5EKQotICAgIEFERF9XSzJfVEVTVChBY2Nlc3NpYmlsaXR5 VGVzdFNlcnZlciAke1RPT0xTX0RJUn0vVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHdGsvQWNj ZXNzaWJpbGl0eVRlc3RTZXJ2ZXIuY3BwKQogICAgIEFERF9XSzJfVEVTVChUZXN0V2ViS2l0QWNj ZXNzaWJpbGl0eSAke1RPT0xTX0RJUn0vVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHdGsvVGVz dFdlYktpdEFjY2Vzc2liaWxpdHkuY3BwKQogZW5kaWYgKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1Rlc3RNYWluLmNwcCBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvZ2xpYi9XZWJLaXRHTGliL1Rlc3RNYWluLmNwcAppbmRleCBlODk2ZjdhZTE1ZjAuLjNi YjBjMjFmODExOSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdM aWIvVGVzdE1haW4uY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGli L1Rlc3RNYWluLmNwcApAQCAtMjEsNiArMjEsNyBAQAogI2luY2x1ZGUgIlRlc3RNYWluLmgiCiAK ICNpbmNsdWRlIDxnbGliL2dzdGRpby5oPgorI2luY2x1ZGUgPHd0Zi9nbGliL0dMaWJVdGlsaXRp ZXMuaD4KIAogI2lmIFBMQVRGT1JNKEdUSykKICNpbmNsdWRlIDxndGsvZ3RrLmg+CkBAIC0xMjMs NiArMTI0LDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogI2Vsc2UKICAgICBn X3Rlc3RfaW5pdCgmYXJnYywgJmFyZ3YsIG51bGxwdHIpOwogI2VuZGlmCisgICAgZ19zZXRfcHJn bmFtZShnZXRDdXJyZW50RXhlY3V0YWJsZU5hbWUoKS5kYXRhKCkpOwogICAgIGdfc2V0ZW52KCJX RUJLSVRfRVhFQ19QQVRIIiwgV0VCS0lUX0VYRUNfUEFUSCwgRkFMU0UpOwogICAgIGdfc2V0ZW52 KCJXRUJLSVRfSU5KRUNURURfQlVORExFX1BBVEgiLCBXRUJLSVRfSU5KRUNURURfQlVORExFX1BB VEgsIEZBTFNFKTsKICAgICBnX3NldGVudigiTENfQUxMIiwgIkMiLCBUUlVFKTsK 435414 2021-08-12 04:15:40 -0700 2021-08-12 06:26:38 -0700 Patch wkgtk-a11y-test.diff text/plain 14022 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjM2Yw ODFkMDRmMjguLjI1ZGRjYTgyMGNlMyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA4LTEyICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBTaW1wbGlm eSBUZXN0V2ViS2l0QWNjZXNzaWJpbGl0eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MDMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgV2UgZG9uJ3QgcmVhbGx5IG5lZWQgdG8gaGF2ZSBhIGRpZmZlcmVu dCBwcm9jZXNzIHRvIHRlc3QgYTExeS4gV2UgY2FuIHJlbW92ZSBBY2Nlc3NpYmlsaXR5VGVzdFNl cnZlciBhbmQgdXNlIHRoZQorICAgICAgICBzYW1lIHRlc3QgZXhlY3V0YWJsZS4gVGhhdCB3YXkg d2UgZG9uJ3QgbmVlZCB0byBzcGF3biBhIHByb2Nlc3MgYW5kIHVzZSBEQnVzIGZvciB0aGUgY29t bXVuaWNhdGlvbi4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL0Fj Y2Vzc2liaWxpdHlUZXN0U2VydmVyLmNwcDogUmVtb3ZlZC4KKyAgICAgICAgKiBUZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdEd0ay9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eS5jcHA6CisgICAgICAg IChBY2Nlc3NpYmlsaXR5VGVzdDo6ZmluZFRlc3RBcHBsaWNhdGlvbik6IEZpbmQgdGhlIGFjY2Vz c2libGUgYXBwbGljYXRpb24gY29ycmVzcG9uZGluZyB0byB0aGUgdGVzdCBleGVjdXRhYmxlLgor ICAgICAgICAoQWNjZXNzaWJpbGl0eVRlc3Q6OndhaXRVbnRpbENoaWxkcmVuUmVtb3ZlZCk6IFVz ZSB0aGUgV2ViVmlld1Rlc3QgbWFpbiBsb29wLgorICAgICAgICAodGVzdEF0c3BpQmFzaWNIaWVy YXJjaHkpOiBVc2UgV2ViVmlld1Rlc3Q6OmxvYWRIdG1sLgorICAgICAgICAqIFRlc3RXZWJLaXRB UEkvZ2xpYi9QbGF0Zm9ybUdUSy5jbWFrZToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2dsaWIv V2ViS2l0R0xpYi9UZXN0TWFpbi5jcHA6CisgICAgICAgIChtYWluKTogU2V0IHRoZSBwcm9ncmFt IG5hbWUgdG8gdGhlIGV4ZWN1dGFibGUgbmFtZS4gSXQgaGVscHMgdG8gYTExeSB0ZXN0IHRvIGZp bmQgdGhlIGFjY2Vzc2libGUgYXBwLgorCiAyMDIxLTA4LTEyICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBydW4tZ3RrLXRlc3RzIGFs d2F5cyBmYWlscyB0byBzdGFydCBhY2Nlc3NpYmlsaXR5IGRhZW1vbnMKZGlmZiAtLWdpdCBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL0FjY2Vzc2liaWxpdHlUZXN0U2VydmVy LmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL0FjY2Vzc2liaWxpdHlU ZXN0U2VydmVyLmNwcApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggYzgyYWFiODQ2OTll Li4wMDAwMDAwMDAwMDAKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHdGsv QWNjZXNzaWJpbGl0eVRlc3RTZXJ2ZXIuY3BwCisrKyAvZGV2L251bGwKQEAgLTEsMTAzICswLDAg QEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTIsIDIwMTkgSWdhbGlhIFMuTC4KLSAqCi0gKiBU aGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5k L29yCi0gKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVy YWwgUHVibGljCi0gKiBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBG b3VuZGF0aW9uOyBlaXRoZXIKLSAqIHZlcnNpb24gMiwxIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQg eW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgotICoKLSAqIFRoaXMgbGlicmFyeSBpcyBk aXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAotICogYnV0IFdJ VEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YK LSAqIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4g IFNlZSB0aGUgR05VCi0gKiBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUg ZGV0YWlscy4KLSAqCi0gKiBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBH TlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCi0gKiBhbG9uZyB3aXRoIHRoaXMgbGli cmFyeTsgc2VlIHRoZSBmaWxlIENPUFlJTkcuTElCLiAgSWYgbm90LCB3cml0ZSB0bwotICogdGhl IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0 aCBGbG9vciwKLSAqIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgotICovCi0KLSNpbmNsdWRl ICJjb25maWcuaCIKLQotI2luY2x1ZGUgPFdlYkNvcmUvR3RrVmVyc2lvbmluZy5oPgotI2luY2x1 ZGUgPHdlYmtpdDIvd2Via2l0Mi5oPgotI2luY2x1ZGUgPHd0Zi9nbGliL0dSZWZQdHIuaD4KLQot c3RhdGljIGNvbnN0IGNoYXIgaW50cm9zcGVjdGlvblhNTFtdID0KLSAgICAiPG5vZGU+IgotICAg ICIgPGludGVyZmFjZSBuYW1lPSdvcmcud2Via2l0Lmd0ay5BY2Nlc3NpYmlsaXR5VGVzdCc+Igot ICAgICIgIDxtZXRob2QgbmFtZT0nTG9hZEhUTUwnPiIKLSAgICAiICAgPGFyZyB0eXBlPSdzJyBu YW1lPSdodG1sJyBkaXJlY3Rpb249J2luJy8+IgotICAgICIgICA8YXJnIHR5cGU9J3MnIG5hbWU9 J2Jhc2VVUkknIGRpcmVjdGlvbj0naW4nLz4iCi0gICAgIiAgPC9tZXRob2Q+IgotICAgICIgPC9p bnRlcmZhY2U+IgotICAgICI8L25vZGU+IjsKLQotc3RhdGljIHZvaWQgbG9hZENoYW5nZWRDYWxs YmFjayhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXRMb2FkRXZlbnQgbG9hZEV2ZW50LCBH REJ1c01ldGhvZEludm9jYXRpb24qIGludm9jYXRpb24pCi17Ci0gICAgaWYgKGxvYWRFdmVudCAh PSBXRUJLSVRfTE9BRF9GSU5JU0hFRCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgZ19zaWduYWxf aGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5jKHdlYlZpZXcsIHJlaW50ZXJwcmV0X2Nhc3Q8dm9p ZCo+KGxvYWRDaGFuZ2VkQ2FsbGJhY2spLCBpbnZvY2F0aW9uKTsKLSAgICBnX2RidXNfbWV0aG9k X2ludm9jYXRpb25fcmV0dXJuX3ZhbHVlKGludm9jYXRpb24sIG51bGxwdHIpOwotfQotCi1zdGF0 aWMgY29uc3QgR0RCdXNJbnRlcmZhY2VWVGFibGUgaW50ZXJmYWNlVmlydHVhbFRhYmxlID0gewot ICAgIC8vIG1ldGhvZENhbGwKLSAgICBbXShHREJ1c0Nvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIGNv bnN0IGNoYXIqIHNlbmRlciwgY29uc3QgY2hhciogb2JqZWN0UGF0aCwgY29uc3QgY2hhciogaW50 ZXJmYWNlTmFtZSwgY29uc3QgY2hhciogbWV0aG9kTmFtZSwgR1ZhcmlhbnQqIHBhcmFtZXRlcnMs IEdEQnVzTWV0aG9kSW52b2NhdGlvbiogaW52b2NhdGlvbiwgZ3BvaW50ZXIgdXNlckRhdGEpIHsK LSAgICAgICAgaWYgKGdfc3RyY21wMChpbnRlcmZhY2VOYW1lLCAib3JnLndlYmtpdC5ndGsuQWNj ZXNzaWJpbGl0eVRlc3QiKSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBhdXRvKiB3 ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXKHVzZXJEYXRhKTsKLQotICAgICAgICBpZiAoIWdfc3Ry Y21wMChtZXRob2ROYW1lLCAiTG9hZEhUTUwiKSkgewotICAgICAgICAgICAgY29uc3QgY2hhciog aHRtbDsKLSAgICAgICAgICAgIGNvbnN0IGNoYXIqIGJhc2VVUkk7Ci0gICAgICAgICAgICBnX3Zh cmlhbnRfZ2V0KHBhcmFtZXRlcnMsICIoJnMmcykiLCAmaHRtbCwgJmJhc2VVUkkpOwotICAgICAg ICAgICAgZ19zaWduYWxfY29ubmVjdCh3ZWJWaWV3LCAibG9hZC1jaGFuZ2VkIiwgR19DQUxMQkFD Syhsb2FkQ2hhbmdlZENhbGxiYWNrKSwgaW52b2NhdGlvbik7Ci0gICAgICAgICAgICB3ZWJraXRf d2ViX3ZpZXdfbG9hZF9odG1sKHdlYlZpZXcsIGh0bWwsIGJhc2VVUkkgJiYgKmJhc2VVUkkgPyBi YXNlVVJJIDogbnVsbHB0cik7Ci0gICAgICAgIH0KLSAgICB9LAotICAgIG51bGxwdHIsCi0gICAg bnVsbHB0ciwKLSAgICB7IDAsIH0KLX07Ci0KLWludCBtYWluKGludCBhcmdjLCBjaGFyKiogYXJn dikKLXsKLSAgICAvLyBNYWtlIHN1cmUgdGhhdCB0aGUgQVRLIGJyaWRnZSBpcyBsb2FkZWQuCi0g ICAgZ19zZXRlbnYoIkdUS19NT0RVTEVTIiwgImF0ay1icmlkZ2UiLCBUUlVFKTsKLQotICAgIGd0 a19pbml0KCZhcmdjLCAmYXJndik7Ci0KLSAgICBHdGtXaWRnZXQqIHdlYlZpZXcgPSB3ZWJraXRf d2ViX3ZpZXdfbmV3KCk7Ci0jaWYgVVNFKEdUSzQpCi0gICAgR3RrV2lkZ2V0KiB3aW5kb3cgPSBn dGtfd2luZG93X25ldygpOwotICAgIGd0a193aW5kb3dfc2V0X2NoaWxkKEdUS19XSU5ET1cod2lu ZG93KSwgR1RLX1dJREdFVCh3ZWJWaWV3KSk7Ci0jZWxzZQotICAgIEd0a1dpZGdldCogd2luZG93 ID0gZ3RrX3dpbmRvd19uZXcoR1RLX1dJTkRPV19UT1BMRVZFTCk7Ci0gICAgZ19zaWduYWxfY29u bmVjdCh3aW5kb3csICJkZWxldGUtZXZlbnQiLCBHX0NBTExCQUNLKGd0a19tYWluX3F1aXQpLCBu dWxscHRyKTsKLSAgICBndGtfY29udGFpbmVyX2FkZChHVEtfQ09OVEFJTkVSKHdpbmRvdyksIEdU S19XSURHRVQod2ViVmlldykpOwotICAgIGd0a193aWRnZXRfc2hvdyhHVEtfV0lER0VUKHdlYlZp ZXcpKTsKLSNlbmRpZgotICAgIGd0a193aWRnZXRfc2hvdyh3aW5kb3cpOwotCi0gICAgZ19kYnVz X2Nvbm5lY3Rpb25fbmV3X2Zvcl9hZGRyZXNzKGFyZ3ZbMV0sIEdfREJVU19DT05ORUNUSU9OX0ZM QUdTX0FVVEhFTlRJQ0FUSU9OX0NMSUVOVCwgbnVsbHB0ciwgbnVsbHB0ciwKLSAgICAgICAgW10o R09iamVjdCosIEdBc3luY1Jlc3VsdCogcmVzdWx0LCBncG9pbnRlciB1c2VyRGF0YSkgewotICAg ICAgICAgICAgR0RCdXNDb25uZWN0aW9uKiBjb25uZWN0aW9uID0gZ19kYnVzX2Nvbm5lY3Rpb25f bmV3X2Zvcl9hZGRyZXNzX2ZpbmlzaChyZXN1bHQsIG51bGxwdHIpOwotCi0gICAgICAgICAgICBz dGF0aWMgR0RCdXNOb2RlSW5mbyAqaW50cm9zcGVjdGlvbkRhdGEgPSBudWxscHRyOwotICAgICAg ICAgICAgaWYgKCFpbnRyb3NwZWN0aW9uRGF0YSkKLSAgICAgICAgICAgICAgICBpbnRyb3NwZWN0 aW9uRGF0YSA9IGdfZGJ1c19ub2RlX2luZm9fbmV3X2Zvcl94bWwoaW50cm9zcGVjdGlvblhNTCwg bnVsbHB0cik7Ci0KLSAgICAgICAgICAgIGdfZGJ1c19jb25uZWN0aW9uX3JlZ2lzdGVyX29iamVj dChjb25uZWN0aW9uLCAiL29yZy93ZWJraXQvZ3RrL0FjY2Vzc2liaWxpdHlUZXN0IiwgaW50cm9z cGVjdGlvbkRhdGEtPmludGVyZmFjZXNbMF0sCi0gICAgICAgICAgICAgICAgJmludGVyZmFjZVZp cnR1YWxUYWJsZSwgdXNlckRhdGEsIG51bGxwdHIsIG51bGxwdHIpOwotICAgICAgICB9LCB3ZWJW aWV3KTsKLQotI2lmIFVTRShHVEs0KQotICAgIEdSZWZQdHI8R01haW5Mb29wPiBsb29wID0gYWRv cHRHUmVmKGdfbWFpbl9sb29wX25ldyhudWxscHRyLCBUUlVFKSk7Ci0gICAgZ19tYWluX2xvb3Bf cnVuKGxvb3AuZ2V0KCkpOwotI2Vsc2UKLSAgICBndGtfbWFpbigpOwotI2VuZGlmCi19CmRpZmYg LS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEd0ay9UZXN0V2ViS2l0QWNj ZXNzaWJpbGl0eS5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEd0ay9UZXN0 V2ViS2l0QWNjZXNzaWJpbGl0eS5jcHAKaW5kZXggOGNkYTA1MWY2MTU2Li4xYTQ1NmI4MGQzODEg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL1Rlc3RXZWJL aXRBY2Nlc3NpYmlsaXR5LmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dEd0ay9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eS5jcHAKQEAgLTE5LDU1ICsxOSwyOSBAQAogCiAj aW5jbHVkZSAiY29uZmlnLmgiCiAKLSNpbmNsdWRlICJUZXN0TWFpbi5oIgorI2luY2x1ZGUgIldl YlZpZXdUZXN0LmgiCiAKIC8vIFRoZSBsaWJhdHNwaSBoZWFkZXJzIGRvbid0IHVzZSBHX0JFR0lO X0RFQ0xTCiBleHRlcm4gIkMiIHsKICNpbmNsdWRlIDxhdHNwaS9hdHNwaS5oPgogfQogCi1jbGFz cyBBY2Nlc3NpYmlsaXR5VGVzdCA6IHB1YmxpYyBUZXN0IHsKK2NsYXNzIEFjY2Vzc2liaWxpdHlU ZXN0IDogcHVibGljIFdlYlZpZXdUZXN0IHsKIHB1YmxpYzoKICAgICBNQUtFX0dMSUJfVEVTVF9G SVhUVVJFKEFjY2Vzc2liaWxpdHlUZXN0KTsKIAotICAgIEFjY2Vzc2liaWxpdHlUZXN0KCkKLSAg ICB7Ci0gICAgICAgIEdVbmlxdWVQdHI8Y2hhcj4gdGVzdFNlcnZlclBhdGgoZ19idWlsZF9maWxl bmFtZShXRUJLSVRfRVhFQ19QQVRILCAiVGVzdFdlYktpdEFQSSIsICJXZWJLaXQyR3RrIiwgIkFj Y2Vzc2liaWxpdHlUZXN0U2VydmVyIiwgbnVsbHB0cikpOwotICAgICAgICBjaGFyKiBhcmdzWzNd OwotICAgICAgICBhcmdzWzBdID0gdGVzdFNlcnZlclBhdGguZ2V0KCk7Ci0gICAgICAgIGFyZ3Nb MV0gPSBjb25zdF9jYXN0PGNoYXIqPihnX2RidXNfc2VydmVyX2dldF9jbGllbnRfYWRkcmVzcyhz X2RidXNTZXJ2ZXIuZ2V0KCkpKTsKLSAgICAgICAgYXJnc1syXSA9IG51bGxwdHI7Ci0KLSAgICAg ICAgZ19hc3NlcnRfdHJ1ZShnX3NwYXduX2FzeW5jKG51bGxwdHIsIGFyZ3MsIG51bGxwdHIsIEdf U1BBV05fREVGQVVMVCwgbnVsbHB0ciwgbnVsbHB0ciwgJm1fY2hpbGRQcm9jZXNzSUQsIG51bGxw dHIpKTsKLSAgICB9Ci0KLSAgICB+QWNjZXNzaWJpbGl0eVRlc3QoKQotICAgIHsKLSAgICAgICAg aWYgKG1fY2hpbGRQcm9jZXNzSUQpIHsKLSAgICAgICAgICAgIGdfc3Bhd25fY2xvc2VfcGlkKG1f Y2hpbGRQcm9jZXNzSUQpOwotICAgICAgICAgICAga2lsbChtX2NoaWxkUHJvY2Vzc0lELCBTSUdU RVJNKTsKLSAgICAgICAgfQotICAgIH0KLQotICAgIHZvaWQgbG9hZEhUTUxBbmRXYWl0VW50aWxG aW5pc2hlZChjb25zdCBjaGFyKiBodG1sLCBjb25zdCBjaGFyKiBiYXNlVVJJKQotICAgIHsKLSAg ICAgICAgZW5zdXJlUHJveHkoKTsKLQotICAgICAgICBHVW5pcXVlT3V0UHRyPEdFcnJvcj4gZXJy b3I7Ci0gICAgICAgIEdSZWZQdHI8R1ZhcmlhbnQ+IHJlc3VsdCA9IGFkb3B0R1JlZihnX2RidXNf cHJveHlfY2FsbF9zeW5jKG1fcHJveHkuZ2V0KCksICJMb2FkSFRNTCIsCi0gICAgICAgICAgICBn X3ZhcmlhbnRfbmV3KCIoc3MpIiwgaHRtbCwgYmFzZVVSSSA/IGJhc2VVUkkgOiAiIiksIEdfREJV U19DQUxMX0ZMQUdTX05PTkUsIC0xLCBudWxscHRyLCAmZXJyb3Iub3V0UHRyKCkpKTsKLSAgICAg ICAgZ19hc3NlcnRfbm9fZXJyb3IoZXJyb3IuZ2V0KCkpOwotICAgIH0KLQotICAgIEdSZWZQdHI8 QXRzcGlBY2Nlc3NpYmxlPiBmaW5kVGVzdFNlcnZlckFwcGxpY2F0aW9uKCkKKyAgICBHUmVmUHRy PEF0c3BpQWNjZXNzaWJsZT4gZmluZFRlc3RBcHBsaWNhdGlvbigpCiAgICAgewogICAgICAgICAv LyBPbmx5IG9uZSBkZXNrdG9wIGlzIHN1cHBvcnRlZCBieSBBVFNQSSBhdCB0aGUgbW9tZW50Lgog ICAgICAgICBHUmVmUHRyPEF0c3BpQWNjZXNzaWJsZT4gZGVza3RvcCA9IGFkb3B0R1JlZihhdHNw aV9nZXRfZGVza3RvcCgwKSk7CiAKKyAgICAgICAgLy8gV2UgY2FuIGdldCB3YXJuaW5ncyBmcm9t IGF0c3BpIHdoZW4gdHJ5aW5nIHRvIGNvbm5lY3QgdG8gYXBwbGljYXRpb25zLgorICAgICAgICBU ZXN0OjpyZW1vdmVMb2dGYXRhbEZsYWcoR19MT0dfTEVWRUxfV0FSTklORyk7CiAgICAgICAgIGlu dCBjaGlsZENvdW50ID0gYXRzcGlfYWNjZXNzaWJsZV9nZXRfY2hpbGRfY291bnQoZGVza3RvcC5n ZXQoKSwgbnVsbHB0cik7CisgICAgICAgIFRlc3Q6OmFkZExvZ0ZhdGFsRmxhZyhHX0xPR19MRVZF TF9XQVJOSU5HKTsKICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBjaGlsZENvdW50OyArK2kp IHsKICAgICAgICAgICAgIEdSZWZQdHI8QXRzcGlBY2Nlc3NpYmxlPiBjdXJyZW50ID0gYWRvcHRH UmVmKGF0c3BpX2FjY2Vzc2libGVfZ2V0X2NoaWxkX2F0X2luZGV4KGRlc2t0b3AuZ2V0KCksIGks IG51bGxwdHIpKTsKLSAgICAgICAgICAgIGlmICghZ19zdHJjbXAwKGF0c3BpX2FjY2Vzc2libGVf Z2V0X25hbWUoY3VycmVudC5nZXQoKSwgbnVsbHB0ciksICJBY2Nlc3NpYmlsaXR5VGVzdFNlcnZl ciIpKQorICAgICAgICAgICAgaWYgKCFnX3N0cmNtcDAoYXRzcGlfYWNjZXNzaWJsZV9nZXRfbmFt ZShjdXJyZW50LmdldCgpLCBudWxscHRyKSwgIlRlc3RXZWJLaXRBY2Nlc3NpYmlsaXR5IikpCiAg ICAgICAgICAgICAgICAgcmV0dXJuIGN1cnJlbnQ7CiAgICAgICAgIH0KIApAQCAtMTA3LDQ2ICs4 MSwyMSBAQCBwdWJsaWM6CiAgICAgICAgICAgICBbXShBdHNwaUV2ZW50KiBldmVudCwgZ3BvaW50 ZXIgdXNlckRhdGEpIHsKICAgICAgICAgICAgICAgICBhdXRvKiB0ZXN0ID0gc3RhdGljX2Nhc3Q8 QWNjZXNzaWJpbGl0eVRlc3QqPih1c2VyRGF0YSk7CiAgICAgICAgICAgICAgICAgaWYgKGV2ZW50 LT5zb3VyY2UgPT0gdGVzdC0+bV9ldmVudFNvdXJjZSkKLSAgICAgICAgICAgICAgICAgICAgZ19t YWluX2xvb3BfcXVpdCh0ZXN0LT5tX21haW5Mb29wLmdldCgpKTsKKyAgICAgICAgICAgICAgICAg ICAgZ19tYWluX2xvb3BfcXVpdCh0ZXN0LT5tX21haW5Mb29wKTsKICAgICAgICAgfSwgdGhpcywg bnVsbHB0cikpOwogICAgICAgICBhdHNwaV9ldmVudF9saXN0ZW5lcl9yZWdpc3RlcihsaXN0ZW5l ci5nZXQoKSwgIm9iamVjdDpjaGlsZHJlbi1jaGFuZ2VkOnJlbW92ZSIsIG51bGxwdHIpOwotICAg ICAgICBnX21haW5fbG9vcF9ydW4obV9tYWluTG9vcC5nZXQoKSk7CisgICAgICAgIGdfbWFpbl9s b29wX3J1bihtX21haW5Mb29wKTsKICAgICAgICAgbV9ldmVudFNvdXJjZSA9IG51bGxwdHI7CiAg ICAgfQogCiBwcml2YXRlOgotICAgIHZvaWQgZW5zdXJlUHJveHkoKQotICAgIHsKLSAgICAgICAg aWYgKG1fcHJveHkpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgbV9tYWluTG9vcCA9 IGFkb3B0R1JlZihnX21haW5fbG9vcF9uZXcobnVsbHB0ciwgRkFMU0UpKTsKLQotICAgICAgICBp ZiAoc19kYnVzQ29ubmVjdGlvbnMuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICBnX2lkbGVfYWRk KFtdKGdwb2ludGVyIHVzZXJEYXRhKSAtPiBnYm9vbGVhbiB7Ci0gICAgICAgICAgICAgICAgaWYg KHNfZGJ1c0Nvbm5lY3Rpb25zLmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJu IFRSVUU7Ci0KLSAgICAgICAgICAgICAgICBnX21haW5fbG9vcF9xdWl0KHN0YXRpY19jYXN0PEdN YWluTG9vcCo+KHVzZXJEYXRhKSk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIEZBTFNFOwotICAg ICAgICAgICAgfSwgbV9tYWluTG9vcC5nZXQoKSk7Ci0gICAgICAgICAgICBnX21haW5fbG9vcF9y dW4obV9tYWluTG9vcC5nZXQoKSk7Ci0gICAgICAgIH0KLQotICAgICAgICBtX3Byb3h5ID0gYWRv cHRHUmVmKGdfZGJ1c19wcm94eV9uZXdfc3luYyhzX2RidXNDb25uZWN0aW9uc1swXS5nZXQoKSwg c3RhdGljX2Nhc3Q8R0RCdXNQcm94eUZsYWdzPihHX0RCVVNfUFJPWFlfRkxBR1NfRE9fTk9UX0xP QURfUFJPUEVSVElFUyB8IEdfREJVU19QUk9YWV9GTEFHU19ET19OT1RfQ09OTkVDVF9TSUdOQUxT KSwKLSAgICAgICAgICAgIG51bGxwdHIsIG51bGxwdHIsICIvb3JnL3dlYmtpdC9ndGsvQWNjZXNz aWJpbGl0eVRlc3QiLCAib3JnLndlYmtpdC5ndGsuQWNjZXNzaWJpbGl0eVRlc3QiLCBudWxscHRy LCBudWxscHRyKSk7Ci0gICAgICAgIGdfYXNzZXJ0X3RydWUoR19JU19EQlVTX1BST1hZKG1fcHJv eHkuZ2V0KCkpKTsKLSAgICB9Ci0KLSAgICBHUGlkIG1fY2hpbGRQcm9jZXNzSUQgeyAwIH07Ci0g ICAgR1JlZlB0cjxHREJ1c1Byb3h5PiBtX3Byb3h5OwotICAgIEdSZWZQdHI8R01haW5Mb29wPiBt X21haW5Mb29wOwogICAgIEF0c3BpQWNjZXNzaWJsZSogbV9ldmVudFNvdXJjZSB7IG51bGxwdHIg fTsKIH07CiAKIHN0YXRpYyB2b2lkIHRlc3RBdHNwaUJhc2ljSGllcmFyY2h5KEFjY2Vzc2liaWxp dHlUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogewotICAgIHRlc3QtPmxvYWRIVE1MQW5kV2Fp dFVudGlsRmluaXNoZWQoCisgICAgdGVzdC0+c2hvd0luV2luZG93KCk7CisgICAgdGVzdC0+bG9h ZEh0bWwoCiAgICAgICAgICI8aHRtbD4iCiAgICAgICAgICIgIDxib2R5PiIKICAgICAgICAgIiAg IDxoMT5UaGlzIGlzIGEgdGVzdDwvaDE+IgpAQCAtMTU1LDE0ICsxMDQsMTUgQEAgc3RhdGljIHZv aWQgdGVzdEF0c3BpQmFzaWNIaWVyYXJjaHkoQWNjZXNzaWJpbGl0eVRlc3QqIHRlc3QsIGdjb25z dHBvaW50ZXIpCiAgICAgICAgICIgIDwvYm9keT4iCiAgICAgICAgICI8L2h0bWw+IiwKICAgICAg ICAgbnVsbHB0cik7CisgICAgdGVzdC0+d2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CiAKLSAgICBh dXRvIHRlc3RTZXJ2ZXJBcHAgPSB0ZXN0LT5maW5kVGVzdFNlcnZlckFwcGxpY2F0aW9uKCk7Ci0g ICAgZ19hc3NlcnRfdHJ1ZShBVFNQSV9JU19BQ0NFU1NJQkxFKHRlc3RTZXJ2ZXJBcHAuZ2V0KCkp KTsKLSAgICBHVW5pcXVlUHRyPGNoYXI+IG5hbWUoYXRzcGlfYWNjZXNzaWJsZV9nZXRfbmFtZSh0 ZXN0U2VydmVyQXBwLmdldCgpLCBudWxscHRyKSk7Ci0gICAgZ19hc3NlcnRfY21wc3RyKG5hbWUu Z2V0KCksID09LCAiQWNjZXNzaWJpbGl0eVRlc3RTZXJ2ZXIiKTsKLSAgICBnX2Fzc2VydF9jbXBp bnQoYXRzcGlfYWNjZXNzaWJsZV9nZXRfcm9sZSh0ZXN0U2VydmVyQXBwLmdldCgpLCBudWxscHRy KSwgPT0sIEFUU1BJX1JPTEVfQVBQTElDQVRJT04pOworICAgIGF1dG8gdGVzdEFwcCA9IHRlc3Qt PmZpbmRUZXN0QXBwbGljYXRpb24oKTsKKyAgICBnX2Fzc2VydF90cnVlKEFUU1BJX0lTX0FDQ0VT U0lCTEUodGVzdEFwcC5nZXQoKSkpOworICAgIEdVbmlxdWVQdHI8Y2hhcj4gbmFtZShhdHNwaV9h Y2Nlc3NpYmxlX2dldF9uYW1lKHRlc3RBcHAuZ2V0KCksIG51bGxwdHIpKTsKKyAgICBnX2Fzc2Vy dF9jbXBzdHIobmFtZS5nZXQoKSwgPT0sICJUZXN0V2ViS2l0QWNjZXNzaWJpbGl0eSIpOworICAg IGdfYXNzZXJ0X2NtcGludChhdHNwaV9hY2Nlc3NpYmxlX2dldF9yb2xlKHRlc3RBcHAuZ2V0KCks IG51bGxwdHIpLCA9PSwgQVRTUElfUk9MRV9BUFBMSUNBVElPTik7CiAKLSAgICBhdXRvIHJvb3RP YmplY3QgPSB0ZXN0LT5maW5kUm9vdE9iamVjdCh0ZXN0U2VydmVyQXBwLmdldCgpKTsKKyAgICBh dXRvIHJvb3RPYmplY3QgPSB0ZXN0LT5maW5kUm9vdE9iamVjdCh0ZXN0QXBwLmdldCgpKTsKICAg ICBnX2Fzc2VydF90cnVlKEFUU1BJX0lTX0FDQ0VTU0lCTEUocm9vdE9iamVjdC5nZXQoKSkpOwog ICAgIGdfYXNzZXJ0X2NtcGludChhdHNwaV9hY2Nlc3NpYmxlX2dldF9yb2xlKHJvb3RPYmplY3Qu Z2V0KCksIG51bGxwdHIpLCA9PSwgQVRTUElfUk9MRV9GSUxMRVIpOwogCkBAIC0xOTQsNyArMTQ0 LDcgQEAgc3RhdGljIHZvaWQgdGVzdEF0c3BpQmFzaWNIaWVyYXJjaHkoQWNjZXNzaWJpbGl0eVRl c3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgZ19hc3NlcnRfY21wc3RyKG5hbWUuZ2V0KCks ID09LCAiYSBsaW5rIik7CiAgICAgZ19hc3NlcnRfY21waW50KGF0c3BpX2FjY2Vzc2libGVfZ2V0 X3JvbGUobGluay5nZXQoKSwgbnVsbHB0ciksID09LCBBVFNQSV9ST0xFX0xJTkspOwogCi0gICAg dGVzdC0+bG9hZEhUTUxBbmRXYWl0VW50aWxGaW5pc2hlZCgKKyAgICB0ZXN0LT5sb2FkSHRtbCgK ICAgICAgICAgIjxodG1sPiIKICAgICAgICAgIiAgPGJvZHk+IgogICAgICAgICAiICAgPGgxPlRo aXMgaXMgYW5vdGhlciB0ZXN0PC9oMT4iCkBAIC0yMDIsMTIgKzE1MiwxMSBAQCBzdGF0aWMgdm9p ZCB0ZXN0QXRzcGlCYXNpY0hpZXJhcmNoeShBY2Nlc3NpYmlsaXR5VGVzdCogdGVzdCwgZ2NvbnN0 cG9pbnRlcikKICAgICAgICAgIiAgPC9ib2R5PiIKICAgICAgICAgIjwvaHRtbD4iLAogICAgICAg ICBudWxscHRyKTsKLQogICAgIC8vIENoZWNrIHRoYXQgY2hpbGRyZW4tY2hhbmdlZDo6cmVtb3Zl IGlzIGVtaXR0ZWQgb24gdGhlIHJvb3Qgb2JqZWN0IG9uIG5hdmlnYXRpb24sCiAgICAgLy8gYW5k IHRoZSBhMTF5IGhpZXJhcmNoeSBpcyB1cGRhdGVkLgogICAgIHRlc3QtPndhaXRVbnRpbENoaWxk cmVuUmVtb3ZlZChyb290T2JqZWN0LmdldCgpKTsKIAotICAgIGRvY3VtZW50V2ViID0gdGVzdC0+ ZmluZERvY3VtZW50V2ViKHRlc3RTZXJ2ZXJBcHAuZ2V0KCkpOworICAgIGRvY3VtZW50V2ViID0g dGVzdC0+ZmluZERvY3VtZW50V2ViKHRlc3RBcHAuZ2V0KCkpOwogICAgIGdfYXNzZXJ0X3RydWUo QVRTUElfSVNfQUNDRVNTSUJMRShkb2N1bWVudFdlYi5nZXQoKSkpOwogICAgIGdfYXNzZXJ0X2Nt cGludChhdHNwaV9hY2Nlc3NpYmxlX2dldF9yb2xlKGRvY3VtZW50V2ViLmdldCgpLCBudWxscHRy KSwgPT0sIEFUU1BJX1JPTEVfRE9DVU1FTlRfV0VCKTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVz dFdlYktpdEFQSS9nbGliL1BsYXRmb3JtR1RLLmNtYWtlIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9n bGliL1BsYXRmb3JtR1RLLmNtYWtlCmluZGV4IGY2MDMzMzBhZmVjNy4uYzVhMzk5MTc0MWQwIDEw MDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvUGxhdGZvcm1HVEsuY21ha2UKKysr IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1BsYXRmb3JtR1RLLmNtYWtlCkBAIC00OCw2ICs0 OCw1IEBAIEFERF9XSzJfVEVTVChUZXN0V2ViS2l0VmVyc2lvbiAke1RPT0xTX0RJUn0vVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRHdGsvVGVzdFdlCiBBRERfV0syX1RFU1QoVGVzdFdlYlZpZXdF ZGl0b3IgJHtUT09MU19ESVJ9L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL1Rlc3RXZWJW aWV3RWRpdG9yLmNwcCkKIAogaWYgKEFUU1BJX0ZPVU5EKQotICAgIEFERF9XSzJfVEVTVChBY2Nl c3NpYmlsaXR5VGVzdFNlcnZlciAke1RPT0xTX0RJUn0vVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRHdGsvQWNjZXNzaWJpbGl0eVRlc3RTZXJ2ZXIuY3BwKQogICAgIEFERF9XSzJfVEVTVChUZXN0 V2ViS2l0QWNjZXNzaWJpbGl0eSAke1RPT0xTX0RJUn0vVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRHdGsvVGVzdFdlYktpdEFjY2Vzc2liaWxpdHkuY3BwKQogZW5kaWYgKCkKZGlmZiAtLWdpdCBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1Rlc3RNYWluLmNwcCBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1Rlc3RNYWluLmNwcAppbmRleCBlODk2Zjdh ZTE1ZjAuLjNiYjBjMjFmODExOSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGli L1dlYktpdEdMaWIvVGVzdE1haW4uY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9X ZWJLaXRHTGliL1Rlc3RNYWluLmNwcApAQCAtMjEsNiArMjEsNyBAQAogI2luY2x1ZGUgIlRlc3RN YWluLmgiCiAKICNpbmNsdWRlIDxnbGliL2dzdGRpby5oPgorI2luY2x1ZGUgPHd0Zi9nbGliL0dM aWJVdGlsaXRpZXMuaD4KIAogI2lmIFBMQVRGT1JNKEdUSykKICNpbmNsdWRlIDxndGsvZ3RrLmg+ CkBAIC0xMjMsNiArMTI0LDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogI2Vs c2UKICAgICBnX3Rlc3RfaW5pdCgmYXJnYywgJmFyZ3YsIG51bGxwdHIpOwogI2VuZGlmCisgICAg Z19zZXRfcHJnbmFtZShnZXRDdXJyZW50RXhlY3V0YWJsZU5hbWUoKS5kYXRhKCkpOwogICAgIGdf c2V0ZW52KCJXRUJLSVRfRVhFQ19QQVRIIiwgV0VCS0lUX0VYRUNfUEFUSCwgRkFMU0UpOwogICAg IGdfc2V0ZW52KCJXRUJLSVRfSU5KRUNURURfQlVORExFX1BBVEgiLCBXRUJLSVRfSU5KRUNURURf QlVORExFX1BBVEgsIEZBTFNFKTsKICAgICBnX3NldGVudigiTENfQUxMIiwgIkMiLCBUUlVFKTsK