137394 2014-10-03 09:10:50 -0700 [GTK] Make forwarding headers generation depend on source code 2015-04-16 03:42:23 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=143819 https://bugs.webkit.org/show_bug.cgi?id=143820 Gtk P2 Normal --- 130075 1 cgarcia webkit-unassigned cgarcia clopez mcatanzaro mrobinson ossy pnormand zan oldest_to_newest 1039225 0 cgarcia 2014-10-03 09:10:50 -0700 So that forwarding headers script is only called when source code changes, instead of for every build. 1039227 1 239206 cgarcia 2014-10-03 09:14:38 -0700 Created attachment 239206 Patch 1039267 2 239206 mrobinson 2014-10-03 10:59:23 -0700 Comment on attachment 239206 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=239206&action=review > Source/WebKit2/PlatformGTK.cmake:854 > + > +file(GLOB_RECURSE WebKit2_HEADERS > + *.h > +) This is run during the configuration phase, so doesn't this break if you add a new header without re-running cmake? 1039467 3 cgarcia 2014-10-04 00:21:38 -0700 (In reply to comment #2) > (From update of attachment 239206 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=239206&action=review > > > Source/WebKit2/PlatformGTK.cmake:854 > > + > > +file(GLOB_RECURSE WebKit2_HEADERS > > + *.h > > +) > > This is run during the configuration phase, so doesn't this break if you add a new header without re-running cmake? Yes, that's only another problem of not adding headers to the makefiles, it happens with other things like rules using wilcard characters, if you add a new file, you need to force a configure for that to work. This is still much better than running the forwarding headers script 3 times every build. The situation of adding a new header after the configure phase that requires a new forwarding header is not common at all. 1040229 4 cgarcia 2014-10-08 00:38:01 -0700 Committed r174422: <http://trac.webkit.org/changeset/174422> 1040260 5 ossy 2014-10-08 04:38:37 -0700 (In reply to comment #4) > Committed r174422: <http://trac.webkit.org/changeset/174422> After this change, the GTK EWS stucked with this strange error: ninja: error: '../../Source/WebKit2/WebProcess/InjectedBundle/API/efl/ewk_extension.h', needed by 'WebKit2-forwarding-headers.stamp', missing and no known rule to make it 1040265 6 cgarcia 2014-10-08 04:44:58 -0700 (In reply to comment #5) > (In reply to comment #4) > > Committed r174422: <http://trac.webkit.org/changeset/174422> > > After this change, the GTK EWS stucked with this strange error: > > ninja: error: '../../Source/WebKit2/WebProcess/InjectedBundle/API/efl/ewk_extension.h', needed by 'WebKit2-forwarding-headers.stamp', missing and no known rule to make it Yes, this is indeed one of the cases when this fails because of the wildcard characters, a header file was removed, but non of our makefiles changed (it was an efl header), so a new cmake configure was required. Already forced a clean build on the bots. If this case happens more often that what I expected, I'll roll out the patch. 1057986 7 ossy 2014-12-27 12:32:52 -0800 One more problem: https://trac.webkit.org/changeset/177764 ninja: error: '../../Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEventsInternal.h', needed by 'WebKit2-forwarding-headers.stamp', missing and no known rule to make it I triggered clean build on the buildbots, but the EWS still needs a kick. 1078775 8 ossy 2015-03-20 00:49:37 -0700 One more error due to this bug after https://trac.webkit.org/changeset/181777: ninja: error: '../../Source/WebKit2/UIProcess/mac/WebMediaPlaybackTargetPickerProxyMac.h', needed by 'WebKit2-forwarding-headers.stamp', missing and no known rule to make it It isn't good to have incremental build issue after all header deleting/renaming in Webkit2 :-/ 1078783 9 cgarcia 2015-03-20 01:01:35 -0700 (In reply to comment #8) > One more error due to this bug after > https://trac.webkit.org/changeset/181777: > ninja: error: > '../../Source/WebKit2/UIProcess/mac/WebMediaPlaybackTargetPickerProxyMac.h', > needed by 'WebKit2-forwarding-headers.stamp', missing and no known rule to > make it > > It isn't good to have incremental build issue after > all header deleting/renaming in Webkit2 :-/ This hasn't happened that often, IMO, so for me it's still worth it. 1078785 10 ossy 2015-03-20 01:07:52 -0700 I kicked the bots with https://trac.webkit.org/changeset/181786 , but it isn't good to have to land this kind of fixes or poking the EWS maintainers to kick the bots. We really need a proper fix. Why was it problem that forwaring header generator ran all the time? It is quite quick. I understand that all seconds count during working on a task locally. But can't we run this generator unconditionally only on the bots somehow? 1078840 11 ossy 2015-03-20 05:22:42 -0700 (In reply to comment #10) > I kicked the bots with https://trac.webkit.org/changeset/181786 , > but it isn't good to have to land this kind of fixes or poking > the EWS maintainers to kick the bots. We really need a proper fix. > > Why was it problem that forwaring header generator ran all the time? > It is quite quick. I understand that all seconds count during working > on a task locally. But can't we run this generator unconditionally > only on the bots somehow? - empty build on GTK takes 3-4 seconds (fw header generator doesn't run at all) - empty build on EFL takes 6-7 seconds (fw header generator always run 10 times) It is trivial to refactor fw header generator to run only once for each project: WebKit2, WTR, TestWebKitAPI. It reduced the EFL build time to 5 seconds for me, I'm going to upload the patch soon to bug142907. 1080636 12 ossy 2015-03-27 10:22:38 -0700 One more incrementail build issue due to this change: https://build.webkit.org/builders/GTK%20Linux%2064-bit%20Release%20%28Build%29/builds/56936 1082635 13 ossy 2015-04-03 11:30:06 -0700 and again: https://build.webkit.org/builders/GTK%20Linux%2064-bit%20Release%20%28Build%29/builds/57167 Do you really want to have this issue again and again on the bots? I can't understand don't we run this generator unconditonally? It's only 3-4 seconds per build and it guarantess we won't have this ugly issue ever. But it's your choice, of course. 1082640 14 ossy 2015-04-03 11:54:01 -0700 I kicked the GTK bots with this commit - http://trac.webkit.org/changeset/182326. But I'm against to do this kind of changes, and done last time. 1082735 15 mcatanzaro 2015-04-03 17:50:57 -0700 TBH I'm with Ossy on this one. The time I lose doing an initial build after a pull, discovering that it failed, figuring out it's an incremental build issue, and then running a clean build is not really worth the benefit. Bug #142907 looks like a better approach. 1083052 16 cgarcia 2015-04-06 00:06:36 -0700 Ok, let's optimize and reduce the amount of times the script is run instead. 1083286 17 ossy 2015-04-07 04:23:24 -0700 (In reply to comment #16) > Ok, let's optimize and reduce the amount of times the script is run instead. bug142907 reduces the amount from 4 to 3 on GTK and from 10 to 3 on EFL. 1083300 18 ossy 2015-04-07 06:18:04 -0700 (In reply to comment #17) > (In reply to comment #16) > > Ok, let's optimize and reduce the amount of times the script is run instead. > > bug142907 reduces the amount from 4 to 3 on GTK and from 10 to 3 on EFL. With this fix the empty EFL build takes only 5 seconds. Additionally I measured the runtime of the forwarding header generator script itself: (these three execution can be run in parallel) - 0.12 seconds for WTR - 0.17 seconds for TestWebKitAPI - 1.05 seconds for WebKit2 1085858 19 ossy 2015-04-16 00:04:00 -0700 And again after https://trac.webkit.org/changeset/182873: ninja: error: '../../Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h', needed by 'WebKit2-forwarding-headers.stamp', missing and no known rule to make it (on the other hand we really don't need forwarding header for cocoa headers ...) 1085874 20 ossy 2015-04-16 03:42:23 -0700 I filed two bug reports: - make forwarding header generator run unconditionally: bug143819 - make forwarding header generate less unnecessary headers: bug143820 (In reply to comment #19) > And again after https://trac.webkit.org/changeset/182873: > ninja: error: > '../../Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h', > needed by 'WebKit2-forwarding-headers.stamp', missing and no known rule to > make it > > (on the other hand we really don't need forwarding header for cocoa headers > ...) The forwarding header generator didn't generate forwarding header for Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h, but the *.h rule added false dependency for this header. 239206 2014-10-03 09:14:38 -0700 2014-10-08 00:10:05 -0700 Patch wk-generate-forwarding-headers-rule.diff text/plain 9037 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1ZTA1MmFiLi5iMDhlNTFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTQtMTAtMDMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIE1ha2UgZm9yd2FyZGluZyBoZWFkZXJzIGdlbmVyYXRpb24gZGVw ZW5kIG9uIHNvdXJjZSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzczOTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBPbmx5IHJ1biBnZW5lcmF0ZS1mb3J3YXJkaW5nLWhlYWRlcnMucGwgd2hlbiBz b3VyY2UgY29kZSBjaGFuZ2VzCisgICAgICAgIGFuZCB1c2UgYSBkaWZmZXJlbnQgdGFyZ2V0IGZv ciB0aGUgc3ltbGlua3MuCisKKyAgICAgICAgKiBQbGF0Zm9ybUdUSy5jbWFrZToKKwogMjAxNC0x MC0wMyAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtH VEtdIFVSVEJGIGFmdGVyIHIxNzQyMzEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0 Zm9ybUdUSy5jbWFrZSBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtR1RLLmNtYWtlCmluZGV4IGZl NjNjMWYuLjUzMzRlMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtR1RLLmNt YWtlCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtR1RLLmNtYWtlCkBAIC01NTcsMTkgKzU1 Nyw2IEBAIGFkZF9jdXN0b21fY29tbWFuZCgKICAgICBWRVJCQVRJTQogKQogCi1hZGRfY3VzdG9t X3RhcmdldCh3ZWJraXQyZ3RrLWZvcndhcmRpbmctaGVhZGVycwotICAgIENPTU1BTkQgJHtQRVJM X0VYRUNVVEFCTEV9ICR7V0VCS0lUMl9ESVJ9L1NjcmlwdHMvZ2VuZXJhdGUtZm9yd2FyZGluZy1o ZWFkZXJzLnBsICR7V0VCS0lUMl9ESVJ9ICR7Rk9SV0FSRElOR19IRUFERVJTX0RJUn0gZ3RrCi0g ICAgQ09NTUFORCAke1BFUkxfRVhFQ1VUQUJMRX0gJHtXRUJLSVQyX0RJUn0vU2NyaXB0cy9nZW5l cmF0ZS1mb3J3YXJkaW5nLWhlYWRlcnMucGwgJHtXRUJLSVQyX0RJUn0gJHtGT1JXQVJESU5HX0hF QURFUlNfRElSfSBzb3VwCi0KLSAgICAjIFRoZXNlIHN5bWJvbGljIGxpbmsgYWxsb3dzIGluY2x1 ZGVzIGxpa2UgI2luY2x1ZGUgPHdlYmtpdDIvV2Via2l0V2ViVmlldy5oPiB3aGljaCBzaW11bGF0 ZXMgaW5zdGFsbGVkIGhlYWRlcnMuCi0gICAgQ09NTUFORCBsbiAtbiAtcyAtZiAke1dFQktJVDJf RElSfS9VSVByb2Nlc3MvQVBJL2d0ayAke0ZPUldBUkRJTkdfSEVBREVSU19XRUJLSVQyR1RLX0RJ Un0vd2Via2l0MgotICAgIENPTU1BTkQgbG4gLW4gLXMgLWYgJHtXRUJLSVQyX0RJUn0vV2ViUHJv Y2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvZ3RrICR7Rk9SV0FSRElOR19IRUFERVJTX1dFQktJVDJH VEtfRVhURU5TSU9OX0RJUn0vd2Via2l0MgotKQotCi1zZXQoV0VCS0lUMl9FWFRSQV9ERVBFTkRF TkNJRVMKLSAgICAgd2Via2l0Mmd0ay1mb3J3YXJkaW5nLWhlYWRlcnMKLSkKLQogaWYgKEVOQUJM RV9QTFVHSU5fUFJPQ0VTU19HVEsyKQogICAgIHNldChQbHVnaW5Qcm9jZXNzR1RLMl9FWEVDVVRB QkxFX05BTUUgV2ViS2l0UGx1Z2luUHJvY2VzczIpCiAKQEAgLTg2MSwzICs4NDgsNDUgQEAgZmls ZShXUklURSAke0NNQUtFX0JJTkFSWV9ESVJ9L2d0a2RvYy13ZWJraXQyZ3RrLmNmZwogICAgICIg ICAgICAgICAgICAke0RFUklWRURfU09VUkNFU19XRUJLSVQyR1RLX0FQSV9ESVJ9XG4iCiAgICAg ImhlYWRlcnM9JHtXZWJLaXQyR1RLX0VOVU1fR0VORVJBVElPTl9IRUFERVJTfSAke1dlYktpdDJX ZWJFeHRlbnNpb25fSU5TVEFMTEVEX0hFQURFUlN9XG4iCiApCisKK2ZpbGUoR0xPQl9SRUNVUlNF IFdlYktpdDJfSEVBREVSUworICAgICouaAorKQorCithZGRfY3VzdG9tX2NvbW1hbmQoCisgICAg T1VUUFVUICR7Q01BS0VfQklOQVJZX0RJUn0vV2ViS2l0Mi1mb3J3YXJkaW5nLWhlYWRlcnMuc3Rh bXAKKyAgICBERVBFTkRTICR7V0VCS0lUMl9ESVJ9L1NjcmlwdHMvZ2VuZXJhdGUtZm9yd2FyZGlu Zy1oZWFkZXJzLnBsCisgICAgICAgICAgICAke1dlYktpdDJfU09VUkNFU30KKyAgICAgICAgICAg ICR7V2ViUHJvY2Vzc19TT1VSQ0VTfQorICAgICAgICAgICAgJHtOZXR3b3JrUHJvY2Vzc19TT1VS Q0VTfQorICAgICAgICAgICAgJHtQbHVnaW5Qcm9jZXNzR1RLMl9TT1VSQ0VTfQorICAgICAgICAg ICAgJHtQbHVnaW5Qcm9jZXNzX1NPVVJDRVN9CisgICAgICAgICAgICAke1dlYktpdDJfSEVBREVS U30KKyAgICBDT01NQU5EICR7UEVSTF9FWEVDVVRBQkxFfSAke1dFQktJVDJfRElSfS9TY3JpcHRz L2dlbmVyYXRlLWZvcndhcmRpbmctaGVhZGVycy5wbCAke1dFQktJVDJfRElSfSAke0ZPUldBUkRJ TkdfSEVBREVSU19ESVJ9IGd0aworICAgIENPTU1BTkQgJHtQRVJMX0VYRUNVVEFCTEV9ICR7V0VC S0lUMl9ESVJ9L1NjcmlwdHMvZ2VuZXJhdGUtZm9yd2FyZGluZy1oZWFkZXJzLnBsICR7V0VCS0lU Ml9ESVJ9ICR7Rk9SV0FSRElOR19IRUFERVJTX0RJUn0gc291cAorICAgIENPTU1BTkQgdG91Y2gg JHtDTUFLRV9CSU5BUllfRElSfS9XZWJLaXQyLWZvcndhcmRpbmctaGVhZGVycy5zdGFtcAorKQor YWRkX2N1c3RvbV90YXJnZXQoV2ViS2l0Mi1mb3J3YXJkaW5nLWhlYWRlcnMKKyAgICBERVBFTkRT ICR7Q01BS0VfQklOQVJZX0RJUn0vV2ViS2l0Mi1mb3J3YXJkaW5nLWhlYWRlcnMuc3RhbXAKKykK KworIyBUaGVzZSBzeW1ib2xpYyBsaW5rIGFsbG93cyBpbmNsdWRlcyBsaWtlICNpbmNsdWRlIDx3 ZWJraXQyL1dlYmtpdFdlYlZpZXcuaD4gd2hpY2ggc2ltdWxhdGVzIGluc3RhbGxlZCBoZWFkZXJz LgorYWRkX2N1c3RvbV9jb21tYW5kKAorICAgIE9VVFBVVCAke0ZPUldBUkRJTkdfSEVBREVSU19X RUJLSVQyR1RLX0RJUn0vd2Via2l0MgorICAgIERFUEVORFMgJHtXRUJLSVQyX0RJUn0vVUlQcm9j ZXNzL0FQSS9ndGsKKyAgICBDT01NQU5EIGxuIC1uIC1zIC1mICR7V0VCS0lUMl9ESVJ9L1VJUHJv Y2Vzcy9BUEkvZ3RrICR7Rk9SV0FSRElOR19IRUFERVJTX1dFQktJVDJHVEtfRElSfS93ZWJraXQy CispCithZGRfY3VzdG9tX2NvbW1hbmQoCisgICAgT1VUUFVUICR7Rk9SV0FSRElOR19IRUFERVJT X1dFQktJVDJHVEtfRVhURU5TSU9OX0RJUn0vd2Via2l0MgorICAgIERFUEVORFMgJHtXRUJLSVQy X0RJUn0vV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvZ3RrCisgICAgQ09NTUFORCBsbiAt biAtcyAtZiAke1dFQktJVDJfRElSfS9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsg JHtGT1JXQVJESU5HX0hFQURFUlNfV0VCS0lUMkdUS19FWFRFTlNJT05fRElSfS93ZWJraXQyCisp CithZGRfY3VzdG9tX3RhcmdldChXZWJLaXQyLWZha2UtYXBpLWhlYWRlcnMKKyAgICBERVBFTkRT ICR7Rk9SV0FSRElOR19IRUFERVJTX1dFQktJVDJHVEtfRElSfS93ZWJraXQyCisgICAgICAgICAg ICAke0ZPUldBUkRJTkdfSEVBREVSU19XRUJLSVQyR1RLX0VYVEVOU0lPTl9ESVJ9L3dlYmtpdDIK KykKKworc2V0KFdFQktJVDJfRVhUUkFfREVQRU5ERU5DSUVTCisgICAgIFdlYktpdDItZm9yd2Fy ZGluZy1oZWFkZXJzCisgICAgIFdlYktpdDItZmFrZS1hcGktaGVhZGVycworKQpkaWZmIC0tZ2l0 IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDc3NTNlOGMuLjU5NGEz MGIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAg LTEsNSArMSwxNyBAQAogMjAxNC0xMC0wMyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lh QGlnYWxpYS5jb20+CiAKKyAgICAgICAgW0dUS10gTWFrZSBmb3J3YXJkaW5nIGhlYWRlcnMgZ2Vu ZXJhdGlvbiBkZXBlbmQgb24gc291cmNlIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzM5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9DTWFrZUxpc3RzLnR4dDogQWRk IG1pc3NpbmcgZGVwZW5kZW5jeSBydWxlLgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvUGxhdGZv cm1HVEsuY21ha2U6IE9ubHkgcnVuCisgICAgICAgIGdlbmVyYXRlLWZvcndhcmRpbmctaGVhZGVy cy5wbCB3aGVuIHNvdXJjZSBjb2RlIGNoYW5nZXMuCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5l ci9QbGF0Zm9ybUdUSy5jbWFrZTogRGl0dG8uCisKKzIwMTQtMTAtMDMgIENhcmxvcyBHYXJjaWEg Q2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAgIFtHVEtdIERvIG5vdCBnZW5l cmF0ZSB3ZWJraXQyZ3RrLXRlc3RzLXJlc291cmNlcy5ncmVzb3VyY2UgdW5jb25kaXRpb25hbGx5 CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzczOTEK IApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9DTWFrZUxpc3RzLnR4dCBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvQ01ha2VMaXN0cy50eHQKaW5kZXggZWY1MWE0YS4uYmM1ZDBiZSAxMDA2 NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9DTWFrZUxpc3RzLnR4dAorKysgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL0NNYWtlTGlzdHMudHh0CkBAIC0xNjYsNiArMTY2LDcgQEAgdGFyZ2V0X2xp bmtfbGlicmFyaWVzKFRlc3RKYXZhU2NyaXB0Q29yZSAke1Rlc3RKYXZhU2NyaXB0Q29yZV9MSUJS QVJJRVN9KQogYWRkX3Rlc3QoVGVzdEphdmFTY3JpcHRDb3JlICR7VEVTVFdFQktJVEFQSV9SVU5U SU1FX09VVFBVVF9ESVJFQ1RPUll9L0phdmFTY3JpcHRDb3JlL1Rlc3RKYXZhU2NyaXB0Q29yZSkK IHNldF90ZXN0c19wcm9wZXJ0aWVzKFRlc3RKYXZhU2NyaXB0Q29yZSBQUk9QRVJUSUVTIFRJTUVP VVQgNjApCiBzZXRfdGFyZ2V0X3Byb3BlcnRpZXMoVGVzdEphdmFTY3JpcHRDb3JlIFBST1BFUlRJ RVMgUlVOVElNRV9PVVRQVVRfRElSRUNUT1JZICR7VEVTVFdFQktJVEFQSV9SVU5USU1FX09VVFBV VF9ESVJFQ1RPUll9L0phdmFTY3JpcHRDb3JlKQorYWRkX2RlcGVuZGVuY2llcyhUZXN0SmF2YVNj cmlwdENvcmUgSmF2YVNjcmlwdENvcmUgJHtGb3J3YXJkaW5nSGVhZGVyc0ZvclRlc3RXZWJLaXRB UElfTkFNRX0gJHtGb3J3YXJkaW5nTmV0d29ya0hlYWRlcnNGb3JUZXN0V2ViS2l0QVBJX05BTUV9 KQogCiBmb3JlYWNoICh0ZXN0TmFtZSAke3Rlc3Rfd2ViY29yZV9CSU5BUklFU30pCiAgICAgYWRk X2V4ZWN1dGFibGUoJHt0ZXN0TmFtZX0gJHt0ZXN0X21haW5fU09VUkNFU30gJHtURVNUV0VCS0lU QVBJX0RJUn0vVGVzdHNDb250cm9sbGVyLmNwcCAke1RFU1RXRUJLSVRBUElfRElSfS9UZXN0cy9X ZWJDb3JlLyR7dGVzdE5hbWV9LmNwcCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv UGxhdGZvcm1HVEsuY21ha2UgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1BsYXRmb3JtR1RLLmNtYWtl CmluZGV4IDI4ZGE1ZmQuLmJhZTg0ZDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv UGxhdGZvcm1HVEsuY21ha2UKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9QbGF0Zm9ybUdUSy5j bWFrZQpAQCAtMiwxMyArMiw3IEBACiAjIGRpc2FibGVkIGFuZCB0aGlzIHRyaWdnZXJzIHRoZSBp bmNsdXNpb24gb2YgdGhlIFdlYktpdDIgaGVhZGVycy4KIGFkZF9kZWZpbml0aW9ucygtREJVSUxE SU5HX1dFQktJVDJfXykKIAotYWRkX2N1c3RvbV90YXJnZXQoZm9yd2FyZGluZy1oZWFkZXJzR1RL Rm9yVGVzdFdlYktpdEFQSQotICAgIENPTU1BTkQgJHtQRVJMX0VYRUNVVEFCTEV9ICR7V0VCS0lU Ml9ESVJ9L1NjcmlwdHMvZ2VuZXJhdGUtZm9yd2FyZGluZy1oZWFkZXJzLnBsICR7V0VCS0lUMl9E SVJ9ICR7Rk9SV0FSRElOR19IRUFERVJTX0RJUn0gZ3RrCi0gICAgQ09NTUFORCAke1BFUkxfRVhF Q1VUQUJMRX0gJHtXRUJLSVQyX0RJUn0vU2NyaXB0cy9nZW5lcmF0ZS1mb3J3YXJkaW5nLWhlYWRl cnMucGwgJHtURVNUV0VCS0lUQVBJX0RJUn0gJHtGT1JXQVJESU5HX0hFQURFUlNfRElSfSAgZ3Rr Ci0gICAgQ09NTUFORCAke1BFUkxfRVhFQ1VUQUJMRX0gJHtXRUJLSVQyX0RJUn0vU2NyaXB0cy9n ZW5lcmF0ZS1mb3J3YXJkaW5nLWhlYWRlcnMucGwgJHtXRUJLSVQyX0RJUn0gJHtGT1JXQVJESU5H X0hFQURFUlNfRElSfSBzb3VwCi0gICAgQ09NTUFORCAke1BFUkxfRVhFQ1VUQUJMRX0gJHtXRUJL SVQyX0RJUn0vU2NyaXB0cy9nZW5lcmF0ZS1mb3J3YXJkaW5nLWhlYWRlcnMucGwgJHtURVNUV0VC S0lUQVBJX0RJUn0gJHtGT1JXQVJESU5HX0hFQURFUlNfRElSfSAgc291cAotKQotc2V0KEZvcndh cmRpbmdIZWFkZXJzRm9yVGVzdFdlYktpdEFQSV9OQU1FIGZvcndhcmRpbmctaGVhZGVyc0dUS0Zv clRlc3RXZWJLaXRBUEkpCitzZXQoRm9yd2FyZGluZ0hlYWRlcnNGb3JUZXN0V2ViS2l0QVBJX05B TUUgVGVzdFdlYktpdEFQSS1mb3J3YXJkaW5nLWhlYWRlcnMpCiAKIGluY2x1ZGVfZGlyZWN0b3Jp ZXMoCiAgICAgJHtGT1JXQVJESU5HX0hFQURFUlNfRElSfQpAQCAtMTQwLDMgKzEzNCwyMCBAQCBs aXN0KEFQUEVORCBUZXN0V1RGX1NPVVJDRVMKICAgICAke1RFU1RXRUJLSVRBUElfRElSfS9UZXN0 cy9XVEYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2UuY3BwCiAgICAgJHtURVNUV0VCS0lUQVBJX0RJ Un0vVGVzdHMvV1RGL2dvYmplY3QvR1VuaXF1ZVB0ci5jcHAKICkKKworZmlsZShHTE9CX1JFQ1VS U0UgVGVzdFdlYktpdEFQSV9TT1VSQ0VTCisgICAgKi5jcHAKKyAgICAqLmgKKykKKworYWRkX2N1 c3RvbV9jb21tYW5kKAorICAgIE9VVFBVVCAke0NNQUtFX0JJTkFSWV9ESVJ9L1Rlc3RXZWJLaXRB UEktZm9yd2FyZGluZy1oZWFkZXJzLnN0YW1wCisgICAgREVQRU5EUyAke1dFQktJVDJfRElSfS9T Y3JpcHRzL2dlbmVyYXRlLWZvcndhcmRpbmctaGVhZGVycy5wbAorICAgICAgICAgICAgJHtUZXN0 V2ViS2l0QVBJX1NPVVJDRVN9CisgICAgQ09NTUFORCAke1BFUkxfRVhFQ1VUQUJMRX0gJHtXRUJL SVQyX0RJUn0vU2NyaXB0cy9nZW5lcmF0ZS1mb3J3YXJkaW5nLWhlYWRlcnMucGwgJHtURVNUV0VC S0lUQVBJX0RJUn0gJHtGT1JXQVJESU5HX0hFQURFUlNfRElSfSBndGsKKyAgICBDT01NQU5EIHRv dWNoICR7Q01BS0VfQklOQVJZX0RJUn0vVGVzdFdlYktpdEFQSS1mb3J3YXJkaW5nLWhlYWRlcnMu c3RhbXAKKykKK2FkZF9jdXN0b21fdGFyZ2V0KFRlc3RXZWJLaXRBUEktZm9yd2FyZGluZy1oZWFk ZXJzCisgICAgREVQRU5EUyBXZWJLaXQyLWZvcndhcmRpbmctaGVhZGVycworICAgIERFUEVORFMg JHtDTUFLRV9CSU5BUllfRElSfS9UZXN0V2ViS2l0QVBJLWZvcndhcmRpbmctaGVhZGVycy5zdGFt cAorKQpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9QbGF0Zm9ybUdUSy5jbWFr ZSBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvUGxhdGZvcm1HVEsuY21ha2UKaW5kZXggMzBmNmE0 NC4uZTdiZTY4ZSAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9QbGF0Zm9ybUdU Sy5jbWFrZQorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1BsYXRmb3JtR1RLLmNtYWtlCkBA IC0xLDcgKzEsMyBAQAotYWRkX2N1c3RvbV90YXJnZXQoV2ViS2l0VGVzdFJ1bm5lci1mb3J3YXJk aW5nLWhlYWRlcnMKLSAgICBDT01NQU5EICR7UEVSTF9FWEVDVVRBQkxFfSAke1dFQktJVDJfRElS fS9TY3JpcHRzL2dlbmVyYXRlLWZvcndhcmRpbmctaGVhZGVycy5wbCAke1dFQktJVF9URVNUUlVO TkVSX0RJUn0gJHtGT1JXQVJESU5HX0hFQURFUlNfRElSfSBndGsKLSAgICBDT01NQU5EICR7UEVS TF9FWEVDVVRBQkxFfSAke1dFQktJVDJfRElSfS9TY3JpcHRzL2dlbmVyYXRlLWZvcndhcmRpbmct aGVhZGVycy5wbCAke1dFQktJVF9URVNUUlVOTkVSX0RJUn0gJHtGT1JXQVJESU5HX0hFQURFUlNf RElSfSBzb3VwCi0pCiBzZXQoRm9yd2FyZGluZ0hlYWRlcnNGb3JXZWJLaXRUZXN0UnVubmVyX05B TUUgV2ViS2l0VGVzdFJ1bm5lci1mb3J3YXJkaW5nLWhlYWRlcnMpCiAKIGxpc3QoQVBQRU5EIFdl YktpdFRlc3RSdW5uZXJfU09VUkNFUwpAQCAtNTksMyArNTUsMjAgQEAgYWRkX2RlZmluaXRpb25z KAogICAgIC1ERk9OVFNfQ09ORl9ESVI9IiR7VE9PTFNfRElSfS9XZWJLaXRUZXN0UnVubmVyL2d0 ay9mb250cyIKICAgICAtRFRPUF9MRVZFTF9ESVI9IiR7Q01BS0VfU09VUkNFX0RJUn0iCiApCisK K2ZpbGUoR0xPQl9SRUNVUlNFIFdlYktpdFRlc3RSdW5uZXJfSEVBREVSUworICAgICouaAorKQor CithZGRfY3VzdG9tX2NvbW1hbmQoCisgICAgT1VUUFVUICR7Q01BS0VfQklOQVJZX0RJUn0vV2Vi S2l0VGVzdFJ1bm5lci1mb3J3YXJkaW5nLWhlYWRlcnMuc3RhbXAKKyAgICBERVBFTkRTICR7V0VC S0lUMl9ESVJ9L1NjcmlwdHMvZ2VuZXJhdGUtZm9yd2FyZGluZy1oZWFkZXJzLnBsCisgICAgICAg ICAgICAke1dlYktpdFRlc3RSdW5uZXJfU09VUkNFU30KKyAgICAgICAgICAgICR7V2ViS2l0VGVz dFJ1bm5lcl9IRUFERVJTfQorICAgICAgICAgICAgJHtXZWJLaXRUZXN0UnVubmVySW5qZWN0ZWRC dW5kbGVfU09VUkNFU30KKyAgICBDT01NQU5EICR7UEVSTF9FWEVDVVRBQkxFfSAke1dFQktJVDJf RElSfS9TY3JpcHRzL2dlbmVyYXRlLWZvcndhcmRpbmctaGVhZGVycy5wbCAke1dFQktJVF9URVNU UlVOTkVSX0RJUn0gJHtGT1JXQVJESU5HX0hFQURFUlNfRElSfSBndGsKKyAgICBDT01NQU5EIHRv dWNoICR7Q01BS0VfQklOQVJZX0RJUn0vV2ViS2l0VGVzdFJ1bm5lci1mb3J3YXJkaW5nLWhlYWRl cnMuc3RhbXAKKykKK2FkZF9jdXN0b21fdGFyZ2V0KFdlYktpdFRlc3RSdW5uZXItZm9yd2FyZGlu Zy1oZWFkZXJzCisgICAgREVQRU5EUyAke0NNQUtFX0JJTkFSWV9ESVJ9L1dlYktpdFRlc3RSdW5u ZXItZm9yd2FyZGluZy1oZWFkZXJzLnN0YW1wCispCg==