187776 2018-07-18 11:29:17 -0700 Provide an lldb type summary for WebCore::Color 2019-06-16 22:14:07 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified NEW P2 Normal --- 187855 187856 187872 1 dino dino aakash_jain dbates ews-watchlist realdawei ryanhaddad simon.fraser tsavell oldest_to_newest 1443078 0 dino 2018-07-18 11:29:17 -0700 Provide an lldb type summary for WebCore::Color 1443082 1 345264 dino 2018-07-18 11:32:04 -0700 Created attachment 345264 Patch 1443085 2 345264 simon.fraser 2018-07-18 11:34:13 -0700 Comment on attachment 345264 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345264&action=review > Tools/lldb/lldb_webkit_unittest.py:180 > + def serial_test_WebCoreColorProvider_rgba_color(self): > + variable = self._sbFrame.FindVariable('rgbaColor'); > + self.assertIsNotNone(variable) > + summary = lldb_webkit.WebCoreColorProvider_SummaryProvider(variable, {}) > + self.assertEqual(summary, "{ rgba(255, 128, 64, 0.50) }") No test for semantic colors? 1443086 3 ews-watchlist 2018-07-18 11:35:13 -0700 Attachment 345264 did not pass style-queue: ERROR: Tools/lldb/lldbWebKitTester/main.cpp:30: Alphabetical sorting problem. [build/include_order] [4] ERROR: Tools/lldb/lldb_webkit_unittest.py:159: multiple statements on one line (semicolon) [pep8/E702] [5] ERROR: Tools/lldb/lldb_webkit_unittest.py:165: multiple statements on one line (semicolon) [pep8/E702] [5] ERROR: Tools/lldb/lldb_webkit_unittest.py:171: multiple statements on one line (semicolon) [pep8/E702] [5] ERROR: Tools/lldb/lldb_webkit_unittest.py:177: multiple statements on one line (semicolon) [pep8/E702] [5] ERROR: Tools/lldb/lldb_webkit_unittest.py:181: blank line at end of file [pep8/W391] [5] ERROR: Tools/lldb/lldb_webkit_unittest.py:161: [TestSummaryProviders.serial_test_WebCoreColorProvider_invalid_color] Module 'lldb_webkit' has no 'WebCoreColorProvider_SummaryProvider' member [pylint/E1101] [5] ERROR: Tools/lldb/lldb_webkit_unittest.py:167: [TestSummaryProviders.serial_test_WebCoreColorProvider_extended_color] Module 'lldb_webkit' has no 'WebCoreColorProvider_SummaryProvider' member [pylint/E1101] [5] ERROR: Tools/lldb/lldb_webkit_unittest.py:173: [TestSummaryProviders.serial_test_WebCoreColorProvider_rgb_color] Module 'lldb_webkit' has no 'WebCoreColorProvider_SummaryProvider' member [pylint/E1101] [5] ERROR: Tools/lldb/lldb_webkit_unittest.py:179: [TestSummaryProviders.serial_test_WebCoreColorProvider_rgba_color] Module 'lldb_webkit' has no 'WebCoreColorProvider_SummaryProvider' member [pylint/E1101] [5] Total errors found: 10 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1443131 4 345264 dbates 2018-07-18 13:23:00 -0700 Comment on attachment 345264 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345264&action=review Please fix the style errors, pick one quoting style, and fix up the names of variables to conform to the PEP8 style guide. > Tools/lldb/lldb_webkit.py:328 > + return (rgbaAndFlags & 0x2) This returns the result of the bitwise-and and may not be in [0, 1]. The name of this function implies that this function will return a boolean. I suggest we write this line as: return bool(rgbaAndFlags & 0x2) This will convert the result of the bitwise-and into a boolean. > Tools/lldb/lldb_webkit.py:332 > + return rgbaAndFlags & 0x4 By a similar argument I would write this as: return bool(rgbaAndFlags & 0x4) > Tools/lldb/lldb_webkit.py:335 > + extendedColor = self.valobj.GetChildMemberWithName('m_colorData').GetChildMemberWithName('extendedColor').Dereference() We seem to alternate between single quoted string literals and double quoted string literals in this patch. I suggest we pick one style of quotes and stick with it throughout this patch. For Python code we follow PEP8 style; => variable names should use underscore for separating words and they should be written in lowercase. So, extendedColor => extended_color. > Tools/lldb/lldb_webkit.py:350 > + Please remove this line. I do not feel that it improves the readability of this code. > Tools/lldb/lldb_webkit_unittest.py:160 > + self.assertIsNotNone(variable) I know that you are just mimicing the same assert in serial_test_WTFVectorProvider_vector_size_and_capacity() and serial_test_WTFVectorProvider_empty_vector(). I do not see much value in these asserts as Python would die with an exception that indicates a None was passed when the summary provider code executes for any non-trivial summary provider. The asserts were added in <https://trac.webkit.org/changeset/233330>. I suspect this was done to try to debug inconsistent results we were seeing on the bots at the time, which was fixed in bug #187229. 1443133 5 345264 dbates 2018-07-18 13:24:29 -0700 Comment on attachment 345264 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345264&action=review > Tools/lldb/lldbWebKitTester/main.cpp:74 > + extendedColor.alpha(); // Use the variable after the break point so that it doesn't get derefed. Can you please elaborate on why this is needed? 1443134 6 dbates 2018-07-18 13:25:33 -0700 (In reply to Daniel Bates from comment #5) > Comment on attachment 345264 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=345264&action=review > > > Tools/lldb/lldbWebKitTester/main.cpp:74 > > + extendedColor.alpha(); // Use the variable after the break point so that it doesn't get derefed. > > Can you please elaborate on why this is needed? I mean, we run the unit tests once we hit the breakpoint and I would have expected that extendedColor (and all the other locals) would still be on the stack at the time. 1443185 7 dino 2018-07-18 15:13:57 -0700 (In reply to Daniel Bates from comment #6) > > I mean, we run the unit tests once we hit the breakpoint and I would have > expected that extendedColor (and all the other locals) would still be on the > stack at the time. This was something I ran into while testing which ended up being a user error. It can be removed. 1443242 8 tsavell 2018-07-18 17:16:43 -0700 looks like revision <https://trac.webkit.org/changeset/233934/webkit> has caused 5 webkitpy errors: <https://build.webkit.org/builders/Apple%20High%20Sierra%20Release%20WK1%20%28Tests%29/builds/6785/steps/webkitpy-test/logs/stdio> A few of them are the new tests that were added. 1443243 9 tsavell 2018-07-18 17:20:12 -0700 Also webkitpy test runner fails completely on iOS 11 Simulator. Output: https://build.webkit.org/builders/Apple%20iOS%2011%20Simulator%20Debug%20WK2%20%28Tests%29/builds/5470/steps/webkitpy-test/logs/stdio 1443252 10 simon.fraser 2018-07-18 17:32:34 -0700 These tests should never run for iOS simulator. 1443254 11 tsavell 2018-07-18 17:38:32 -0700 Reverted r233934 for reason: Revision caused 5 webkitpy failures on Mac and broke webkitpy testing on iOS simulator Committed r233942: <https://trac.webkit.org/changeset/233942> 1443267 12 dbates 2018-07-18 18:46:16 -0700 (In reply to Truitt Savell from comment #8) > looks like revision <https://trac.webkit.org/changeset/233934/webkit> > > has caused 5 webkitpy errors: > > <https://build.webkit.org/builders/ > Apple%20High%20Sierra%20Release%20WK1%20%28Tests%29/builds/6785/steps/ > webkitpy-test/logs/stdio> > > A few of them are the new tests that were added. We need to teach the webkitpy driver code and/or build-lldbwebkittesster to only build lldbWebKitTester on Mac. 1443365 13 ryanhaddad 2018-07-19 08:56:29 -0700 This change was re-landed in https://trac.webkit.org/changeset/233943/webkit. webkitpy tests are passing on macOS release bots, but lldbWebKitTester is failing to build on macOS debug bots as well as iOS simulator bots: https://build.webkit.org/builders/Apple%20Sierra%20Debug%20WK2%20%28Tests%29/builds/7313/steps/webkitpy-test/logs/stdio I tried clearing the WebkitBuild directory on one of the bots and running the tests manually, but hit the same error. I was able to run the tests locally without issue. 1443474 14 ryanhaddad 2018-07-19 13:05:54 -0700 A fix attempted was landed in https://trac.webkit.org/changeset/233988, but the issue persists: https://build.webkit.org/builders/Apple%20Sierra%20Debug%20WK2%20(Tests)/builds/7317 1443760 15 ryanhaddad 2018-07-20 08:45:53 -0700 Rolled out this change and all of the follow ups in https://trac.webkit.org/changeset/234040 1443932 16 dbates 2018-07-20 15:03:50 -0700 (In reply to Ryan Haddad from comment #13) > This change was re-landed in https://trac.webkit.org/changeset/233943/webkit. > > webkitpy tests are passing on macOS release bots, but lldbWebKitTester is > failing to build on macOS debug bots as well as iOS simulator bots: > https://build.webkit.org/builders/Apple%20Sierra%20Debug%20WK2%20%28Tests%29/ > builds/7313/steps/webkitpy-test/logs/stdio Looking at this output this debug tester thinks that it should use a relwase-built lldbWebKitTester. But this bot will only have a debug built lldbWebKitTester. So, it tries to build it and bad things happen. Filed bug #187872 to fix this issue. 1545199 17 simon.fraser 2019-06-16 21:05:47 -0700 Can this land again? 1545206 18 dbates 2019-06-16 22:13:09 -0700 (In reply to Simon Fraser (smfr) from comment #17) > Can this land again? I thought Dean landed just the code change.... anyway, I don't care if we land this change with the tests either as I always have a WebKit build and I have a fast machine 😀 so any slowdown is likely not noticeable. But there may be some slowdown on the EWS or for tools-only folks. If it significantly slows downs the EWS bots then that might motivate Aakash to work faster and fix bug #189205 and bug #189206 😀. 1545207 19 dbates 2019-06-16 22:14:07 -0700 All other bugs i think we're fixed. 345264 2018-07-18 11:32:04 -0700 2018-07-18 13:23:00 -0700 Patch bug-187776-20180718113203.patch text/plain 11331 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzODg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjY3NDAyYjllOTJjY2JiYWM2NjZiYmE5OWNlMGViOTEz M2I0ZTE1NS4uYTcwOGNhYzRkMjQ3ZTg4Yzk3ODdlZTcyOGI5OWE3OGI3YTRiMzNhOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0 IEBACisyMDE4LTA3LTE4ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAg ICBQcm92aWRlIGFuIGxsZGIgdHlwZSBzdW1tYXJ5IGZvciBXZWJDb3JlOjpDb2xvcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3Nzc2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsbGRiL2xsZGJXZWJL aXRUZXN0ZXIvbGxkYldlYktpdFRlc3Rlci54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOiBMaW5r IGFnYWluc3QgV2ViS2l0CisgICAgICAgICAgICB0byBnZXQgdG8gV2ViQ29yZS4KKyAgICAgICAg KiBsbGRiL2xsZGJXZWJLaXRUZXN0ZXIvbWFpbi5jcHA6CisgICAgICAgICh0ZXN0U3VtbWFyeVBy b3ZpZGVycyk6IENyZWF0ZSBzb21lIENvbG9yIG9iamVjdHMgZm9yIHRlc3RpbmcuCisKKyAgICAg ICAgKiBsbGRiL2xsZGJfd2Via2l0LnB5OiBBZGQgYSBDb2xvciBzdW1tYXJ5IHByb3ZpZGVyLgor ICAgICAgICAoX19sbGRiX2luaXRfbW9kdWxlKToKKyAgICAgICAgKFdlYkNvcmVDb2xvcl9TdW1t YXJ5UHJvdmlkZXIpOgorICAgICAgICAoV2ViQ29yZUNvbG9yUHJvdmlkZXIpOgorICAgICAgICAo V2ViQ29yZUNvbG9yUHJvdmlkZXIuX19pbml0X18pOgorICAgICAgICAoV2ViQ29yZUNvbG9yUHJv dmlkZXIuX2lzX2V4dGVuZGVkKToKKyAgICAgICAgKFdlYkNvcmVDb2xvclByb3ZpZGVyLl9pc192 YWxpZCk6CisgICAgICAgIChXZWJDb3JlQ29sb3JQcm92aWRlci5faXNfc2VtYW50aWMpOgorICAg ICAgICAoV2ViQ29yZUNvbG9yUHJvdmlkZXIuX3RvX3N0cmluZ19leHRlbmRlZCk6CisgICAgICAg IChXZWJDb3JlQ29sb3JQcm92aWRlci50b19zdHJpbmcpOgorCisgICAgICAgICogbGxkYi9sbGRi X3dlYmtpdF91bml0dGVzdC5weTogVGVzdHMuCisgICAgICAgIChUZXN0U3VtbWFyeVByb3ZpZGVy cy5zZXJpYWxfdGVzdF9XVEZWZWN0b3JQcm92aWRlcl92ZWN0b3Jfc2l6ZV9hbmRfY2FwYWNpdHkp OgorICAgICAgICAoVGVzdFN1bW1hcnlQcm92aWRlcnMpOgorICAgICAgICAoVGVzdFN1bW1hcnlQ cm92aWRlcnMuc2VyaWFsX3Rlc3RfV2ViQ29yZUNvbG9yUHJvdmlkZXJfaW52YWxpZF9jb2xvcik6 CisgICAgICAgIChUZXN0U3VtbWFyeVByb3ZpZGVycy5zZXJpYWxfdGVzdF9XZWJDb3JlQ29sb3JQ cm92aWRlcl9leHRlbmRlZF9jb2xvcik6CisgICAgICAgIChUZXN0U3VtbWFyeVByb3ZpZGVycy5z ZXJpYWxfdGVzdF9XZWJDb3JlQ29sb3JQcm92aWRlcl9yZ2JfY29sb3IpOgorICAgICAgICAoVGVz dFN1bW1hcnlQcm92aWRlcnMuc2VyaWFsX3Rlc3RfV2ViQ29yZUNvbG9yUHJvdmlkZXJfcmdiYV9j b2xvcik6CisKIDIwMTgtMDctMTcgIEFkaXR5YSBLZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29t PgogCiAgICAgICAgIFttYWNPU10gVGVzdFdlYktpdEFQSS5QaWN0dXJlSW5QaWN0dXJlLldLVUlE ZWxlZ2F0ZSBpcyB0aW1pbmcgb3V0CmRpZmYgLS1naXQgYS9Ub29scy9sbGRiL2xsZGJXZWJLaXRU ZXN0ZXIvbGxkYldlYktpdFRlc3Rlci54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvVG9vbHMv bGxkYi9sbGRiV2ViS2l0VGVzdGVyL2xsZGJXZWJLaXRUZXN0ZXIueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagppbmRleCAyODMyOTlhNTk5OTI2ODQyMTc1MGY1ZGNmMjMwZWQ0Nzg0MmE5MGEyLi5h ZThlZjE2Yjc5YjNlYTE1ZGRjYTVlODgxNDM2MWExMDg4OGU5MmIzIDEwMDY0NAotLS0gYS9Ub29s cy9sbGRiL2xsZGJXZWJLaXRUZXN0ZXIvbGxkYldlYktpdFRlc3Rlci54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qCisrKyBiL1Rvb2xzL2xsZGIvbGxkYldlYktpdFRlc3Rlci9sbGRiV2ViS2l0VGVz dGVyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTgsNiArOCw3IEBACiAKIC8qIEJlZ2lu IFBCWEJ1aWxkRmlsZSBzZWN0aW9uICovCiAJCTBGQzFDMzU0MjBFNTM5MUUwMDFFOUZCMCAvKiBE dW1wQ2xhc3NMYXlvdXRUZXN0aW5nLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDBGQzFDMzUzMjBFNTM5MUUwMDFFOUZCMCAvKiBEdW1wQ2xhc3NMYXlv dXRUZXN0aW5nLmNwcCAqLzsgfTsKKwkJMzE1NkExOTMyMEZFRUUzMjAwQ0EzQkEzIC8qIFdlYktp dC5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSAzMTU2QTE5MjIwRkVFRTMyMDBDQTNCQTMgLyogV2ViS2l0LmZyYW1ld29yayAqLzsgfTsK IAkJN0NCNjg0NEIxQUZBNzk3ODAwMkIzMDVDIC8qIG1haW4uY3BwIGluIFNvdXJjZXMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gN0NCNjg0NEExQUZBNzk3ODAwMkIzMDVDIC8q IG1haW4uY3BwICovOyB9OwogCQlDRTZDM0FGRjIwQzBCMTdCMDAzRTMzRDggLyogbGliV1RGLmEg aW4gRnJhbWV3b3JrcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDRTZDM0FG RTIwQzBCMTdCMDAzRTMzRDggLyogbGliV1RGLmEgKi87IH07CiAJCUNFNkMzQjAxMjBDMEM0NDQw MDNFMzNEOCAvKiBsaWJpY3Vjb3JlLmR5bGliIGluIEZyYW1ld29ya3MgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gQ0U2QzNCMDAyMEMwQzQ0MzAwM0UzM0Q4IC8qIGxpYmljdWNv cmUuZHlsaWIgKi87IH07CkBAIC0yOCw2ICsyOSw3IEBACiAvKiBCZWdpbiBQQlhGaWxlUmVmZXJl bmNlIHNlY3Rpb24gKi8KIAkJMEZDMUMzNTMyMEU1MzkxRTAwMUU5RkIwIC8qIER1bXBDbGFzc0xh eW91dFRlc3RpbmcuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gRHVt cENsYXNzTGF5b3V0VGVzdGluZy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTBG QzFDMzU1MjBFNTM5MzIwMDFFOUZCMCAvKiBEdW1wQ2xhc3NMYXlvdXRUZXN0aW5nLmggKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMu aDsgcGF0aCA9IER1bXBDbGFzc0xheW91dFRlc3RpbmcuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKKwkJMzE1NkExOTIyMEZFRUUzMjAwQ0EzQkEzIC8qIFdlYktpdC5mcmFtZXdvcmsgKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSB3cmFwcGVyLmZy YW1ld29yazsgbmFtZSA9IFdlYktpdC5mcmFtZXdvcms7IHBhdGggPSBXZWJLaXQuZnJhbWV3b3Jr OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3QzIyMjc1MTFBRkM0RDlDMDA4QzMzMzgg LyogQmFzZS54Y2NvbmZpZyAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25G aWxlVHlwZSA9IHRleHQueGNjb25maWc7IHBhdGggPSBCYXNlLnhjY29uZmlnOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQk3QzIyMjc1MjFBRkM0RDlDMDA4QzMzMzggLyogbGxkYldlYktp dFRlc3Rlci54Y2NvbmZpZyAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25G aWxlVHlwZSA9IHRleHQueGNjb25maWc7IHBhdGggPSBsbGRiV2ViS2l0VGVzdGVyLnhjY29uZmln OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3QzIyMjc1MzFBRkM0RDlDMDA4QzMzMzgg LyogRGVidWdSZWxlYXNlLnhjY29uZmlnICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxh c3RLbm93bkZpbGVUeXBlID0gdGV4dC54Y2NvbmZpZzsgcGF0aCA9IERlYnVnUmVsZWFzZS54Y2Nv bmZpZzsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTQ0LDYgKzQ2LDcgQEAKIAkJCWZp bGVzID0gKAogCQkJCUNFNkMzQjAxMjBDMEM0NDQwMDNFMzNEOCAvKiBsaWJpY3Vjb3JlLmR5bGli IGluIEZyYW1ld29ya3MgKi8sCiAJCQkJQ0U2QzNBRkYyMEMwQjE3QjAwM0UzM0Q4IC8qIGxpYldU Ri5hIGluIEZyYW1ld29ya3MgKi8sCisJCQkJMzE1NkExOTMyMEZFRUUzMjAwQ0EzQkEzIC8qIFdl YktpdC5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVw bG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKQEAgLTkzLDYgKzk2LDcgQEAKIAkJCWNo aWxkcmVuID0gKAogCQkJCUNFNkMzQjAwMjBDMEM0NDMwMDNFMzNEOCAvKiBsaWJpY3Vjb3JlLmR5 bGliICovLAogCQkJCUNFNkMzQUZFMjBDMEIxN0IwMDNFMzNEOCAvKiBsaWJXVEYuYSAqLywKKwkJ CQkzMTU2QTE5MjIwRkVFRTMyMDBDQTNCQTMgLyogV2ViS2l0LmZyYW1ld29yayAqLywKIAkJCSk7 CiAJCQluYW1lID0gRnJhbWV3b3JrczsKIAkJCXNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7CmRpZmYg LS1naXQgYS9Ub29scy9sbGRiL2xsZGJXZWJLaXRUZXN0ZXIvbWFpbi5jcHAgYi9Ub29scy9sbGRi L2xsZGJXZWJLaXRUZXN0ZXIvbWFpbi5jcHAKaW5kZXggOWM3MjQ0MWFkZGJjZGI5MTdiMzMxZTAw NmY0MDAzMTdiZmVmMWIzMS4uOWRiNjdjZDI0ZmNiMGU0NzYzNmJjZTFiNWE3Y2ExNmYzNzBkMWEy MSAxMDA2NDQKLS0tIGEvVG9vbHMvbGxkYi9sbGRiV2ViS2l0VGVzdGVyL21haW4uY3BwCisrKyBi L1Rvb2xzL2xsZGIvbGxkYldlYktpdFRlc3Rlci9tYWluLmNwcApAQCAtMjMsOCArMjMsMTEgQEAK ICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCisjZGVmaW5lIFdFQkNP UkVfRVhQT1JUCisKICNpbmNsdWRlICJEdW1wQ2xhc3NMYXlvdXRUZXN0aW5nLmgiCiAjaW5jbHVk ZSA8c3RkaW8uaD4KKyNpbmNsdWRlIDxXZWJDb3JlL0NvbG9yLmg+CiAjaW5jbHVkZSA8d3RmL3Rl eHQvU3RyaW5nQnVpbGRlci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCkBA IC02MSw3ICs2NCwxNCBAQCBzdGF0aWMgdm9pZCB0ZXN0U3VtbWFyeVByb3ZpZGVycygpCiAgICAg YVZlY3RvcldpdGhPbmVJdGVtLnJlc2VydmVDYXBhY2l0eSgxNik7CiAgICAgYVZlY3RvcldpdGhP bmVJdGVtLmFwcGVuZCgxKTsKIAorICAgIGF1dG8gaW52YWxpZENvbG9yID0gV2ViQ29yZTo6Q29s b3IgeyB9OworICAgIGF1dG8gcmdiQ29sb3IgPSBXZWJDb3JlOjpDb2xvciB7IDI1NSwgMTI4LCA2 NCB9OworICAgIGF1dG8gcmdiYUNvbG9yID0gV2ViQ29yZTo6Q29sb3IgeyAyNTUsIDEyOCwgNjQs IDEyOCB9OworICAgIGF1dG8gZXh0ZW5kZWRDb2xvciA9IFdlYkNvcmU6OkNvbG9yKDAuMSwgMC4y LCAwLjMsIDAuNCwgV2ViQ29yZTo6Q29sb3JTcGFjZURpc3BsYXlQMyk7CisKICAgICBicmVha0Zv clRlc3RpbmdTdW1tYXJ5UHJvdmlkZXJzKCk7CisKKyAgICBleHRlbmRlZENvbG9yLmFscGhhKCk7 IC8vIFVzZSB0aGUgdmFyaWFibGUgYWZ0ZXIgdGhlIGJyZWFrIHBvaW50IHNvIHRoYXQgaXQgZG9l c24ndCBnZXQgZGVyZWZlZC4KIH0KIAogaW50IG1haW4oaW50IGFyZ2MsIGNvbnN0IGNoYXIqIGFy Z3ZbXSkKZGlmZiAtLWdpdCBhL1Rvb2xzL2xsZGIvbGxkYl93ZWJraXQucHkgYi9Ub29scy9sbGRi L2xsZGJfd2Via2l0LnB5CmluZGV4IDUyZmI3YTQ0MzJjNDdlMDU5M2Q0OGYzNjNjNzU1OTI4OTBl ZDM4ODkuLmIyNmZhODEyYmQzYzg3YzczMDU4YTE3NWI1YWI4YjNjNjc1YjM3ZGIgMTAwNjQ0Ci0t LSBhL1Rvb2xzL2xsZGIvbGxkYl93ZWJraXQucHkKKysrIGIvVG9vbHMvbGxkYi9sbGRiX3dlYmtp dC5weQpAQCAtNDQsNiArNDQsNyBAQCBkZWYgX19sbGRiX2luaXRfbW9kdWxlKGRlYnVnZ2VyLCBk aWN0KToKICAgICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBlIHN1bW1hcnkgYWRkIC0tZXhw YW5kIC1GIGxsZGJfd2Via2l0LldURk1lZGlhVGltZV9TdW1tYXJ5UHJvdmlkZXIgV1RGOjpNZWRp YVRpbWUnKQogICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3ludGhldGljIGFkZCAt eCAiV1RGOjpWZWN0b3I8Lis+JCIgLS1weXRob24tY2xhc3MgbGxkYl93ZWJraXQuV1RGVmVjdG9y UHJvdmlkZXInKQogICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3ludGhldGljIGFk ZCAteCAiV1RGOjpIYXNoVGFibGU8Lis+JCIgLS1weXRob24tY2xhc3MgbGxkYl93ZWJraXQuV1RG SGFzaFRhYmxlUHJvdmlkZXInKQorICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3Vt bWFyeSBhZGQgLUYgbGxkYl93ZWJraXQuV2ViQ29yZUNvbG9yX1N1bW1hcnlQcm92aWRlciBXZWJD b3JlOjpDb2xvcicpCiAgICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzdW1tYXJ5IGFk ZCAtRiBsbGRiX3dlYmtpdC5XZWJDb3JlTGF5b3V0VW5pdF9TdW1tYXJ5UHJvdmlkZXIgV2ViQ29y ZTo6TGF5b3V0VW5pdCcpCiAgICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzdW1tYXJ5 IGFkZCAtRiBsbGRiX3dlYmtpdC5XZWJDb3JlTGF5b3V0U2l6ZV9TdW1tYXJ5UHJvdmlkZXIgV2Vi Q29yZTo6TGF5b3V0U2l6ZScpCiAgICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzdW1t YXJ5IGFkZCAtRiBsbGRiX3dlYmtpdC5XZWJDb3JlTGF5b3V0UG9pbnRfU3VtbWFyeVByb3ZpZGVy IFdlYkNvcmU6OkxheW91dFBvaW50JykKQEAgLTk2LDYgKzk3LDExIEBAIGRlZiBXVEZNZWRpYVRp bWVfU3VtbWFyeVByb3ZpZGVyKHZhbG9iaiwgZGljdCk6CiAgICAgcmV0dXJuICJ7ICVkLyVkLCAl ZiB9IiAlIChwcm92aWRlci50aW1lVmFsdWUoKSwgcHJvdmlkZXIudGltZVNjYWxlKCksIGZsb2F0 KHByb3ZpZGVyLnRpbWVWYWx1ZSgpKSAvIHByb3ZpZGVyLnRpbWVTY2FsZSgpKQogCiAKK2RlZiBX ZWJDb3JlQ29sb3JfU3VtbWFyeVByb3ZpZGVyKHZhbG9iaiwgZGljdCk6CisgICAgcHJvdmlkZXIg PSBXZWJDb3JlQ29sb3JQcm92aWRlcih2YWxvYmosIGRpY3QpCisgICAgcmV0dXJuICJ7ICVzIH0i ICUgcHJvdmlkZXIudG9fc3RyaW5nKCkKKworCiBkZWYgV2ViQ29yZVVSTF9TdW1tYXJ5UHJvdmlk ZXIodmFsb2JqLCBkaWN0KToKICAgICBwcm92aWRlciA9IFdlYkNvcmVVUkxQcm92aWRlcih2YWxv YmosIGRpY3QpCiAgICAgcmV0dXJuICJ7ICVzIH0iICUgcHJvdmlkZXIudG9fc3RyaW5nKCkKQEAg LTMwOSw2ICszMTUsNTkgQEAgY2xhc3MgV1RGU3RyaW5nUHJvdmlkZXI6CiAgICAgICAgIHJldHVy biBpbXBsLnRvX3N0cmluZygpCiAKIAorY2xhc3MgV2ViQ29yZUNvbG9yUHJvdmlkZXI6CisgICAg IlByaW50IGEgV2ViQ29yZTo6Q29sb3IiCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHZhbG9iaiwg ZGljdCk6CisgICAgICAgIHNlbGYudmFsb2JqID0gdmFsb2JqCisKKyAgICBkZWYgX2lzX2V4dGVu ZGVkKHNlbGYsIHJnYmFBbmRGbGFncyk6CisgICAgICAgIHJldHVybiBub3QgKHJnYmFBbmRGbGFn cyAmIDB4MSkKKworICAgIGRlZiBfaXNfdmFsaWQoc2VsZiwgcmdiYUFuZEZsYWdzKToKKyAgICAg ICAgIyBBc3N1bWVzIG5vdCBleHRlbmRlZC4KKyAgICAgICAgcmV0dXJuIChyZ2JhQW5kRmxhZ3Mg JiAweDIpCisKKyAgICBkZWYgX2lzX3NlbWFudGljKHNlbGYsIHJnYmFBbmRGbGFncyk6CisgICAg ICAgICMgQXNzdW1lcyBub3QgZXh0ZW5kZWQuCisgICAgICAgIHJldHVybiByZ2JhQW5kRmxhZ3Mg JiAweDQKKworICAgIGRlZiBfdG9fc3RyaW5nX2V4dGVuZGVkKHNlbGYpOgorICAgICAgICBleHRl bmRlZENvbG9yID0gc2VsZi52YWxvYmouR2V0Q2hpbGRNZW1iZXJXaXRoTmFtZSgnbV9jb2xvckRh dGEnKS5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdleHRlbmRlZENvbG9yJykuRGVyZWZlcmVuY2Uo KQorICAgICAgICBwcm9maWxlID0gZXh0ZW5kZWRDb2xvci5HZXRDaGlsZE1lbWJlcldpdGhOYW1l KCdtX2NvbG9yU3BhY2UnKS5HZXRWYWx1ZSgpCisgICAgICAgIGlmIHByb2ZpbGUgPT0gIkNvbG9y U3BhY2VTUkdCIjoKKyAgICAgICAgICAgIHByb2ZpbGUgPSAic3JnYiIKKyAgICAgICAgZWxpZiBw cm9maWxlID09ICJDb2xvclNwYWNlRGlzcGxheVAzIjoKKyAgICAgICAgICAgIHByb2ZpbGUgPSAi ZGlzcGxheS1wMyIKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHByb2ZpbGUgPSAidW5rbm93 biIKKyAgICAgICAgcmVkID0gZmxvYXQoZXh0ZW5kZWRDb2xvci5HZXRDaGlsZE1lbWJlcldpdGhO YW1lKCdtX3JlZCcpLkdldFZhbHVlKCkpCisgICAgICAgIGdyZWVuID0gZmxvYXQoZXh0ZW5kZWRD b2xvci5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdtX2dyZWVuJykuR2V0VmFsdWUoKSkKKyAgICAg ICAgYmx1ZSA9IGZsb2F0KGV4dGVuZGVkQ29sb3IuR2V0Q2hpbGRNZW1iZXJXaXRoTmFtZSgnbV9i bHVlJykuR2V0VmFsdWUoKSkKKyAgICAgICAgYWxwaGEgPSBmbG9hdChleHRlbmRlZENvbG9yLkdl dENoaWxkTWVtYmVyV2l0aE5hbWUoJ21fYWxwaGEnKS5HZXRWYWx1ZSgpKQorICAgICAgICByZXR1 cm4gImNvbG9yKCVzICUxLjJmICUxLjJmICUxLjJmIC8gJTEuMmYpIiAlIChwcm9maWxlLCByZWQs IGdyZWVuLCBibHVlLCBhbHBoYSkKKworICAgIGRlZiB0b19zdHJpbmcoc2VsZik6CisKKyAgICAg ICAgcmdiYUFuZEZsYWdzID0gc2VsZi52YWxvYmouR2V0Q2hpbGRNZW1iZXJXaXRoTmFtZSgnbV9j b2xvckRhdGEnKS5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdyZ2JhQW5kRmxhZ3MnKS5HZXRWYWx1 ZUFzVW5zaWduZWQoMCkKKworICAgICAgICBpZiBzZWxmLl9pc19leHRlbmRlZChyZ2JhQW5kRmxh Z3MpOgorICAgICAgICAgICAgcmV0dXJuIHNlbGYuX3RvX3N0cmluZ19leHRlbmRlZCgpCisKKyAg ICAgICAgaWYgbm90IHNlbGYuX2lzX3ZhbGlkKHJnYmFBbmRGbGFncyk6CisgICAgICAgICAgICBy ZXR1cm4gImludmFsaWQiCisKKyAgICAgICAgY29sb3IgPSByZ2JhQW5kRmxhZ3MgPj4gMzIKKyAg ICAgICAgcmVkID0gKGNvbG9yID4+IDE2KSAmIDB4RkYKKyAgICAgICAgZ3JlZW4gPSAoY29sb3Ig Pj4gOCkgJiAweEZGCisgICAgICAgIGJsdWUgPSBjb2xvciAmIDB4RkYKKyAgICAgICAgYWxwaGEg PSAoKGNvbG9yID4+IDI0KSAmIDB4RkYpIC8gMjU1LjAKKworICAgICAgICBzZW1hbnRpYyA9ICIg c2VtYW50aWMiIGlmIHNlbGYuX2lzX3NlbWFudGljKHJnYmFBbmRGbGFncykgZWxzZSAiIgorCisg ICAgICAgIHJlc3VsdCA9ICJyZ2JhKCVkLCAlZCwgJWQsICUxLjJmKSVzIiAlIChyZWQsIGdyZWVu LCBibHVlLCBhbHBoYSwgc2VtYW50aWMpCisgICAgICAgIHJldHVybiByZXN1bHQKKworCiBjbGFz cyBXZWJDb3JlTGF5b3V0VW5pdFByb3ZpZGVyOgogICAgICJQcmludCBhIFdlYkNvcmU6OkxheW91 dFVuaXQiCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHZhbG9iaiwgZGljdCk6CmRpZmYgLS1naXQg YS9Ub29scy9sbGRiL2xsZGJfd2Via2l0X3VuaXR0ZXN0LnB5IGIvVG9vbHMvbGxkYi9sbGRiX3dl YmtpdF91bml0dGVzdC5weQppbmRleCA5NTMwMjBmMWNmYWEzZGZjYWE0NDM2Yzg0YWZjYjczMmU2 ZWQwN2VmLi5lZjg4ZTY5ZmU2MjllZWViMTIyNmJjOGIxYmViYWE4OTg2Yjc4MmQ1IDEwMDc1NQot LS0gYS9Ub29scy9sbGRiL2xsZGJfd2Via2l0X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL2xsZGIv bGxkYl93ZWJraXRfdW5pdHRlc3QucHkKQEAgLTE1MiwzICsxNTIsMzAgQEAgY2xhc3MgVGVzdFN1 bW1hcnlQcm92aWRlcnModW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydElz Tm90Tm9uZSh2YXJpYWJsZSkKICAgICAgICAgc3VtbWFyeSA9IGxsZGJfd2Via2l0LldURlZlY3Rv cl9TdW1tYXJ5UHJvdmlkZXIodmFyaWFibGUsIHt9KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFs KHN1bW1hcnksICJ7IHNpemUgPSAxLCBjYXBhY2l0eSA9IDE2IH0iKQorCisgICAgIyBNQVJLOiBX ZWJDb3JlQ29sb3JfU3VtbWFyeVByb3ZpZGVyIHRlc3QgY2FzZXMKKworICAgIGRlZiBzZXJpYWxf dGVzdF9XZWJDb3JlQ29sb3JQcm92aWRlcl9pbnZhbGlkX2NvbG9yKHNlbGYpOgorICAgICAgICB2 YXJpYWJsZSA9IHNlbGYuX3NiRnJhbWUuRmluZFZhcmlhYmxlKCdpbnZhbGlkQ29sb3InKTsKKyAg ICAgICAgc2VsZi5hc3NlcnRJc05vdE5vbmUodmFyaWFibGUpCisgICAgICAgIHN1bW1hcnkgPSBs bGRiX3dlYmtpdC5XZWJDb3JlQ29sb3JQcm92aWRlcl9TdW1tYXJ5UHJvdmlkZXIodmFyaWFibGUs IHt9KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN1bW1hcnksICJ7IGludmFsaWQgfSIpCisK KyAgICBkZWYgc2VyaWFsX3Rlc3RfV2ViQ29yZUNvbG9yUHJvdmlkZXJfZXh0ZW5kZWRfY29sb3Io c2VsZik6CisgICAgICAgIHZhcmlhYmxlID0gc2VsZi5fc2JGcmFtZS5GaW5kVmFyaWFibGUoJ2V4 dGVuZGVkQ29sb3InKTsKKyAgICAgICAgc2VsZi5hc3NlcnRJc05vdE5vbmUodmFyaWFibGUpCisg ICAgICAgIHN1bW1hcnkgPSBsbGRiX3dlYmtpdC5XZWJDb3JlQ29sb3JQcm92aWRlcl9TdW1tYXJ5 UHJvdmlkZXIodmFyaWFibGUsIHt9KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN1bW1hcnks ICJ7IGNvbG9yKGRpc3BsYXktcDMgMC4xMCAwLjIwIDAuMzAgLyAwLjQwKSB9IikKKworICAgIGRl ZiBzZXJpYWxfdGVzdF9XZWJDb3JlQ29sb3JQcm92aWRlcl9yZ2JfY29sb3Ioc2VsZik6CisgICAg ICAgIHZhcmlhYmxlID0gc2VsZi5fc2JGcmFtZS5GaW5kVmFyaWFibGUoJ3JnYkNvbG9yJyk7Cisg ICAgICAgIHNlbGYuYXNzZXJ0SXNOb3ROb25lKHZhcmlhYmxlKQorICAgICAgICBzdW1tYXJ5ID0g bGxkYl93ZWJraXQuV2ViQ29yZUNvbG9yUHJvdmlkZXJfU3VtbWFyeVByb3ZpZGVyKHZhcmlhYmxl LCB7fSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzdW1tYXJ5LCAieyByZ2JhKDI1NSwgMTI4 LCA2NCwgMS4wMCkgfSIpCisKKyAgICBkZWYgc2VyaWFsX3Rlc3RfV2ViQ29yZUNvbG9yUHJvdmlk ZXJfcmdiYV9jb2xvcihzZWxmKToKKyAgICAgICAgdmFyaWFibGUgPSBzZWxmLl9zYkZyYW1lLkZp bmRWYXJpYWJsZSgncmdiYUNvbG9yJyk7CisgICAgICAgIHNlbGYuYXNzZXJ0SXNOb3ROb25lKHZh cmlhYmxlKQorICAgICAgICBzdW1tYXJ5ID0gbGxkYl93ZWJraXQuV2ViQ29yZUNvbG9yUHJvdmlk ZXJfU3VtbWFyeVByb3ZpZGVyKHZhcmlhYmxlLCB7fSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChzdW1tYXJ5LCAieyByZ2JhKDI1NSwgMTI4LCA2NCwgMC41MCkgfSIpCisK