100844 2012-10-31 05:35:26 -0700 [Qt] Reduce the number of clean builds 2012-11-08 02:38:24 -0800 1 1 1 Unclassified WebKit New Bugs 420+ All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 ossy ossy dbates hausmann ossy vestbo webkit.review.bot oldest_to_newest 755186 0 ossy 2012-10-31 05:35:26 -0700 After http://trac.webkit.org/changeset/131445 build-webkit always trigger clean build if any Qt project file changed after the latest successful build. I checked the history on one of our buildbot. There were 622 builds in this 2 weeks and 60 was clean build because of this change. I think clean build in ~10% of cases is too high and unnecessary. I suggest we should do clean build if any project file changed _and_ incremental build failed. Patch is coming soon. 755194 1 171627 ossy 2012-10-31 05:48:40 -0700 Created attachment 171627 Patch 755195 2 ossy 2012-10-31 05:52:51 -0700 I checked the "config change triggers clean build" case too, it was only 2 clean build because of this reason during 622 builds. And it is still needed, because a config change can easily cause false positive build and/or test fail. 755205 3 171627 hausmann 2012-10-31 06:11:07 -0700 Comment on attachment 171627 Patch LGTM, but it would be good to get an opinion from Tor Arne on this, too. 755221 4 171627 vestbo 2012-10-31 06:25:27 -0700 Comment on attachment 171627 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=171627&action=review This opens us up to false positive incremental builds. If you're fine with that, then let's try it. A few nitpicks: > Tools/Scripts/webkitdirs.pm:2337 > + print "Change to $_ detected, maybe clean build needed.\n"; "clean build may be needed" > Tools/Scripts/webkitdirs.pm:2390 > + $result = system "$command wipeclean incremental"; What's the behaviour of make when passing multiple targets? Is there a chance it will try to parallelise them, or is this equivalent to make foo && make bar? 755261 5 171646 ossy 2012-10-31 07:04:15 -0700 Created attachment 171646 Patch 755264 6 ossy 2012-10-31 07:05:30 -0700 (In reply to comment #4) > (From update of attachment 171627 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=171627&action=review > > This opens us up to false positive incremental builds. If you're fine with that, then let's try it. A few nitpicks: > > > Tools/Scripts/webkitdirs.pm:2337 > > + print "Change to $_ detected, maybe clean build needed.\n"; > > "clean build may be needed" Fixed. > > Tools/Scripts/webkitdirs.pm:2390 > > + $result = system "$command wipeclean incremental"; > > What's the behaviour of make when passing multiple targets? Is there a chance it will try to parallelise them, or is this equivalent to make foo && make bar? Good point, it can be parallelizable. Fixed. 755277 7 ossy 2012-10-31 07:16:44 -0700 (In reply to comment #4) > (From update of attachment 171627 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=171627&action=review > > This opens us up to false positive incremental builds. If you're fine with that, then let's try it. You're right. But as far as I remember there were much more false negative incremental build issue that false positive. On the whole I'm fine with it, let's see what happens. ;-) 755298 8 171646 vestbo 2012-10-31 07:51:14 -0700 Comment on attachment 171646 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=171646&action=review > Tools/Scripts/webkitdirs.pm:2349 > + if ($needsIncrementalBuild && !$maybeNeedsCleanBuild) { Doesn't this mean that when a file changes, we won't do an incremental build, only a regular build? I think we can leave it like it was. > Tools/Scripts/webkitdirs.pm:2388 > + print "Calling '$command wipeclean' in " . $dir . "\n\n"; And then you need to reconstruct command here, since it will have "incremental" in it at this point. 759641 9 172579 ossy 2012-11-06 07:09:21 -0800 Created attachment 172579 Patch 759642 10 ossy 2012-11-06 07:11:12 -0800 (In reply to comment #8) > (From update of attachment 171646 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=171646&action=review > > > Tools/Scripts/webkitdirs.pm:2349 > > + if ($needsIncrementalBuild && !$maybeNeedsCleanBuild) { > > Doesn't this mean that when a file changes, we won't do an incremental build, only a regular build? I think we can leave it like it was. Good point. Fixed. > > Tools/Scripts/webkitdirs.pm:2388 > > + print "Calling '$command wipeclean' in " . $dir . "\n\n"; > > And then you need to reconstruct command here, since it will have "incremental" in it at this point. It is simpler using $make instead of $command, because we don't need incremental option after the wipeclean. 761396 11 172579 ossy 2012-11-07 23:46:04 -0800 Comment on attachment 172579 Patch ping? 761518 12 172579 ossy 2012-11-08 02:38:18 -0800 Comment on attachment 172579 Patch Clearing flags on attachment: 172579 Committed r133873: <http://trac.webkit.org/changeset/133873> 761519 13 ossy 2012-11-08 02:38:24 -0800 All reviewed patches have been landed. Closing bug. 171627 2012-10-31 05:48:40 -0700 2012-10-31 07:04:09 -0700 Patch bug-100844-20121031054702.patch text/plain 2445 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMDE0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmZkNWExNGQ5NDkyMDQ3Y2FkMGFjMmNjZTMyNDIzMGY1 MmRhYmY1MC4uYjEyMzMxZDY5M2RiODJjZGIxNWYzNjllM2FlZWE0MGNiMzhhMzc1NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTEwLTMxICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisK KyAgICAgICAgW1F0XSBSZWR1Y2UgdGhlIG51bWJlciBvZiBjbGVhbiBidWlsZHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDg0NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEEgY2hhbmdlIGluIGFueSBR dCBwcm9qZWN0IGZpbGUgc2hvdWxkbid0IHRyaWdnZXIgY2xlYW4KKyAgICAgICAgYnVpbGQgYWx3 YXlzLCBidXQgb25seSBpZiB0aGUgaW5jcmVtZW50YWwgYnVpbGQgZmFpbGVkLgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoYnVpbGRRTWFrZVByb2plY3RzKToK KwogMjAxMi0xMC0zMSAgTWlrZSBXZXN0ICA8bWt3c3RAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFNjcmlwdCBydW4gZnJvbSBhbiBpc29sYXRlZCB3b3JsZCBzaG91bGQgYnlwYXNzIGEgcGFnZSdz IENTUC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCA4MzFlMzU2YTQzOWNlZmIxZjI3NDliMDI4YmQ0NDUx MDA2NGVkZjIwLi5hZTM1ZTAyMTU5YTU5NDEwOGZlZGZmMGIzZjYzM2Y4ZmY1MDAwYmJiIDEwMDc1 NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRkaXJzLnBtCkBAIC0yMzE5LDcgKzIzMTksNyBAQCBzdWIgYnVpbGRRTWFrZVByb2plY3Rz CiAgICAgICAgZGllICJcbkZhaWxlZCB0byBzZXQgdXAgYnVpbGQgZW52aXJvbm1lbnQgdXNpbmcg JHFtYWtlYmluIVxuIjsKICAgICB9CiAKLSAgICBteSAkbmVlZHNDbGVhbkJ1aWxkID0gMDsKKyAg ICBteSAkbWF5YmVOZWVkc0NsZWFuQnVpbGQgPSAwOwogICAgIG15ICRuZWVkc0luY3JlbWVudGFs QnVpbGQgPSAwOwogCiAgICAgaWYgKCRzdm5SZXZpc2lvbiBuZSAkcHJldmlvdXNTdm5SZXZpc2lv bikgewpAQCAtMjMzNCwxOSArMjMzNCwxOSBAQCBzdWIgYnVpbGRRTWFrZVByb2plY3RzCiAgICAg ICAgICAgICAgICAgbS9cLnFtYWtlLmNvbmYkLyBvcgogICAgICAgICAgICAgICAgIG0vXlRvb2xz XC9xbWFrZVwvLwogICAgICAgICAgICAgICAgKSB7Ci0gICAgICAgICAgICAgICAgcHJpbnQgIkNo YW5nZSB0byAkXyBkZXRlY3RlZCwgY2xlYW4gYnVpbGQgbmVlZGVkLlxuIjsKLSAgICAgICAgICAg ICAgICAkbmVlZHNDbGVhbkJ1aWxkID0gMTsKKyAgICAgICAgICAgICAgICBwcmludCAiQ2hhbmdl IHRvICRfIGRldGVjdGVkLCBtYXliZSBjbGVhbiBidWlsZCBuZWVkZWQuXG4iOworICAgICAgICAg ICAgICAgICRtYXliZU5lZWRzQ2xlYW5CdWlsZCA9IDE7CiAgICAgICAgICAgICAgICAgbGFzdDsK ICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KIAotICAgIGlmICgkY29uZmlnQ2hhbmdl ZCBvciAkbmVlZHNDbGVhbkJ1aWxkKSB7CisgICAgaWYgKCRjb25maWdDaGFuZ2VkKSB7CiAgICAg ICAgIHByaW50ICJDYWxsaW5nICckY29tbWFuZCB3aXBlY2xlYW4nIGluICIgLiAkZGlyIC4gIlxu XG4iOwogICAgICAgICAkcmVzdWx0ID0gc3lzdGVtICIkY29tbWFuZCB3aXBlY2xlYW4iOwogICAg IH0KIAotICAgIGlmICgkbmVlZHNJbmNyZW1lbnRhbEJ1aWxkKSB7CisgICAgaWYgKCRuZWVkc0lu Y3JlbWVudGFsQnVpbGQgJiYgISRtYXliZU5lZWRzQ2xlYW5CdWlsZCkgewogICAgICAgICAkY29t bWFuZCAuPSAiIGluY3JlbWVudGFsIjsKICAgICB9CiAKQEAgLTIzODMsNiArMjM4MywxMSBAQCBv ciBwYXNzaW5nIC0tbWFrZWFyZ3M9InFtYWtlX2FsbCIgdG8gYnVpbGQtd2Via2l0LgogCiBFT0YK ICAgICAgICAgcHJpbnQgIiRmYWlsTWVzc2FnZSI7CisgICAgfSBlbHNpZiAoJG1heWJlTmVlZHND bGVhbkJ1aWxkKSB7CisgICAgICAgIHByaW50ICJcbkluY3JlbWVudGFsIGJ1aWxkIGZhaWxlZCwg Y2xlYW4gYnVpbGQgbmVlZGVkLiBcbiI7CisgICAgICAgIHByaW50ICJDYWxsaW5nICckY29tbWFu ZCB3aXBlY2xlYW4gaW5jcmVtZW50YWwnIGluICIgLiAkZGlyIC4gIlxuXG4iOworICAgICAgICBj aGRpciAkZGlyIG9yIGRpZTsKKyAgICAgICAgJHJlc3VsdCA9IHN5c3RlbSAiJGNvbW1hbmQgd2lw ZWNsZWFuIGluY3JlbWVudGFsIjsKICAgICB9CiAKICAgICByZXR1cm4gJHJlc3VsdDsK 171646 2012-10-31 07:04:15 -0700 2012-11-06 07:09:15 -0800 Patch bug-100844-20121031070237.patch text/plain 2602 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMDIxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmZkNWExNGQ5NDkyMDQ3Y2FkMGFjMmNjZTMyNDIzMGY1 MmRhYmY1MC4uYjEyMzMxZDY5M2RiODJjZGIxNWYzNjllM2FlZWE0MGNiMzhhMzc1NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTEwLTMxICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisK KyAgICAgICAgW1F0XSBSZWR1Y2UgdGhlIG51bWJlciBvZiBjbGVhbiBidWlsZHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDg0NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEEgY2hhbmdlIGluIGFueSBR dCBwcm9qZWN0IGZpbGUgc2hvdWxkbid0IHRyaWdnZXIgY2xlYW4KKyAgICAgICAgYnVpbGQgYWx3 YXlzLCBidXQgb25seSBpZiB0aGUgaW5jcmVtZW50YWwgYnVpbGQgZmFpbGVkLgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoYnVpbGRRTWFrZVByb2plY3RzKToK KwogMjAxMi0xMC0zMSAgTWlrZSBXZXN0ICA8bWt3c3RAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFNjcmlwdCBydW4gZnJvbSBhbiBpc29sYXRlZCB3b3JsZCBzaG91bGQgYnlwYXNzIGEgcGFnZSdz IENTUC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCA4MzFlMzU2YTQzOWNlZmIxZjI3NDliMDI4YmQ0NDUx MDA2NGVkZjIwLi5iZjU1ZTM5ZmI4MTI2MjdlNTIzMzI3NDA2NWZhZjMzNWRkZDFkYmM0IDEwMDc1 NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRkaXJzLnBtCkBAIC0yMzE5LDcgKzIzMTksNyBAQCBzdWIgYnVpbGRRTWFrZVByb2plY3Rz CiAgICAgICAgZGllICJcbkZhaWxlZCB0byBzZXQgdXAgYnVpbGQgZW52aXJvbm1lbnQgdXNpbmcg JHFtYWtlYmluIVxuIjsKICAgICB9CiAKLSAgICBteSAkbmVlZHNDbGVhbkJ1aWxkID0gMDsKKyAg ICBteSAkbWF5YmVOZWVkc0NsZWFuQnVpbGQgPSAwOwogICAgIG15ICRuZWVkc0luY3JlbWVudGFs QnVpbGQgPSAwOwogCiAgICAgaWYgKCRzdm5SZXZpc2lvbiBuZSAkcHJldmlvdXNTdm5SZXZpc2lv bikgewpAQCAtMjMzNCwxOSArMjMzNCwxOSBAQCBzdWIgYnVpbGRRTWFrZVByb2plY3RzCiAgICAg ICAgICAgICAgICAgbS9cLnFtYWtlLmNvbmYkLyBvcgogICAgICAgICAgICAgICAgIG0vXlRvb2xz XC9xbWFrZVwvLwogICAgICAgICAgICAgICAgKSB7Ci0gICAgICAgICAgICAgICAgcHJpbnQgIkNo YW5nZSB0byAkXyBkZXRlY3RlZCwgY2xlYW4gYnVpbGQgbmVlZGVkLlxuIjsKLSAgICAgICAgICAg ICAgICAkbmVlZHNDbGVhbkJ1aWxkID0gMTsKKyAgICAgICAgICAgICAgICBwcmludCAiQ2hhbmdl IHRvICRfIGRldGVjdGVkLCBjbGVhbiBidWlsZCBtYXkgYmUgbmVlZGVkLlxuIjsKKyAgICAgICAg ICAgICAgICAkbWF5YmVOZWVkc0NsZWFuQnVpbGQgPSAxOwogICAgICAgICAgICAgICAgIGxhc3Q7 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAoJGNvbmZpZ0NoYW5n ZWQgb3IgJG5lZWRzQ2xlYW5CdWlsZCkgeworICAgIGlmICgkY29uZmlnQ2hhbmdlZCkgewogICAg ICAgICBwcmludCAiQ2FsbGluZyAnJGNvbW1hbmQgd2lwZWNsZWFuJyBpbiAiIC4gJGRpciAuICJc blxuIjsKICAgICAgICAgJHJlc3VsdCA9IHN5c3RlbSAiJGNvbW1hbmQgd2lwZWNsZWFuIjsKICAg ICB9CiAKLSAgICBpZiAoJG5lZWRzSW5jcmVtZW50YWxCdWlsZCkgeworICAgIGlmICgkbmVlZHNJ bmNyZW1lbnRhbEJ1aWxkICYmICEkbWF5YmVOZWVkc0NsZWFuQnVpbGQpIHsKICAgICAgICAgJGNv bW1hbmQgLj0gIiBpbmNyZW1lbnRhbCI7CiAgICAgfQogCkBAIC0yMzgzLDYgKzIzODMsMTggQEAg b3IgcGFzc2luZyAtLW1ha2VhcmdzPSJxbWFrZV9hbGwiIHRvIGJ1aWxkLXdlYmtpdC4KIAogRU9G CiAgICAgICAgIHByaW50ICIkZmFpbE1lc3NhZ2UiOworICAgIH0gZWxzaWYgKCRtYXliZU5lZWRz Q2xlYW5CdWlsZCkgeworICAgICAgICBwcmludCAiXG5JbmNyZW1lbnRhbCBidWlsZCBmYWlsZWQs IGNsZWFuIGJ1aWxkIG5lZWRlZC4gXG4iOworICAgICAgICBwcmludCAiQ2FsbGluZyAnJGNvbW1h bmQgd2lwZWNsZWFuJyBpbiAiIC4gJGRpciAuICJcblxuIjsKKyAgICAgICAgY2hkaXIgJGRpciBv ciBkaWU7CisgICAgICAgIHN5c3RlbSAiJGNvbW1hbmQgd2lwZWNsZWFuIjsKKworICAgICAgICBp ZiAoJG5lZWRzSW5jcmVtZW50YWxCdWlsZCkgeworICAgICAgICAgICAgJGNvbW1hbmQgLj0gIiBp bmNyZW1lbnRhbCI7CisgICAgICAgIH0KKworICAgICAgICBwcmludCAiXG5DYWxsaW5nICckY29t bWFuZCcgaW4gIiAuICRkaXIgLiAiXG5cbiI7CisgICAgICAgICRyZXN1bHQgPSBzeXN0ZW0gJGNv bW1hbmQ7CiAgICAgfQogCiAgICAgcmV0dXJuICRyZXN1bHQ7Cg== 172579 2012-11-06 07:09:21 -0800 2012-11-08 02:38:18 -0800 Patch bug-100844-20121106070733.patch text/plain 2685 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNTkyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTFlMjM5YzM4Yjc3NDBlNGFjYjViYTZjNzYwYzFkYThl ZWZjNzkxNi4uNjIyZTE1ZDg5OTk1MGMzNjFmYzVkMzFmMDdlZjFjZjBhNzAxZTU3MSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTExLTA2ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisK KyAgICAgICAgW1F0XSBSZWR1Y2UgdGhlIG51bWJlciBvZiBjbGVhbiBidWlsZHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDg0NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEEgY2hhbmdlIGluIGFueSBR dCBwcm9qZWN0IGZpbGUgc2hvdWxkbid0IHRyaWdnZXIgY2xlYW4KKyAgICAgICAgYnVpbGQgYWx3 YXlzLCBidXQgb25seSBpZiB0aGUgaW5jcmVtZW50YWwgYnVpbGQgZmFpbGVkLgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoYnVpbGRRTWFrZVByb2plY3RzKToK KwogMjAxMi0xMS0wNiAgSnVzc2kgS3Vra29uZW4gIDxqdXNzaS5rdWtrb25lbkBpbnRlbC5jb20+ CiAKICAgICAgICAgW0VGTF1bV0syXSBNaW5pYnJvd3NlciBmb3JnZXRzIGh0dHAgdmFyaWFibGVz IHdoZW4gdXJsIGluY2x1ZGVzIGFtcGVyc2FuZApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IGMwZTczYzI0 Njc4OTI1OWUxN2M3MjA4ZmIzNDdjMDZhN2EzOTRjZGYuLjc2NzcwYjcwNmZhNWFlMjJkNDc3ZmVh Mzg3NmUyZmNhZjUyNjFkY2QgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5w bQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTIzMTMsMTMgKzIzMTMsMTEg QEAgc3ViIGJ1aWxkUU1ha2VQcm9qZWN0cwogICAgIGNsb3NlKFFNQUtFKTsKICAgICAkcmVzdWx0 ID0gJD87CiAKLSAgICAkY29tbWFuZCA9ICIkbWFrZSI7Ci0KICAgICBpZiAoJHJlc3VsdCBuZSAw KSB7CiAgICAgICAgZGllICJcbkZhaWxlZCB0byBzZXQgdXAgYnVpbGQgZW52aXJvbm1lbnQgdXNp bmcgJHFtYWtlYmluIVxuIjsKICAgICB9CiAKLSAgICBteSAkbmVlZHNDbGVhbkJ1aWxkID0gMDsK KyAgICBteSAkbWF5YmVOZWVkc0NsZWFuQnVpbGQgPSAwOwogICAgIG15ICRuZWVkc0luY3JlbWVu dGFsQnVpbGQgPSAwOwogCiAgICAgaWYgKCRzdm5SZXZpc2lvbiBuZSAkcHJldmlvdXNTdm5SZXZp c2lvbikgewpAQCAtMjMzNCwxOCArMjMzMiwxOSBAQCBzdWIgYnVpbGRRTWFrZVByb2plY3RzCiAg ICAgICAgICAgICAgICAgbS9cLnFtYWtlLmNvbmYkLyBvcgogICAgICAgICAgICAgICAgIG0vXlRv b2xzXC9xbWFrZVwvLwogICAgICAgICAgICAgICAgKSB7Ci0gICAgICAgICAgICAgICAgcHJpbnQg IkNoYW5nZSB0byAkXyBkZXRlY3RlZCwgY2xlYW4gYnVpbGQgbmVlZGVkLlxuIjsKLSAgICAgICAg ICAgICAgICAkbmVlZHNDbGVhbkJ1aWxkID0gMTsKKyAgICAgICAgICAgICAgICBwcmludCAiQ2hh bmdlIHRvICRfIGRldGVjdGVkLCBjbGVhbiBidWlsZCBtYXkgYmUgbmVlZGVkLlxuIjsKKyAgICAg ICAgICAgICAgICAkbWF5YmVOZWVkc0NsZWFuQnVpbGQgPSAxOwogICAgICAgICAgICAgICAgIGxh c3Q7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAoJGNvbmZpZ0No YW5nZWQgb3IgJG5lZWRzQ2xlYW5CdWlsZCkgewotICAgICAgICBwcmludCAiQ2FsbGluZyAnJGNv bW1hbmQgd2lwZWNsZWFuJyBpbiAiIC4gJGRpciAuICJcblxuIjsKLSAgICAgICAgJHJlc3VsdCA9 IHN5c3RlbSAiJGNvbW1hbmQgd2lwZWNsZWFuIjsKKyAgICBpZiAoJGNvbmZpZ0NoYW5nZWQpIHsK KyAgICAgICAgcHJpbnQgIkNhbGxpbmcgJyRtYWtlIHdpcGVjbGVhbicgaW4gIiAuICRkaXIgLiAi XG5cbiI7CisgICAgICAgICRyZXN1bHQgPSBzeXN0ZW0gIiRtYWtlIHdpcGVjbGVhbiI7CiAgICAg fQogCisgICAgJGNvbW1hbmQgPSAiJG1ha2UiOwogICAgIGlmICgkbmVlZHNJbmNyZW1lbnRhbEJ1 aWxkKSB7CiAgICAgICAgICRjb21tYW5kIC49ICIgaW5jcmVtZW50YWwiOwogICAgIH0KQEAgLTIz ODMsNiArMjM4MiwxNCBAQCBvciBwYXNzaW5nIC0tbWFrZWFyZ3M9InFtYWtlX2FsbCIgdG8gYnVp bGQtd2Via2l0LgogCiBFT0YKICAgICAgICAgcHJpbnQgIiRmYWlsTWVzc2FnZSI7CisgICAgfSBl bHNpZiAoJG1heWJlTmVlZHNDbGVhbkJ1aWxkKSB7CisgICAgICAgIHByaW50ICJcbkluY3JlbWVu dGFsIGJ1aWxkIGZhaWxlZCwgY2xlYW4gYnVpbGQgbmVlZGVkLiBcbiI7CisgICAgICAgIHByaW50 ICJDYWxsaW5nICckbWFrZSB3aXBlY2xlYW4nIGluICIgLiAkZGlyIC4gIlxuXG4iOworICAgICAg ICBjaGRpciAkZGlyIG9yIGRpZTsKKyAgICAgICAgc3lzdGVtICIkbWFrZSB3aXBlY2xlYW4iOwor CisgICAgICAgIHByaW50ICJcbkNhbGxpbmcgJyRtYWtlJyBpbiAiIC4gJGRpciAuICJcblxuIjsK KyAgICAgICAgJHJlc3VsdCA9IHN5c3RlbSAkbWFrZTsKICAgICB9CiAKICAgICByZXR1cm4gJHJl c3VsdDsK