36696 2010-03-27 01:35:45 -0700 scm_unittest: Get the SVNTest.test_svn_apply() unit test working again 2010-03-29 22:41:36 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 cjerdonek cjerdonek abarth cjerdonek commit-queue eric oldest_to_newest 204964 0 cjerdonek 2010-03-27 01:35:45 -0700 This was first stated here: https://bugs.webkit.org/show_bug.cgi?id=36257 The explanation for the failure was given here (extra spaces needed and patch.reviewer() not evaluating correctly): https://bugs.webkit.org/show_bug.cgi?id=36257#c3 204966 1 51820 cjerdonek 2010-03-27 01:48:12 -0700 Created attachment 51820 Proposed patch After this patch, this is the only failing "test-webkitpy --all" unit test: FAIL: test_sheriff_bot (webkitpy.tool.commands.sheriffbot_unittest.SheriffBotTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/chris_g4/dev/apple/WebKit-git/WebKitTools/Scripts/webkitpy/tool/commands/sheriffbot_unittest.py", line 47, in test_sheriff_bot self.assert_queue_outputs(SheriffBot(), work_item=mock_work_item, expected_stderr=expected_stderr) File "/Users/chris_g4/dev/apple/WebKit-git/WebKitTools/Scripts/webkitpy/tool/commands/queuestest.py", line 78, in assert_queue_outputs expected_stderr=expected_stderr.get("begin_work_queue", "")) File "/Users/chris_g4/dev/apple/WebKit-git/WebKitTools/Scripts/webkitpy/common/system/outputcapture.py", line 60, in assert_outputs testcase.assertEqual(stderr_string, expected_stderr) AssertionError: 'CAUTION: sheriff-bot will discard all local changes in "/private/tmp"\nRunning WebKit sheriff-bot.\n' != 'CAUTION: sheriff-bot will discard all local changes in "/Users/chris_g4/dev/apple/WebKit-git"\nRunning WebKit sheriff-bot.\n' 204994 2 abarth 2010-03-27 09:11:13 -0700 Looks reasonable, but I'll let Eric review it properly. The webkitpy.tool.commands.sheriffbot_unittest.SheriffBotTest is because the SCM unit tests aren't restoring the current working directory properly. 204995 3 eric 2010-03-27 09:14:29 -0700 (In reply to comment #2) > Looks reasonable, but I'll let Eric review it properly. > > The webkitpy.tool.commands.sheriffbot_unittest.SheriffBotTest is because the > SCM unit tests aren't restoring the current working directory properly. Actually, I suspect it's due to this line: http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/tool/commands/sheriffbot_unittest.py#L42 which should not be using os.getcwd() and instead using: http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/tool/mocktool.py#L328 204996 4 51820 eric 2010-03-27 09:16:14 -0700 Comment on attachment 51820 Proposed patch Wow, that is subtle. I would rather that the _reviewer setting be done inside _create_patch though. 204997 5 cjerdonek 2010-03-27 09:16:43 -0700 (In reply to comment #2) > Looks reasonable, but I'll let Eric review it properly. Thanks for the comment, Adam! I know you guys had some FIXME's around the Attachment part of that unit test, so getting the reviewer part to work was admittedly a bit hackish. But at least it works now. :) 204998 6 abarth 2010-03-27 09:22:29 -0700 (In reply to comment #3) > (In reply to comment #2) > > Looks reasonable, but I'll let Eric review it properly. > > > > The webkitpy.tool.commands.sheriffbot_unittest.SheriffBotTest is because the > > SCM unit tests aren't restoring the current working directory properly. > > Actually, I suspect it's due to this line: > http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/tool/commands/sheriffbot_unittest.py#L42 > which should not be using os.getcwd() and instead using: > http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/tool/mocktool.py#L328 The test passes fine without the --all flag, so I think it's some interaction between the SCM unit tests, that line, and the cwd. 204999 7 eric 2010-03-27 09:24:38 -0700 Yes. I remember diagnosing it when I added the fake_checkout_root stuff. I can't remember the cause now. I think its the style code which ends up changing the cwd. In either case, teh fake_checkout_root fix will work. We shouldn't be using os.getcwd anywhere really. 205000 8 cjerdonek 2010-03-27 09:28:04 -0700 (In reply to comment #4) > (From update of attachment 51820 [details]) > Wow, that is subtle. > > I would rather that the _reviewer setting be done inside _create_patch though. I believe that's what I had tried first, but then it broke like 9 other tests... That's partly what I meant by hackish. :) Per the FIXME's I saw at the top near the import statement and at the end of the _create_patch() method, this all needs to get refactored a bit anyways (e.g. not to use the Attachment class). I figured that can wait until later since it's a bigger change -- at which point your comment will get addressed. In the meantime I just wanted to get the test passing. 205001 9 cjerdonek 2010-03-27 09:30:04 -0700 (In reply to comment #7) > Yes. I remember diagnosing it when I added the fake_checkout_root stuff. I > can't remember the cause now. I think its the style code which ends up > changing the cwd. In either case, teh fake_checkout_root fix will work. We > shouldn't be using os.getcwd anywhere really. Yeah, I am using mock_os-type stuff in some of my new tests. 205002 10 cjerdonek 2010-03-27 09:32:42 -0700 (In reply to comment #8) > (In reply to comment #4) > > (From update of attachment 51820 [details] [details]) > > Wow, that is subtle. > > > > I would rather that the _reviewer setting be done inside _create_patch though. > > I believe that's what I had tried first, but then it broke like 9 other > tests... That's partly what I meant by hackish. :) Let me give it another shot, though. I might have done it wrong the first time since I might not have been using the Committer class, which I found out later I needed to use. 205003 11 51831 cjerdonek 2010-03-27 09:49:21 -0700 Created attachment 51831 Proposed patch 2 Yeah, just needed to use the Committer class in _create_patch(). Thanks for that. By the way, something seems a bit hard to use about the Attachment class in that the constructor accepts an attachment dictionary rather than a Committer instance, etc. It seems like it might be better if the constructor were more traditional and a factory method were used for the dictionary route. 205817 12 51831 eric 2010-03-29 19:57:29 -0700 Comment on attachment 51831 Proposed patch 2 LGTM. We should consider making some sort of note in teh file about the intentional trailing spaces. 205821 13 51831 commit-queue 2010-03-29 20:17:51 -0700 Comment on attachment 51831 Proposed patch 2 Rejecting patch 51831 from commit-queue. Failed to run "['WebKitTools/Scripts/run-javascriptcore-tests']" exit_code: 139 Last 500 characters of output: rojects/CommitQueue/WebKitBuild/JavaScriptCore.build/Release/JavaScriptCore.build/Script-933457200EBFDC3F00B80894.sh PhaseScriptExecution /Users/eseidel/Projects/CommitQueue/WebKitBuild/JavaScriptCore.build/Release/JavaScriptCore.build/Script-5D29D8BE0E9860B400C3D2D0.sh cd /Users/eseidel/Projects/CommitQueue/JavaScriptCore /bin/sh -c /Users/eseidel/Projects/CommitQueue/WebKitBuild/JavaScriptCore.build/Release/JavaScriptCore.build/Script-5D29D8BE0E9860B400C3D2D0.sh Compiling jsc failed! Full output: http://webkit-commit-queue.appspot.com/results/1603081 205845 14 51831 eric 2010-03-29 22:10:28 -0700 Comment on attachment 51831 Proposed patch 2 We'll hope this was cosmic rays. 205853 15 51831 commit-queue 2010-03-29 22:41:31 -0700 Comment on attachment 51831 Proposed patch 2 Clearing flags on attachment: 51831 Committed r56762: <http://trac.webkit.org/changeset/56762> 205854 16 commit-queue 2010-03-29 22:41:36 -0700 All reviewed patches have been landed. Closing bug. 51820 2010-03-27 01:48:12 -0700 2010-03-27 09:49:21 -0700 Proposed patch _patch-36696-1.diff text/plain 3918 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2YjI5ZjZkLi41NGJkMDY1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDMt MjcgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR2V0IHRoZSBmb2xsb3dpbmcgdGVz dC13ZWJraXRweSB1bml0IHRlc3Qgd29ya2luZyBhZ2FpbjoKKyAgICAgICAgc2NtX3VuaXR0ZXN0 LlNWTlRlc3QudGVzdF9zdm5fYXBwbHkoKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY2OTYKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv Y29tbW9uL2NoZWNrb3V0L3NjbV91bml0dGVzdC5weToKKyAgICAgICAgICAtIEFkZCBsZWFkaW5n IHNwYWNlcyB0byB0aGUgZW1wdHkgbGluZXMgb2YgdGhlIENoYW5nZUxvZyBzdHJpbmdzLgorICAg ICAgICAgIC0gTWFudWFsbHkgc2V0IHRoZSBfcmV2aWV3ZXIgYXR0cmlidXRlIG9uIHRoZSBBdHRh Y2htZW50IG9iamVjdAorICAgICAgICAgICAgdG8gZ2V0IHRoZSB0ZXN0cyB0byBwYXNzLgorCiAy MDEwLTAzLTI2ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jaGVja291dC9zY21fdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY21fdW5pdHRlc3QucHkKaW5kZXggOWI1ZDgx Mi4uM2RhMDZlZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vY2hlY2tvdXQvc2NtX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbV91bml0dGVzdC5weQpAQCAtNDEsNiArNDEsNyBAQCBp bXBvcnQgdXJsbGliCiBmcm9tIGRhdGV0aW1lIGltcG9ydCBkYXRlCiBmcm9tIHdlYmtpdHB5LmNv bW1vbi5jaGVja291dC5hcGkgaW1wb3J0IENoZWNrb3V0CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5j aGVja291dC5zY20gaW1wb3J0IGRldGVjdF9zY21fc3lzdGVtLCBTQ00sIFNWTiwgQ2hlY2tvdXRO ZWVkc1VwZGF0ZSwgY29tbWl0X2Vycm9yX2hhbmRsZXIKK2Zyb20gd2Via2l0cHkuY29tbW9uLmNv bmZpZy5jb21taXR0ZXJzIGltcG9ydCBDb21taXR0ZXIgICMgRklYTUU6IFRoaXMgc2hvdWxkIG5v dCBiZSBuZWVkZWQKIGZyb20gd2Via2l0cHkuY29tbW9uLm5ldC5idWd6aWxsYSBpbXBvcnQgQXR0 YWNobWVudCAjIEZJWE1FOiBUaGlzIHNob3VsZCBub3QgYmUgbmVlZGVkCiBmcm9tIHdlYmtpdHB5 LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBFeGVjdXRpdmUsIHJ1bl9jb21tYW5kLCBT Y3JpcHRFcnJvcgogCkBAIC0zMjAsNiArMzIxLDggQEAgY2xhc3MgU1ZOVGVzdChTQ01UZXN0KToK ICAgICAgICAgcmV0dXJuIGNoYW5nZWxvZ19lbnRyeS5yZXBsYWNlKCdEQVRFX0hFUkUnLCBkYXRl LnRvZGF5KCkuaXNvZm9ybWF0KCkpCiAKICAgICBkZWYgdGVzdF9zdm5fYXBwbHkoc2VsZik6Cisg ICAgICAgIGpvZV9jb29sID0gQ29tbWl0dGVyKG5hbWU9IkpvZSBDb29sIiwgZW1haWxfb3JfZW1h aWxzPU5vbmUpCisKICAgICAgICAgZmlyc3RfZW50cnkgPSAiIiIyMDA5LTEwLTI2ICBFcmljIFNl aWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBGb28gQmFyLgpA QCAtMzQyLDcgKzM0NSw3IEBAIGNsYXNzIFNWTlRlc3QoU0NNVGVzdCk6CiArKysgQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCiBAQCAtMSw1ICsxLDEzIEBACiAgMjAwOS0xMC0yNiAgRXJpYyBTZWlk ZWwgIDxlcmljQHdlYmtpdC5vcmc+Ci0KKyAKICsgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgogKwogKyAgICAgICAgU2Vjb25kIG1vc3QgYXdlc29tZSBjaGFuZ2UgZXZlci4KQEAg LTM1Miw3ICszNTUsNyBAQCBjbGFzcyBTVk5UZXN0KFNDTVRlc3QpOgogKzIwMDktMTAtMjYgIEVy aWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogKwogICAgICAgICAgUmV2aWV3ZWQgYnkgRm9v IEJhci4KLQorIAogICAgICAgICAgTW9zdCBhd2Vzb21lIGNoYW5nZSBldmVyLgogIiIiCiAgICAg ICAgIG9uZV9saW5lX292ZXJsYXBfZW50cnkgPSAiIiJEQVRFX0hFUkUgIEVyaWMgU2VpZGVsICA8 ZXJpY0B3ZWJraXQub3JnPgpAQCAtMzY4LDkgKzM3MSw5IEBAIGNsYXNzIFNWTlRlc3QoU0NNVGVz dCk6CiAtLS0gQ2hhbmdlTG9nCShyZXZpc2lvbiA1KQogKysrIENoYW5nZUxvZwkod29ya2luZyBj b3B5KQogQEAgLTIsNiArMiwxNCBAQAotCisgCiAgICAgICAgICBSZXZpZXdlZCBieSBGb28gQmFy LgotCisgCiArICAgICAgICBTZWNvbmQgbW9zdCBhd2Vzb21lIGNoYW5nZSBldmVyLgogKwogKyAg ICAgICAgKiBzY21fdW5pdHRlc3QucHk6CkBAIC0zODAsNyArMzgzLDcgQEAgY2xhc3MgU1ZOVGVz dChTQ01UZXN0KToKICsgICAgICAgIFJldmlld2VkIGJ5IEZvbyBCYXIuCiArCiAgICAgICAgICBN b3N0IGF3ZXNvbWUgY2hhbmdlIGV2ZXIuCi0KKyAKICAgICAgICAgICogc2NtX3VuaXR0ZXN0LnB5 OgogIiIiCiAgICAgICAgIHR3b19saW5lX292ZXJsYXBfZW50cnkgPSAiIiJEQVRFX0hFUkUgIEVy aWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgpAQCAtNDAyLDEyICs0MDUsMTYgQEAgY2xhc3Mg U1ZOVGVzdChTQ01UZXN0KToKICAgICAgICAgcnVuX2NvbW1hbmQoWydzdm4nLCAnY29tbWl0Jywg Jy0tcXVpZXQnLCAnLS1tZXNzYWdlJywgJ0ludGVybWVkaWF0ZSBjb21taXQnXSkKIAogICAgICAg ICBzZWxmLl9zZXR1cF93ZWJraXR0b29sc19zY3JpcHRzX3N5bWxpbmsoc2VsZi5zY20pCi0gICAg ICAgIHNlbGYuY2hlY2tvdXQuYXBwbHlfcGF0Y2goc2VsZi5fY3JlYXRlX3BhdGNoKG9uZV9saW5l X292ZXJsYXBfcGF0Y2gpKQorICAgICAgICBwYXRjaCA9IHNlbGYuX2NyZWF0ZV9wYXRjaChvbmVf bGluZV9vdmVybGFwX3BhdGNoKQorICAgICAgICBwYXRjaC5fcmV2aWV3ZXIgPSBqb2VfY29vbAor ICAgICAgICBzZWxmLmNoZWNrb3V0LmFwcGx5X3BhdGNoKHBhdGNoKQogICAgICAgICBleHBlY3Rl ZF9jaGFuZ2Vsb2dfY29udGVudHMgPSAiJXNcbiVzIiAlIChzZWxmLl9zZXRfZGF0ZV9hbmRfcmV2 aWV3ZXIob25lX2xpbmVfb3ZlcmxhcF9lbnRyeSksIGNoYW5nZWxvZ19jb250ZW50cykKICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbHMocmVhZF9mcm9tX3BhdGgoJ0NoYW5nZUxvZycpLCBleHBlY3Rl ZF9jaGFuZ2Vsb2dfY29udGVudHMpCiAKICAgICAgICAgc2VsZi5zY20ucmV2ZXJ0X2ZpbGVzKFsn Q2hhbmdlTG9nJ10pCi0gICAgICAgIHNlbGYuY2hlY2tvdXQuYXBwbHlfcGF0Y2goc2VsZi5fY3Jl YXRlX3BhdGNoKHR3b19saW5lX292ZXJsYXBfcGF0Y2gpKQorICAgICAgICBwYXRjaCA9IHNlbGYu X2NyZWF0ZV9wYXRjaCh0d29fbGluZV9vdmVybGFwX3BhdGNoKQorICAgICAgICBwYXRjaC5fcmV2 aWV3ZXIgPSBqb2VfY29vbAorICAgICAgICBzZWxmLmNoZWNrb3V0LmFwcGx5X3BhdGNoKHBhdGNo KQogICAgICAgICBleHBlY3RlZF9jaGFuZ2Vsb2dfY29udGVudHMgPSAiJXNcbiVzIiAlIChzZWxm Ll9zZXRfZGF0ZV9hbmRfcmV2aWV3ZXIodHdvX2xpbmVfb3ZlcmxhcF9lbnRyeSksIGNoYW5nZWxv Z19jb250ZW50cykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocmVhZF9mcm9tX3BhdGgoJ0No YW5nZUxvZycpLCBleHBlY3RlZF9jaGFuZ2Vsb2dfY29udGVudHMpCiAK 51831 2010-03-27 09:49:21 -0700 2010-03-29 22:41:31 -0700 Proposed patch 2 _patch-36696-2.diff text/plain 3366 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2YjI5ZjZkLi41NGJkMDY1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDMt MjcgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR2V0IHRoZSBmb2xsb3dpbmcgdGVz dC13ZWJraXRweSB1bml0IHRlc3Qgd29ya2luZyBhZ2FpbjoKKyAgICAgICAgc2NtX3VuaXR0ZXN0 LlNWTlRlc3QudGVzdF9zdm5fYXBwbHkoKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY2OTYKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv Y29tbW9uL2NoZWNrb3V0L3NjbV91bml0dGVzdC5weToKKyAgICAgICAgICAtIEFkZCBsZWFkaW5n IHNwYWNlcyB0byB0aGUgZW1wdHkgbGluZXMgb2YgdGhlIENoYW5nZUxvZyBzdHJpbmdzLgorICAg ICAgICAgIC0gTWFudWFsbHkgc2V0IHRoZSBfcmV2aWV3ZXIgYXR0cmlidXRlIG9uIHRoZSBBdHRh Y2htZW50IG9iamVjdAorICAgICAgICAgICAgdG8gZ2V0IHRoZSB0ZXN0cyB0byBwYXNzLgorCiAy MDEwLTAzLTI2ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jaGVja291dC9zY21fdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY21fdW5pdHRlc3QucHkKaW5kZXggOWI1ZDgx Mi4uNTg2MTYzNSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vY2hlY2tvdXQvc2NtX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbV91bml0dGVzdC5weQpAQCAtNDEsNiArNDEsNyBAQCBp bXBvcnQgdXJsbGliCiBmcm9tIGRhdGV0aW1lIGltcG9ydCBkYXRlCiBmcm9tIHdlYmtpdHB5LmNv bW1vbi5jaGVja291dC5hcGkgaW1wb3J0IENoZWNrb3V0CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5j aGVja291dC5zY20gaW1wb3J0IGRldGVjdF9zY21fc3lzdGVtLCBTQ00sIFNWTiwgQ2hlY2tvdXRO ZWVkc1VwZGF0ZSwgY29tbWl0X2Vycm9yX2hhbmRsZXIKK2Zyb20gd2Via2l0cHkuY29tbW9uLmNv bmZpZy5jb21taXR0ZXJzIGltcG9ydCBDb21taXR0ZXIgICMgRklYTUU6IFRoaXMgc2hvdWxkIG5v dCBiZSBuZWVkZWQKIGZyb20gd2Via2l0cHkuY29tbW9uLm5ldC5idWd6aWxsYSBpbXBvcnQgQXR0 YWNobWVudCAjIEZJWE1FOiBUaGlzIHNob3VsZCBub3QgYmUgbmVlZGVkCiBmcm9tIHdlYmtpdHB5 LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBFeGVjdXRpdmUsIHJ1bl9jb21tYW5kLCBT Y3JpcHRFcnJvcgogCkBAIC0xNzQsMTAgKzE3NSwxNCBAQCBjbGFzcyBTQ01UZXN0KHVuaXR0ZXN0 LlRlc3RDYXNlKToKICAgICAgICAgcGF0Y2hfcGF0aCA9IG9zLnBhdGguam9pbihzZWxmLnN2bl9j aGVja291dF9wYXRoLCAncGF0Y2guZGlmZicpCiAgICAgICAgIHdyaXRlX2ludG9fZmlsZV9hdF9w YXRoKHBhdGNoX3BhdGgsIHBhdGNoX2NvbnRlbnRzKQogICAgICAgICBwYXRjaCA9IHt9Ci0gICAg ICAgIHBhdGNoWydyZXZpZXdlciddID0gJ0pvZSBDb29sJwogICAgICAgICBwYXRjaFsnYnVnX2lk J10gPSAnMTIzNDUnCiAgICAgICAgIHBhdGNoWyd1cmwnXSA9ICdmaWxlOi8vJXMnICUgdXJsbGli LnBhdGhuYW1lMnVybChwYXRjaF9wYXRoKQotICAgICAgICByZXR1cm4gQXR0YWNobWVudChwYXRj aCwgTm9uZSkgIyBGSVhNRTogVGhpcyBpcyBhIGhhY2ssIHNjbS5weSBzaG91bGRuJ3QgYmUgZmV0 Y2hpbmcgYXR0YWNobWVudCBkYXRhLgorCisgICAgICAgIGF0dGFjaG1lbnQgPSBBdHRhY2htZW50 KHBhdGNoLCBOb25lKSAjIEZJWE1FOiBUaGlzIGlzIGEgaGFjaywgc2NtLnB5IHNob3VsZG4ndCBi ZSBmZXRjaGluZyBhdHRhY2htZW50IGRhdGEuCisgICAgICAgIGpvZV9jb29sID0gQ29tbWl0dGVy KG5hbWU9IkpvZSBDb29sIiwgZW1haWxfb3JfZW1haWxzPU5vbmUpCisgICAgICAgIGF0dGFjaG1l bnQuX3Jldmlld2VyID0gam9lX2Nvb2wKKworICAgICAgICByZXR1cm4gYXR0YWNobWVudAogCiAg ICAgZGVmIF9zZXR1cF93ZWJraXR0b29sc19zY3JpcHRzX3N5bWxpbmsoc2VsZiwgbG9jYWxfc2Nt KToKICAgICAgICAgd2Via2l0X3NjbSA9IGRldGVjdF9zY21fc3lzdGVtKG9zLnBhdGguZGlybmFt ZShvcy5wYXRoLmFic3BhdGgoX19maWxlX18pKSkKQEAgLTM0Miw3ICszNDcsNyBAQCBjbGFzcyBT Vk5UZXN0KFNDTVRlc3QpOgogKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQogQEAgLTEsNSAr MSwxMyBAQAogIDIwMDktMTAtMjYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgotCisg CiArICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KICsKICsgICAgICAgIFNlY29u ZCBtb3N0IGF3ZXNvbWUgY2hhbmdlIGV2ZXIuCkBAIC0zNTIsNyArMzU3LDcgQEAgY2xhc3MgU1ZO VGVzdChTQ01UZXN0KToKICsyMDA5LTEwLTI2ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9y Zz4KICsKICAgICAgICAgIFJldmlld2VkIGJ5IEZvbyBCYXIuCi0KKyAKICAgICAgICAgIE1vc3Qg YXdlc29tZSBjaGFuZ2UgZXZlci4KICIiIgogICAgICAgICBvbmVfbGluZV9vdmVybGFwX2VudHJ5 ID0gIiIiREFURV9IRVJFICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KQEAgLTM2OCw5 ICszNzMsOSBAQCBjbGFzcyBTVk5UZXN0KFNDTVRlc3QpOgogLS0tIENoYW5nZUxvZwkocmV2aXNp b24gNSkKICsrKyBDaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKIEBAIC0yLDYgKzIsMTQgQEAKLQor IAogICAgICAgICAgUmV2aWV3ZWQgYnkgRm9vIEJhci4KLQorIAogKyAgICAgICAgU2Vjb25kIG1v c3QgYXdlc29tZSBjaGFuZ2UgZXZlci4KICsKICsgICAgICAgICogc2NtX3VuaXR0ZXN0LnB5OgpA QCAtMzgwLDcgKzM4NSw3IEBAIGNsYXNzIFNWTlRlc3QoU0NNVGVzdCk6CiArICAgICAgICBSZXZp ZXdlZCBieSBGb28gQmFyLgogKwogICAgICAgICAgTW9zdCBhd2Vzb21lIGNoYW5nZSBldmVyLgot CisgCiAgICAgICAgICAqIHNjbV91bml0dGVzdC5weToKICIiIgogICAgICAgICB0d29fbGluZV9v dmVybGFwX2VudHJ5ID0gIiIiREFURV9IRVJFICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9y Zz4K