96543 2012-09-12 12:44:56 -0700 [GTK] Clear application cache between tests in DumpRenderTree 2012-09-14 05:42:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 96681 1 zan zan abarth dpranke mrobinson ojan pnormand svillar webkit.review.bot oldest_to_newest 718618 0 zan 2012-09-12 12:44:56 -0700 [GTK] Clear application cache between tests in DumpRenderTree 718622 1 163671 zan 2012-09-12 12:50:41 -0700 Created attachment 163671 Patch 719212 2 163671 pnormand 2012-09-13 01:28:37 -0700 Comment on attachment 163671 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=163671&action=review > Tools/Scripts/webkitpy/layout_tests/port/gtk.py:-70 > + environment['XDG_CACHE_HOME'] = self._filesystem.join(self.results_directory(), 'appcache') > self._copy_value_from_environ_if_set(environment, 'WEBKITOUTPUTDIR') > - if self.get_option('webkit_test_runner'): > - # FIXME: This is a workaround to ensure that testing with WebKitTestRunner is started with > - # a non-existing cache. This should be removed when (and if) it will be possible to properly > - # set the cache directory path through a WebKitWebContext. > - environment['XDG_CACHE_HOME'] = self._filesystem.join(self.results_directory(), 'appcache') Not sure I understand this change. If the appcache is cleared properly why do we still need to set XDG_CACHE_HOME to point to the results directory? 719229 3 zan 2012-09-13 01:39:56 -0700 (In reply to comment #2) > > Not sure I understand this change. If the appcache is cleared properly why do we still need to set XDG_CACHE_HOME to point to the results directory? One reason would be to avoid manipulating the default user's cache (~/.cache/) which is used by Epiphany as well. Another reason is to start every test run (at least on the builders, with each build) with a clean, non-existent cache. I can put a comment above this change, explaining why this is done. 719241 4 pnormand 2012-09-13 01:49:34 -0700 (In reply to comment #3) > (In reply to comment #2) > > > > Not sure I understand this change. If the appcache is cleared properly why do we still need to set XDG_CACHE_HOME to point to the results directory? > > One reason would be to avoid manipulating the default user's cache (~/.cache/) which is used by Epiphany as well. Well Epiphany uses a custom directory I hope? > Another reason is to start every test run (at least on the builders, with each build) with a clean, non-existent cache. > But that's exactly the purpose of the method added in DRT support no? 719248 5 zan 2012-09-13 02:04:45 -0700 (In reply to comment #4) > (In reply to comment #3) > > (In reply to comment #2) > > > > > > Not sure I understand this change. If the appcache is cleared properly why do we still need to set XDG_CACHE_HOME to point to the results directory? > > > > One reason would be to avoid manipulating the default user's cache (~/.cache/) which is used by Epiphany as well. > > Well Epiphany uses a custom directory I hope? I can't tell for sure, the cache directory is by default set to $XDG_CACHE_HOME/webkitgtk/applications: http://trac.webkit.org/browser/trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp#L585 > > Another reason is to start every test run (at least on the builders, with each build) with a clean, non-existent cache. > > > > But that's exactly the purpose of the method added in DRT support no? The main use of that method is to clean the cache between each test. Setting XDG_CACHE_HOME env just assures we're not poking around user's actual WebKitGTK+ cache and that the testing is started with an empty cache directory. 719257 6 zan 2012-09-13 02:10:58 -0700 (In reply to comment #5) > (In reply to comment #4) > > (In reply to comment #3) > > > Another reason is to start every test run (at least on the builders, with each build) with a clean, non-existent cache. > > > > > > > But that's exactly the purpose of the method added in DRT support no? > > The main use of that method is to clean the cache between each test. Setting XDG_CACHE_HOME env just assures we're not poking around user's actual WebKitGTK+ cache and that the testing is started with an empty cache directory. Another option is to point XDG_CACHE_HOME to a temporary directory (if it's decided overriding XDG_CACHE_HOME is acceptable). 719297 7 pnormand 2012-09-13 03:11:38 -0700 Ok I think it's fine to use the results directory then. Thanks for the clarification! 719383 8 zan 2012-09-13 05:54:55 -0700 (In reply to comment #7) > Ok I think it's fine to use the results directory then. Thanks for the clarification! So r+ maybe? :> 719404 9 163671 pnormand 2012-09-13 06:31:12 -0700 Comment on attachment 163671 Patch r=me 719418 10 zan 2012-09-13 06:59:31 -0700 (In reply to comment #9) > (From update of attachment 163671 [details]) > r=me Thanks! 719422 11 163671 zan 2012-09-13 07:02:30 -0700 Comment on attachment 163671 Patch Clearing flags on attachment: 163671 Committed r128453: <http://trac.webkit.org/changeset/128453> 719423 12 zan 2012-09-13 07:02:37 -0700 All reviewed patches have been landed. Closing bug. 719770 13 webkit.review.bot 2012-09-13 12:16:19 -0700 Re-opened since this is blocked by 96681 720622 14 164115 zan 2012-09-14 05:29:49 -0700 Created attachment 164115 Patch 720642 15 164115 zan 2012-09-14 05:42:46 -0700 Comment on attachment 164115 Patch Clearing flags on attachment: 164115 Committed r128596: <http://trac.webkit.org/changeset/128596> 720643 16 zan 2012-09-14 05:42:51 -0700 All reviewed patches have been landed. Closing bug. 163671 2012-09-12 12:50:41 -0700 2012-09-14 05:29:44 -0700 Patch bug-96543-20120912125015.patch text/plain 5569 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4Mjk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggYjQ1NDlhNWIw NzkwMzAyMDMwMjc4ZjY2YWNiNWFkYTQ2NzdhNDJiMS4uNWFjZjM0NTg2ODNjY2RhYWUxNzkwNDAy OWFlZjAxZDU2YzQ2YjlkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEy LTA5LTEyICBaYW4gRG9iZXJzZWsgIDx6YW5kb2JlcnNla0BnbWFpbC5jb20+CisKKyAgICAgICAg W0dUS10gQ2xlYXIgYXBwbGljYXRpb24gY2FjaGUgYmV0d2VlbiB0ZXN0cyBpbiBEdW1wUmVuZGVy VHJlZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTY1 NDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQg YSBtZXRob2QgdG8gdGhlIER1bXBSZW5kZXJUcmVlU3VwcG9ydEd0ayBjbGFzcyB0aGF0IHVwb24g Y2FsbGluZworICAgICAgICBjbGVhcnMgdGhlIGFwcGxpY2F0aW9uIGNhY2hlIGFuZCB2YWN1dW1z IHRoZSBkYXRhYmFzZSBmaWxlLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRl clRyZWVTdXBwb3J0R3RrLmNwcDoKKyAgICAgICAgKER1bXBSZW5kZXJUcmVlU3VwcG9ydEd0azo6 Y2xlYXJBcHBsaWNhdGlvbkNhY2hlKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9EdW1wUmVu ZGVyVHJlZVN1cHBvcnRHdGsuaDoKKyAgICAgICAgKER1bXBSZW5kZXJUcmVlU3VwcG9ydEd0ayk6 CisKIDIwMTItMDktMTEgIEFybmF1ZCBSZW5ldmllciAgPGEucmVuZXZpZXJAc2lzYS5zYW1zdW5n LmNvbT4KIAogICAgICAgICBbR3RrXSBhbGxvdyBidWlsZGluZyB3aXRoIGNzcy1zaGFkZXJzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJl ZVN1cHBvcnRHdGsuY3BwIGIvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRHVtcFJl bmRlclRyZWVTdXBwb3J0R3RrLmNwcAppbmRleCAzOWI5ZGRjMzAyNDA0M2QxYzYyMmFlMGY4OGVi MmIzZjljZTFkMzYyLi5lNWQ2OTg5ZDFkOTU3NTM3MjY2NDM4NjI4NzAzMWJlMTgyYjkxOThkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJl ZVN1cHBvcnRHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0R1 bXBSZW5kZXJUcmVlU3VwcG9ydEd0ay5jcHAKQEAgLTI2LDYgKzI2LDcgQEAKICNpbmNsdWRlICJB WE9iamVjdENhY2hlLmgiCiAjaW5jbHVkZSAiQWNjZXNzaWJpbGl0eU9iamVjdC5oIgogI2luY2x1 ZGUgIkFuaW1hdGlvbkNvbnRyb2xsZXIuaCIKKyNpbmNsdWRlICJBcHBsaWNhdGlvbkNhY2hlU3Rv cmFnZS5oIgogI2luY2x1ZGUgIkNTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5oIgogI2luY2x1 ZGUgIkNocm9tZS5oIgogI2luY2x1ZGUgIkNocm9tZUNsaWVudEd0ay5oIgpAQCAtODExLDMgKzgx Miw5IEBAIHZvaWQgRHVtcFJlbmRlclRyZWVTdXBwb3J0R3RrOjpjbGVhck1lbW9yeUNhY2hlKCkK IHsKICAgICBtZW1vcnlDYWNoZSgpLT5ldmljdFJlc291cmNlcygpOwogfQorCit2b2lkIER1bXBS ZW5kZXJUcmVlU3VwcG9ydEd0azo6Y2xlYXJBcHBsaWNhdGlvbkNhY2hlKCkKK3sKKyAgICBjYWNo ZVN0b3JhZ2UoKS5lbXB0eSgpOworICAgIGNhY2hlU3RvcmFnZSgpLnZhY3V1bURhdGFiYXNlRmls ZSgpOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRHVt cFJlbmRlclRyZWVTdXBwb3J0R3RrLmggYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9y dC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRHdGsuaAppbmRleCA3ZTZlMWZhOWIxZjUxYzFjNDlkOTc1 N2YzMTg2MGJmMTZlNjgzODFlLi4zNzUwMjBkN2I5NDFhMTdhZTQ4NWFlNzM2ZWY2ODQ4NjBjODk4 MjRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9EdW1wUmVu ZGVyVHJlZVN1cHBvcnRHdGsuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9y dC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRHdGsuaApAQCAtMTI4LDYgKzEyOCw3IEBAIHB1YmxpYzoK ICAgICBzdGF0aWMgdm9pZCByZXNldFRyYWNrZWRSZXBhaW50cyhXZWJLaXRXZWJGcmFtZSopOwog CiAgICAgc3RhdGljIHZvaWQgY2xlYXJNZW1vcnlDYWNoZSgpOworICAgIHN0YXRpYyB2b2lkIGNs ZWFyQXBwbGljYXRpb25DYWNoZSgpOwogCiBwcml2YXRlOgogICAgIHN0YXRpYyBib29sIHNfZHJ0 UnVuOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4 IDcyOGI3M2Y0YTlhZTdjZDgxZGE1YTliOGMzZTcxYmM2MjQxNjY1NDMuLmRhNjc0ODE0Mzg4YzQy Mjk3Njg2YmE5NDQyMDhkYjVlYTY4MDE4OWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMi0wOS0xMiAgWmFuIERv YmVyc2VrICA8emFuZG9iZXJzZWtAZ21haWwuY29tPgorCisgICAgICAgIFtHVEtdIENsZWFyIGFw cGxpY2F0aW9uIGNhY2hlIGJldHdlZW4gdGVzdHMgaW4gRHVtcFJlbmRlclRyZWUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2NTQzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2FsbCB0aGUgbmV3IER1bXBS ZW5kZXJUcmVlU3VwcG9ydEd0ayBtZXRob2QgdG8gY2xlYXIgYXBwbGljYXRpb24gY2FjaGUKKyAg ICAgICAgYWZ0ZXIgZWFjaCB0ZXN0LgorCisgICAgICAgIFNldCB0aGUgWERHX0NBQ0hFX0hPTUUg ZW52aXJvbm1lbnQgdmFyaWFibGUgd2hlbiBydW5uaW5nIER1bXBSZW5kZXJUcmVlCisgICAgICAg IGFzIHdlbGwuIEN1cnJlbnRseSBpdCBwb2ludHMgdG8gYSBzdWJkaXJlY3RvcnkgaW4gdGhlIGxh eW91dCB0ZXN0cyByZXN1bHRzCisgICAgICAgIGRpcmVjdG9yeS4gQXQgbGVhc3Qgb24gdGhlIGJ1 aWxkZXJzIHRoaXMgZW5zdXJlcyBhbiBlbXB0eSBjYWNoZSBkaXJlY3RvcnkKKyAgICAgICAgd2l0 aCBlYWNoIHRlc3QgcnVuLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5k ZXJUcmVlLmNwcDoKKyAgICAgICAgKHJ1blRlc3QpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrLnB5OgorICAgICAgICAoR3RrUG9ydC5zZXR1cF9lbnZp cm9uX2Zvcl9zZXJ2ZXIpOgorCiAyMDEyLTA5LTEyICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhh dXNtYW5uQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIEZpeCB0aGUgYnVpbGQgd2l0aCBFTkFC TEVfTkVUU0NBUEVfUExVR0lOX0FQST0wCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJl ZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBS ZW5kZXJUcmVlLmNwcAppbmRleCBkYWJiMDlkMjkxMWM4MTJmYmU2YjIzYTk2ODgzZjYyNWYzZWNm ODQ3Li5lZWNhZGU5N2M3Y2NhMzA1NzVlZDhlNDc1NzIwZGRhOGNlOTgzM2I4IDEwMDY0NAotLS0g YS9Ub29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwCisrKyBiL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAKQEAgLTc3MCw2ICs3NzAsNyBA QCBzdGF0aWMgdm9pZCBydW5UZXN0KGNvbnN0IHN0cmluZyYgaW5wdXRMaW5lKQogCiAgICAgV2Vi Q29yZVRlc3RTdXBwb3J0OjpyZXNldEludGVybmFsc09iamVjdCh3ZWJraXRfd2ViX2ZyYW1lX2dl dF9nbG9iYWxfY29udGV4dChtYWluRnJhbWUpKTsKICAgICBEdW1wUmVuZGVyVHJlZVN1cHBvcnRH dGs6OmNsZWFyTWVtb3J5Q2FjaGUoKTsKKyAgICBEdW1wUmVuZGVyVHJlZVN1cHBvcnRHdGs6OmNs ZWFyQXBwbGljYXRpb25DYWNoZSgpOwogCiAgICAgLy8gQSBibGFuayBsb2FkIHNlZW1zIHRvIGJl IG5lY2Vzc2FyeSB0byByZXNldCBzdGF0ZSBhZnRlciBjZXJ0YWluIHRlc3RzLgogICAgIHdlYmtp dF93ZWJfdmlld19vcGVuKHdlYlZpZXcsICJhYm91dDpibGFuayIpOwpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2d0ay5weQppbmRleCBlZmViZjJkYjAwM2Zm MGE5NGVmNGM2NWM1NmI1NjY4NWY1ODBkMDViLi4wOWE5ODg4MzIyMmViMzI2YmM1NmQ5MzdiZmZk Njk3ZWUxOTIxMzY0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2d0ay5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2d0ay5weQpAQCAtNjIsMTIgKzYyLDggQEAgY2xhc3MgR3RrUG9ydChQb3J0LCBQdWxz ZUF1ZGlvU2FuaXRpemVyKToKICAgICAgICAgZW52aXJvbm1lbnRbJ0FVRElPX1JFU09VUkNFU19Q QVRIJ10gPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fY29uZmlnLndlYmtpdF9iYXNlX2Rp cigpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAnU291cmNlJywgJ1dlYkNvcmUnLCAncGxhdGZvcm0nLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAnYXVkaW8nLCAncmVzb3VyY2VzJykKKyAgICAgICAgZW52aXJvbm1lbnRbJ1hER19DQUNI RV9IT01FJ10gPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5yZXN1bHRzX2RpcmVjdG9yeSgp LCAnYXBwY2FjaGUnKQogICAgICAgICBzZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9z ZXQoZW52aXJvbm1lbnQsICdXRUJLSVRPVVRQVVRESVInKQotICAgICAgICBpZiBzZWxmLmdldF9v cHRpb24oJ3dlYmtpdF90ZXN0X3J1bm5lcicpOgotICAgICAgICAgICAgIyBGSVhNRTogVGhpcyBp cyBhIHdvcmthcm91bmQgdG8gZW5zdXJlIHRoYXQgdGVzdGluZyB3aXRoIFdlYktpdFRlc3RSdW5u ZXIgaXMgc3RhcnRlZCB3aXRoCi0gICAgICAgICAgICAjIGEgbm9uLWV4aXN0aW5nIGNhY2hlLiBU aGlzIHNob3VsZCBiZSByZW1vdmVkIHdoZW4gKGFuZCBpZikgaXQgd2lsbCBiZSBwb3NzaWJsZSB0 byBwcm9wZXJseQotICAgICAgICAgICAgIyBzZXQgdGhlIGNhY2hlIGRpcmVjdG9yeSBwYXRoIHRo cm91Z2ggYSBXZWJLaXRXZWJDb250ZXh0LgotICAgICAgICAgICAgZW52aXJvbm1lbnRbJ1hER19D QUNIRV9IT01FJ10gPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5yZXN1bHRzX2RpcmVjdG9y eSgpLCAnYXBwY2FjaGUnKQogICAgICAgICByZXR1cm4gZW52aXJvbm1lbnQKIAogICAgIGRlZiBf Z2VuZXJhdGVfYWxsX3Rlc3RfY29uZmlndXJhdGlvbnMoc2VsZik6Cg== 164115 2012-09-14 05:29:49 -0700 2012-09-14 05:42:45 -0700 Patch bug-96543-20120914052921.patch text/plain 6527 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggMzBmYjY2Yzll YjJjMWYzODExNzM2OTgxYjFlMzc5ZDFiZmJiOGY3Yy4uOWQ3YjA3NTViNTMyZWFkMjc3ZGIwODQy ZWI1MDVlYTJkMjk5OGE2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEy LTA5LTE0ICBaYW4gRG9iZXJzZWsgIDx6YW5kb2JlcnNla0BnbWFpbC5jb20+CisKKyAgICAgICAg W0dUS10gQ2xlYXIgYXBwbGljYXRpb24gY2FjaGUgYmV0d2VlbiB0ZXN0cyBpbiBEdW1wUmVuZGVy VHJlZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTY1 NDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQg YSBtZXRob2QgdG8gdGhlIER1bXBSZW5kZXJUcmVlU3VwcG9ydEd0ayBjbGFzcyB0aGF0IHVwb24g Y2FsbGluZworICAgICAgICBjbGVhcnMgdGhlIGFwcGxpY2F0aW9uIGNhY2hlIGFuZCB2YWN1dW1z IHRoZSBkYXRhYmFzZSBmaWxlLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRl clRyZWVTdXBwb3J0R3RrLmNwcDoKKyAgICAgICAgKER1bXBSZW5kZXJUcmVlU3VwcG9ydEd0azo6 Y2xlYXJBcHBsaWNhdGlvbkNhY2hlKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9EdW1wUmVu ZGVyVHJlZVN1cHBvcnRHdGsuaDoKKyAgICAgICAgKER1bXBSZW5kZXJUcmVlU3VwcG9ydEd0ayk6 CisKIDIwMTItMDktMTMgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMjg0NTMuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRH dGsuY3BwIGIvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVT dXBwb3J0R3RrLmNwcAppbmRleCAzOWI5ZGRjMzAyNDA0M2QxYzYyMmFlMGY4OGViMmIzZjljZTFk MzYyLi5lNWQ2OTg5ZDFkOTU3NTM3MjY2NDM4NjI4NzAzMWJlMTgyYjkxOThkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRH dGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJU cmVlU3VwcG9ydEd0ay5jcHAKQEAgLTI2LDYgKzI2LDcgQEAKICNpbmNsdWRlICJBWE9iamVjdENh Y2hlLmgiCiAjaW5jbHVkZSAiQWNjZXNzaWJpbGl0eU9iamVjdC5oIgogI2luY2x1ZGUgIkFuaW1h dGlvbkNvbnRyb2xsZXIuaCIKKyNpbmNsdWRlICJBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZS5oIgog I2luY2x1ZGUgIkNTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5oIgogI2luY2x1ZGUgIkNocm9t ZS5oIgogI2luY2x1ZGUgIkNocm9tZUNsaWVudEd0ay5oIgpAQCAtODExLDMgKzgxMiw5IEBAIHZv aWQgRHVtcFJlbmRlclRyZWVTdXBwb3J0R3RrOjpjbGVhck1lbW9yeUNhY2hlKCkKIHsKICAgICBt ZW1vcnlDYWNoZSgpLT5ldmljdFJlc291cmNlcygpOwogfQorCit2b2lkIER1bXBSZW5kZXJUcmVl U3VwcG9ydEd0azo6Y2xlYXJBcHBsaWNhdGlvbkNhY2hlKCkKK3sKKyAgICBjYWNoZVN0b3JhZ2Uo KS5lbXB0eSgpOworICAgIGNhY2hlU3RvcmFnZSgpLnZhY3V1bURhdGFiYXNlRmlsZSgpOworfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRy ZWVTdXBwb3J0R3RrLmggYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9EdW1wUmVu ZGVyVHJlZVN1cHBvcnRHdGsuaAppbmRleCA3ZTZlMWZhOWIxZjUxYzFjNDlkOTc1N2YzMTg2MGJm MTZlNjgzODFlLi4zNzUwMjBkN2I5NDFhMTdhZTQ4NWFlNzM2ZWY2ODQ4NjBjODk4MjRkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1 cHBvcnRHdGsuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9EdW1wUmVu ZGVyVHJlZVN1cHBvcnRHdGsuaApAQCAtMTI4LDYgKzEyOCw3IEBAIHB1YmxpYzoKICAgICBzdGF0 aWMgdm9pZCByZXNldFRyYWNrZWRSZXBhaW50cyhXZWJLaXRXZWJGcmFtZSopOwogCiAgICAgc3Rh dGljIHZvaWQgY2xlYXJNZW1vcnlDYWNoZSgpOworICAgIHN0YXRpYyB2b2lkIGNsZWFyQXBwbGlj YXRpb25DYWNoZSgpOwogCiBwcml2YXRlOgogICAgIHN0YXRpYyBib29sIHNfZHJ0UnVuOwpkaWZm IC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGVkOWIxMWMy YWEwYTA0NDZhMGQzMjY4NzY1Y2IwYzJlYWQwMmJmZjkuLjIzYmRlMjk4ZTUzODVlYWQ1MjIxYTIw NjkzODg4MTAwOTA2ZDBkNjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29s cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMi0wOS0xNCAgWmFuIERvYmVyc2VrICA8 emFuZG9iZXJzZWtAZ21haWwuY29tPgorCisgICAgICAgIFtHVEtdIENsZWFyIGFwcGxpY2F0aW9u IGNhY2hlIGJldHdlZW4gdGVzdHMgaW4gRHVtcFJlbmRlclRyZWUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2NTQzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2FsbCB0aGUgbmV3IER1bXBSZW5kZXJUcmVl U3VwcG9ydEd0ayBtZXRob2QgdG8gY2xlYXIgYXBwbGljYXRpb24gY2FjaGUKKyAgICAgICAgYWZ0 ZXIgZWFjaCB0ZXN0IGluIER1bXBSZW5kZXJUcmVlLgorCisgICAgICAgIFNldCB0aGUgWERHX0NB Q0hFX0hPTUUgZW52aXJvbm1lbnQgdmFyaWFibGUgd2hlbiBydW5uaW5nIER1bXBSZW5kZXJUcmVl CisgICAgICAgIGFzIHdlbGwuIEl0J3Mgbm93IGJlaW5nIHNldCBpbiBYdmZiRHJpdmVyLl9zdGFy dCBzbyB0aGF0IGVhY2ggZHJpdmVyIGlzIGFzc2lnbmVkCisgICAgICAgIGEgY2FjaGUgZGlyZWN0 b3J5IHRoYXQncyBjb25zdHJ1Y3RlZCBvdXQgb2YgdGhlIGRyaXZlcidzIG5hbWUgYW5kIGl0cyB3 b3JrZXIKKyAgICAgICAgbnVtYmVyLiBUaGVzZSBkaXJlY3RvcmllcyBhcmUgbG9jYXRlZCBpbiB0 aGUgbGF5b3V0IHRlc3RzIHJlc3VsdHMgZGlyZWN0b3J5LgorICAgICAgICBBdCBsZWFzdCBvbiB0 aGUgYnVpbGRlcnMgdGhpcyBlbnN1cmVzIGEgZHJpdmVyLXNwZWNpZmljIGVtcHR5IGNhY2hlIGRp cmVjdG9yeQorICAgICAgICB3aXRoIGVhY2ggdGVzdCBydW4uCisKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwOgorICAgICAgICAocnVuVGVzdCk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHk6CisgICAgICAg IChHdGtQb3J0LnNldHVwX2Vudmlyb25fZm9yX3NlcnZlcik6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC94dmZiZHJpdmVyLnB5OgorICAgICAgICAoWHZmYkRy aXZlci5fc3RhcnQpOgorCiAyMDEyLTA5LTE0ICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNt YW5uQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIEZpeCBsaW5raW5nIG9uIFdpbmRvd3MKZGlm ZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAgYi9U b29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwCmluZGV4IGRhYmIwOWQy OTExYzgxMmZiZTZiMjNhOTY4ODNmNjI1ZjNlY2Y4NDcuLmVlY2FkZTk3YzdjY2EzMDU3NWVkOGU0 NzU3MjBkZGE4Y2U5ODMzYjggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9E dW1wUmVuZGVyVHJlZS5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5k ZXJUcmVlLmNwcApAQCAtNzcwLDYgKzc3MCw3IEBAIHN0YXRpYyB2b2lkIHJ1blRlc3QoY29uc3Qg c3RyaW5nJiBpbnB1dExpbmUpCiAKICAgICBXZWJDb3JlVGVzdFN1cHBvcnQ6OnJlc2V0SW50ZXJu YWxzT2JqZWN0KHdlYmtpdF93ZWJfZnJhbWVfZ2V0X2dsb2JhbF9jb250ZXh0KG1haW5GcmFtZSkp OwogICAgIER1bXBSZW5kZXJUcmVlU3VwcG9ydEd0azo6Y2xlYXJNZW1vcnlDYWNoZSgpOworICAg IER1bXBSZW5kZXJUcmVlU3VwcG9ydEd0azo6Y2xlYXJBcHBsaWNhdGlvbkNhY2hlKCk7CiAKICAg ICAvLyBBIGJsYW5rIGxvYWQgc2VlbXMgdG8gYmUgbmVjZXNzYXJ5IHRvIHJlc2V0IHN0YXRlIGFm dGVyIGNlcnRhaW4gdGVzdHMuCiAgICAgd2Via2l0X3dlYl92aWV3X29wZW4od2ViVmlldywgImFi b3V0OmJsYW5rIik7CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2d0ay5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvZ3RrLnB5CmluZGV4IGI0YTRhMjliNTI4NmRjMTIwYWQ5NThhY2Y1M2RjMTg2OGZiMGNmODku LjNjYzBlYTU2NmE0ODliMGJjYzU4MzBlNmExN2E4YzkzY2UyZmUxMmQgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrLnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrLnB5CkBAIC03MiwxMSArNzIs NiBAQCBjbGFzcyBHdGtQb3J0KFBvcnQsIFB1bHNlQXVkaW9TYW5pdGl6ZXIpOgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAnU291cmNlJywgJ1dlYkNvcmUnLCAncGxhdGZvcm0nLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnYXVkaW8nLCAn cmVzb3VyY2VzJykKICAgICAgICAgc2VsZi5fY29weV92YWx1ZV9mcm9tX2Vudmlyb25faWZfc2V0 KGVudmlyb25tZW50LCAnV0VCS0lUT1VUUFVURElSJykKLSAgICAgICAgaWYgc2VsZi5nZXRfb3B0 aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXInKToKLSAgICAgICAgICAgICMgRklYTUU6IFRoaXMgaXMg YSB3b3JrYXJvdW5kIHRvIGVuc3VyZSB0aGF0IHRlc3Rpbmcgd2l0aCBXZWJLaXRUZXN0UnVubmVy IGlzIHN0YXJ0ZWQgd2l0aAotICAgICAgICAgICAgIyBhIG5vbi1leGlzdGluZyBjYWNoZS4gVGhp cyBzaG91bGQgYmUgcmVtb3ZlZCB3aGVuIChhbmQgaWYpIGl0IHdpbGwgYmUgcG9zc2libGUgdG8g cHJvcGVybHkKLSAgICAgICAgICAgICMgc2V0IHRoZSBjYWNoZSBkaXJlY3RvcnkgcGF0aCB0aHJv dWdoIGEgV2ViS2l0V2ViQ29udGV4dC4KLSAgICAgICAgICAgIGVudmlyb25tZW50WydYREdfQ0FD SEVfSE9NRSddID0gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYucmVzdWx0c19kaXJlY3Rvcnko KSwgJ2FwcGNhY2hlJykKICAgICAgICAgcmV0dXJuIGVudmlyb25tZW50CiAKICAgICBkZWYgX2dl bmVyYXRlX2FsbF90ZXN0X2NvbmZpZ3VyYXRpb25zKHNlbGYpOgpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC94dmZiZHJpdmVyLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC94dmZiZHJpdmVyLnB5CmluZGV4IDI4 MWIyMTczYjljNzI4NTkzOWYwOTdlNWZiOTRjM2UyZGRhMTNmNDMuLjdlMzg2YTEwODMzNTQxYmIz ZmY0MDA0YzZiNmU5YTBhNDRlMTZmYTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQveHZmYmRyaXZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3h2ZmJkcml2ZXIucHkKQEAgLTYxLDYgKzYxLDggQEAg Y2xhc3MgWHZmYkRyaXZlcihEcml2ZXIpOgogICAgICAgICBlbnZpcm9ubWVudCA9IHNlbGYuX3Bv cnQuc2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyKHNlcnZlcl9uYW1lKQogICAgICAgICAjIFdlIG11 c3QgZG8gdGhpcyBoZXJlIGJlY2F1c2UgdGhlIERJU1BMQVkgbnVtYmVyIGRlcGVuZHMgb24gX3dv cmtlcl9udW1iZXIKICAgICAgICAgZW52aXJvbm1lbnRbJ0RJU1BMQVknXSA9ICI6JWQiICUgZGlz cGxheV9pZAorICAgICAgICAjIERyaXZlcnMgc2hvdWxkIHVzZSBzZXBhcmF0ZSBhcHBsaWNhdGlv biBjYWNoZSBsb2NhdGlvbnMKKyAgICAgICAgZW52aXJvbm1lbnRbJ1hER19DQUNIRV9IT01FJ10g PSBzZWxmLl9wb3J0Lmhvc3QuZmlsZXN5c3RlbS5qb2luKHNlbGYuX3BvcnQucmVzdWx0c19kaXJl Y3RvcnkoKSwgJyVzLWFwcGNhY2hlLSVkJyAlIChzZXJ2ZXJfbmFtZSwgc2VsZi5fd29ya2VyX251 bWJlcikpCiAKICAgICAgICAgc2VsZi5fY3Jhc2hlZF9wcm9jZXNzX25hbWUgPSBOb25lCiAgICAg ICAgIHNlbGYuX2NyYXNoZWRfcGlkID0gTm9uZQo=