141928 2015-02-23 15:08:44 -0800 Merge run-launcher into run-minibrowser 2015-04-27 11:20:54 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 clopez ossy andersca cgarcia commit-queue dbates ddkilzer glenn mcatanzaro ossy sam oldest_to_newest 1071357 0 clopez 2015-02-23 15:08:44 -0800 The script Tools/Scripts/run-minibrowser don't works for the EFL or GTK ports. I think this script should gain both a --gtk and --efl switches to execute the minibrowser from this two ports. 1071567 1 ossy 2015-02-23 23:52:24 -0800 Yes, it seems it is Mac only now. But run-launcher already works, you can copy/paste the logic from it. 1071585 2 cgarcia 2015-02-24 01:15:24 -0800 What is it used for? will it replace run-launcher eventually? 1071611 3 clopez 2015-02-24 03:26:29 -0800 I didn't knew about run-launcher. Until now I'm executing the minibrowser manually like: Tools/jhbuild/jhbuild-wrapper --gtk run WebKitBuild/Release/bin/MiniBrowser What is the difference between run-launcher and run-minibrowser ? Should we merge both ? 1071624 4 ossy 2015-02-24 04:39:05 -0800 It seems run-launcher is used only EFL and GTK nowadays, run-webkit-tests calls it after tests (efl.py, gtk.py) And run-minibrowser seems to be Mac only script now. I'd prefer merging run-launcher to run-minibrowser. 1071647 5 mcatanzaro 2015-02-24 06:59:24 -0800 Be sure to update the build-webkit script as well; it instructs users to use run-launcher without any arguments when the build is complete, but that just prints a message saying your OS is unsupported, so this would be a good time to fix that. 1089020 6 251741 ossy 2015-04-27 08:01:03 -0700 Created attachment 251741 Patch additionally removing obsolete FIXMEs 1089024 7 251741 ossy 2015-04-27 08:20:04 -0700 Comment on attachment 251741 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251741&action=review > Tools/Scripts/webkitpy/port/efl.py:-132 > - # FIXME: We should find a way to share this implmentation with Gtk, > - # or teach run-launcher how to call run-safari and move this down to WebKitPort. It is only a oneliner, there is no need to try to share it with GTK. > Tools/Scripts/webkitpy/port/efl.py:-135 > - # FIXME: old-run-webkit-tests also added ["-graphicssystem", "raster", "-style", "windows"] > - # FIXME: old-run-webkit-tests converted results_filename path for cygwin. Just some comment, why can we remove them: - -graphicssystem raster -style windows are Qt crufts - cygwin: I can't remember if we ever supported Windows. 1089031 8 251741 darin 2015-04-27 09:02:21 -0700 Comment on attachment 251741 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251741&action=review > Tools/Scripts/webkitpy/port/efl.py:131 > + self._run_script("run-minibrowser", ["file://%s" % results_filename]) This is not the right way to construct a URL from a local file name. Isn’t there some python library function that can turn a filename into a URL that can handle things like "%" characters? > Tools/Scripts/webkitpy/port/gtk.py:202 > + self._run_script("run-minibrowser", ["file://%s" % results_filename]) Ditto. 1089089 9 ossy 2015-04-27 11:15:31 -0700 webkitpy.common.system.path.abspath_to_uri does it, win.py already use it in its show_results_html_file. The results is same, but I'll change it before landing. 1089093 10 ossy 2015-04-27 11:20:54 -0700 Committed r183400: <http://trac.webkit.org/changeset/183400> 251741 2015-04-27 08:01:03 -0700 2015-04-27 09:02:21 -0700 Patch bug-141928-20150427165954.patch text/plain 10937 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMzkyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTE1YzI4YjdmMjAzNzNiODI1OGEyZjBjZWM5ZjM3N2U4 NWRlYmFiZC4uODMyMWMxNDAzMzNiZTk3Y2NiNTAzNTZjM2FiNGFlZmQ2NDU1YjM4ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5 IEBACiAyMDE1LTA0LTI3ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAK KyAgICAgICAgTWVyZ2UgcnVuLWxhdW5jaGVyIGludG8gcnVuLW1pbmlicm93c2VyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDE5MjgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLWll eHBsb2Rlci10ZXN0czoKKyAgICAgICAgKHJ1blNhZmFyaVdpdGhJRXhwbG9kZXIpOgorICAgICAg ICAqIFNjcmlwdHMvcnVuLWxhdW5jaGVyOiBSZW1vdmVkLgorICAgICAgICAqIFNjcmlwdHMvcnVu LW1pbmlicm93c2VyOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAg KGxhdW5jaGVyUGF0aCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2VmbC5weToK KyAgICAgICAgKEVmbFBvcnQuc2hvd19yZXN1bHRzX2h0bWxfZmlsZSk6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9wb3J0L2VmbF91bml0dGVzdC5weToKKyAgICAgICAgKEVmbFBvcnRUZXN0 LnRlc3Rfc2hvd19yZXN1bHRzX2h0bWxfZmlsZSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9wb3J0L2d0ay5weToKKyAgICAgICAgKEd0a1BvcnQucHJpbnRfbGVha3Nfc3VtbWFyeSk6Cisg ICAgICAgIChHdGtQb3J0LnNob3dfcmVzdWx0c19odG1sX2ZpbGUpOgorICAgICAgICAoR3RrUG9y dCk6IERlbGV0ZWQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0a191bml0dGVz dC5weToKKyAgICAgICAgKEd0a1BvcnRUZXN0LnRlc3Rfc2hvd19yZXN1bHRzX2h0bWxfZmlsZSk6 CisKKzIwMTUtMDQtMjcgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KKwog ICAgICAgICBbYnVpbGRib3RdIEZpeCB0aGUgb3V0cHV0IG9mIHBlcmYtdGVzdCBidWlsZHN0ZXAg b24gdGltZW91dAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQ0MDk3CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWlleHBsb2Rlci10ZXN0 cyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWlleHBsb2Rlci10ZXN0cwppbmRleCBiYzEwOGMzOGM5YTRk MmRmM2MzOTM1NGJlMzRlNzBjM2ZlYjQ0YjA2Li5jYjM0MjdjYjQyZDZkMjljNmZlM2ZiMjg5ODA3 YjMwNTFhNTc0YmVhIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1bi1pZXhwbG9kZXItdGVz dHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4taWV4cGxvZGVyLXRlc3RzCkBAIC0xMDIsNyArMTAy LDcgQEAgc3ViIHJ1blNhZmFyaVdpdGhJRXhwbG9kZXIoKQogICAgIGNsb3NlIFJFRElSRUNUX0hU TUw7CiAgICAgCiAgICAgaWYgKCFpc0FwcGxlV2ViS2l0KCkpIHsKLSAgICAgICAgc3lzdGVtICJU b29scy9TY3JpcHRzL3J1bi1sYXVuY2hlciIsICIkaUV4cGxvZGVyVGVzdERpcmVjdG9yeS9yZWRp cmVjdC5odG1sIjsKKyAgICAgICAgc3lzdGVtICJUb29scy9TY3JpcHRzL3J1bi1taW5pYnJvd3Nl ciIsICIkaUV4cGxvZGVyVGVzdERpcmVjdG9yeS9yZWRpcmVjdC5odG1sIjsKICAgICB9IGVsc2Ug ewogICAgICAgICBsb2NhbCAlRU5WOwogICAgICAgICAkRU5We0RZTERfSU5TRVJUX0xJQlJBUklF U30gPSAiL3Vzci9saWIvbGliZ21hbGxvYy5keWxpYiIgaWYgJGd1YXJkTWFsbG9jOwpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tbGF1bmNoZXIgYi9Ub29scy9TY3JpcHRzL3J1bi1sYXVu Y2hlcgpkZWxldGVkIGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggNmE2MzE0ZDU0NWZkYjE0NTE4MDRm N2MxNzZhYTFjMjI5NGRlZGZkZi4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMAotLS0gYS9Ub29scy9TY3JpcHRzL3J1bi1sYXVuY2hlcgorKysgL2Rldi9udWxsCkBAIC0x LDYwICswLDAgQEAKLSMhL3Vzci9iaW4vZW52IHBlcmwKLQotIyBDb3B5cmlnaHQgKEMpIDIwMDcs IDIwMTMgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSMgQ29weXJpZ2h0IChDKSAy MDA3IFN0YWlrb3MgQ29tcHV0aW5nIFNlcnZpY2VzLCBJbmMuICA8aW5mb0BzdGFpa29zLm5ldD4K LSMKLSMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0Ci0jIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0 aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwotIyBhcmUgbWV0OgotIwotIyAxLiAgUmVkaXN0 cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQK LSMgICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lci4gCi0jIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCBy ZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotIyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQotIyAgICAgZG9j dW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3Ry aWJ1dGlvbi4gCi0jIDMuICBOZWl0aGVyIHRoZSBuYW1lIG9mIEFwcGxlIEluYy4gKCJBcHBsZSIp IG5vciB0aGUgbmFtZXMgb2YKLSMgICAgIGl0cyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8g ZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQKLSMgICAgIGZyb20gdGhpcyBzb2Z0 d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4gCi0jCi0jIFRI SVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgQU5EIElUUyBDT05UUklCVVRPUlMgIkFT IElTIiBBTkQgQU5ZCi0jIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywgVEhFIElNUExJRUQKLSMgV0FSUkFOVElFUyBPRiBNRVJDSEFO VEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQotIyBESVND TEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBPUiBJVFMgQ09OVFJJQlVUT1JTIEJFIExJ QUJMRSBGT1IgQU5ZCi0jIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVY RU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTCi0jIChJTkNMVURJTkcsIEJVVCBOT1Qg TElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsK LSMgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElP TikgSE9XRVZFUiBDQVVTRUQgQU5ECi0jIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVU SEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCi0jIChJTkNMVURJTkcg TkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT RSBPRgotIyBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgotCi0jIFNpbXBsaWZpZWQgInJ1biIgc2NyaXB0IGZvciBXZWJLaXQg T3BlbiBTb3VyY2UgUHJvamVjdC4KLQotdXNlIHN0cmljdDsKLXVzZSB3YXJuaW5nczsKLXVzZSBG aWxlOjpTcGVjOjpGdW5jdGlvbnMgcXcvY2F0ZGlyLzsKLXVzZSBGaWxlOjpUZW1wIHF3L3RlbXBm aWxlLzsKLXVzZSBGaW5kQmluOwotdXNlIGxpYiAkRmluZEJpbjo6QmluOwotdXNlIHdlYmtpdGRp cnM7Ci0KLXNldENvbmZpZ3VyYXRpb24oKTsKLW15ICRwcm9kdWN0RGlyID0gcHJvZHVjdERpcigp OwotbXkgJGxhdW5jaGVyUGF0aDsKLW15IEBqaGJ1aWxkV3JhcHBlcjsKLQotIyBDaGVjayB0byBz ZWUgdGhhdCBhbGwgdGhlIGZyYW1ld29ya3MgYXJlIGJ1aWx0LgotY2hlY2tGcmFtZXdvcmtzKCk7 Ci0KLSMgU2V0IHBhdGhzIGFjY29yZGluZyB0byB0aGUgYnVpbGQgc3lzdGVtIHVzZWQKLWlmIChp c0d0aygpIHx8IGlzRWZsKCkpIHsKLSAgICAkbGF1bmNoZXJQYXRoID0gY2F0ZGlyKCRwcm9kdWN0 RGlyLCAiYmluIiwgIk1pbmlCcm93c2VyIik7Ci19Ci0KLSRsYXVuY2hlclBhdGggJiYgLXggJGxh dW5jaGVyUGF0aCBvciBkaWUgIkNhbid0IGZpbmQgdGhlIGxhdW5jaGVyIGNvbW1hbmQiOwotCi1A amhidWlsZFdyYXBwZXIgPSBqaGJ1aWxkV3JhcHBlclByZWZpeElmTmVlZGVkKCk7Ci0KLXByaW50 ICJTdGFydGluZyB3ZWJraXQgbGF1bmNoZXIuXG4iOwotCi1leGVjIEBqaGJ1aWxkV3JhcHBlciwg JGxhdW5jaGVyUGF0aCwgQEFSR1Ygb3IgZGllOwotCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3J1bi1taW5pYnJvd3NlciBiL1Rvb2xzL1NjcmlwdHMvcnVuLW1pbmlicm93c2VyCmluZGV4IGQw MWRlOTVlYWZiODJlMjQ5MjhlYzY4ZDZiOGRiOTJlZTY5NmZkNWMuLmM3ZDMwMDgzNDIwNzE3ZjZj Nzk3N2I3MDA2ZjQzN2RkOTViZGI4YmIgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcnVuLW1p bmlicm93c2VyCisrKyBiL1Rvb2xzL1NjcmlwdHMvcnVuLW1pbmlicm93c2VyCkBAIC0xLDYgKzEs OCBAQAogIyEvdXNyL2Jpbi9wZXJsIC13CiAKLSMgQ29weXJpZ2h0IChDKSAyMDA1LCAyMDA3IEFw cGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDA1LCAyMDA3 LCAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAy MDA3IFN0YWlrb3MgQ29tcHV0aW5nIFNlcnZpY2VzLCBJbmMuICA8aW5mb0BzdGFpa29zLm5ldD4K KwogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yOSwxMiArMzEsMjkgQEAKICMgU2lt cGxpZmllZCAicnVuIiBzY3JpcHQgZm9yIGxhdW5jaGluZyB0aGUgV2ViS2l0MiBNaW5pQnJvd3Nl ci4KIAogdXNlIHN0cmljdDsKK3VzZSB3YXJuaW5nczsKK3VzZSBGaWxlOjpTcGVjOjpGdW5jdGlv bnMgcXcvY2F0ZGlyLzsKIHVzZSBGaW5kQmluOwogdXNlIGxpYiAkRmluZEJpbjo6QmluOwogdXNl IHdlYmtpdGRpcnM7CiAKLXByaW50SGVscEFuZEV4aXRGb3JSdW5BbmREZWJ1Z1dlYktpdEFwcElm TmVlZGVkKCk7CitteSAkbGF1bmNoZXJQYXRoOworbXkgQGpoYnVpbGRXcmFwcGVyOwogCiBzZXRD b25maWd1cmF0aW9uKCk7CiAKLWV4aXQgZXhpdFN0YXR1cyhydW5NaW5pQnJvd3NlcigpKTsKK2lm IChpc0d0aygpIHx8IGlzRWZsKCkpIHsKKyAgICAjIENoZWNrIHRvIHNlZSB0aGF0IGFsbCB0aGUg ZnJhbWV3b3JrcyBhcmUgYnVpbHQuCisgICAgY2hlY2tGcmFtZXdvcmtzKCk7CisKKyAgICAkbGF1 bmNoZXJQYXRoID0gY2F0ZGlyKHByb2R1Y3REaXIoKSwgImJpbiIsICJNaW5pQnJvd3NlciIpOwor ICAgIGRpZSAiQ2FuJ3QgZmluZCAkbGF1bmNoZXJQYXRoIiB1bmxlc3MgLXggJGxhdW5jaGVyUGF0 aDsKKyAgICBAamhidWlsZFdyYXBwZXIgPSBqaGJ1aWxkV3JhcHBlclByZWZpeElmTmVlZGVkKCk7 CisgICAgcHJpbnQgIlN0YXJ0aW5nIE1pbmlCcm93c2VyLlxuIjsKKyAgICBleGVjIEBqaGJ1aWxk V3JhcHBlciwgJGxhdW5jaGVyUGF0aCwgQEFSR1Ygb3IgZGllOworfSBlbHNpZiAoaXNBcHBsZU1h Y1dlYktpdCgpKSB7CisgICAgcHJpbnRIZWxwQW5kRXhpdEZvclJ1bkFuZERlYnVnV2ViS2l0QXBw SWZOZWVkZWQoKTsKKyAgICBleGl0IGV4aXRTdGF0dXMocnVuTWluaUJyb3dzZXIoKSk7Cit9IGVs c2UgeworICAgIGRpZSAiVW5zdXBwb3J0ZWQgcGxhdGZvcm0uIgorfQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmlu ZGV4IGE0MDZjOTM5MTQwMmI0ZWIxYjFlZjA2MzY0YWJiNGI5YjQxY2U0YTIuLjIwODIzNTViM2U2 YWMxYmQzNzI3MDA5ZTBmMjgxMmFlOWNjYzMyNjYgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTEzNjYs NyArMTM2Niw3IEBAIHN1YiBsYXVuY2hlclBhdGgoKQogewogICAgIG15ICRyZWxhdGl2ZVNjcmlw dHNQYXRoID0gcmVsYXRpdmVTY3JpcHRzRGlyKCk7CiAgICAgaWYgKGlzR3RrKCkgfHwgaXNFZmwo KSkgewotICAgICAgICByZXR1cm4gIiRyZWxhdGl2ZVNjcmlwdHNQYXRoL3J1bi1sYXVuY2hlciI7 CisgICAgICAgIHJldHVybiAiJHJlbGF0aXZlU2NyaXB0c1BhdGgvcnVuLW1pbmlicm93c2VyIjsK ICAgICB9IGVsc2lmIChpc0FwcGxlV2ViS2l0KCkpIHsKICAgICAgICAgcmV0dXJuICIkcmVsYXRp dmVTY3JpcHRzUGF0aC9ydW4tc2FmYXJpIjsKICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3BvcnQvZWZsLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Vm bC5weQppbmRleCAzYzg5MjE5N2VjYjNlNzQ2YmQ1ZGJmZjQzODViNzJiOTI5MDFlMGY0Li43NWQx Yzg0NjZjNGQyOGRkYTg4NzM1ZmMxNjE1NTYyNmNkMjljNTM2IDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvZWZsLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC9lZmwucHkKQEAgLTEyOCwxMiArMTI4LDcgQEAgY2xhc3MgRWZsUG9ydChQb3J0KToKICAg ICAgICAgcmV0dXJuIGxpc3QocmV2ZXJzZWQoW3NlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl93 ZWJraXRfYmFzZWxpbmVfcGF0aChwKSwgJ1Rlc3RFeHBlY3RhdGlvbnMnKSBmb3IgcCBpbiBzZWxm Ll9zZWFyY2hfcGF0aHMoKV0pKQogCiAgICAgZGVmIHNob3dfcmVzdWx0c19odG1sX2ZpbGUoc2Vs ZiwgcmVzdWx0c19maWxlbmFtZSk6Ci0gICAgICAgICMgRklYTUU6IFdlIHNob3VsZCBmaW5kIGEg d2F5IHRvIHNoYXJlIHRoaXMgaW1wbG1lbnRhdGlvbiB3aXRoIEd0aywKLSAgICAgICAgIyBvciB0 ZWFjaCBydW4tbGF1bmNoZXIgaG93IHRvIGNhbGwgcnVuLXNhZmFyaSBhbmQgbW92ZSB0aGlzIGRv d24gdG8gV2ViS2l0UG9ydC4KLSAgICAgICAgcnVuX2xhdW5jaGVyX2FyZ3MgPSBbImZpbGU6Ly8l cyIgJSByZXN1bHRzX2ZpbGVuYW1lXQotICAgICAgICAjIEZJWE1FOiBvbGQtcnVuLXdlYmtpdC10 ZXN0cyBhbHNvIGFkZGVkIFsiLWdyYXBoaWNzc3lzdGVtIiwgInJhc3RlciIsICItc3R5bGUiLCAi d2luZG93cyJdCi0gICAgICAgICMgRklYTUU6IG9sZC1ydW4td2Via2l0LXRlc3RzIGNvbnZlcnRl ZCByZXN1bHRzX2ZpbGVuYW1lIHBhdGggZm9yIGN5Z3dpbi4KLSAgICAgICAgc2VsZi5fcnVuX3Nj cmlwdCgicnVuLWxhdW5jaGVyIiwgcnVuX2xhdW5jaGVyX2FyZ3MpCisgICAgICAgIHNlbGYuX3J1 bl9zY3JpcHQoInJ1bi1taW5pYnJvd3NlciIsIFsiZmlsZTovLyVzIiAlIHJlc3VsdHNfZmlsZW5h bWVdKQogCiAgICAgZGVmIGNoZWNrX3N5c19kZXBzKHNlbGYsIG5lZWRzX2h0dHApOgogICAgICAg ICByZXR1cm4gc3VwZXIoRWZsUG9ydCwgc2VsZikuY2hlY2tfc3lzX2RlcHMobmVlZHNfaHR0cCkg YW5kIHNlbGYuX2RyaXZlcl9jbGFzcygpLmNoZWNrX2RyaXZlcihzZWxmKQpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2VmbF91bml0dGVzdC5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC9lZmxfdW5pdHRlc3QucHkKaW5kZXggZTgxMGM0MDdmZmNjODU2NDgw NTE1ZTcwZmNmMjFiZTg4MDQzMmQ0Zi4uZjA4MjE1NTRlN2IxNTZhZmRkODVmODVkZTcyYTU4ZDE0 Y2Q4YzdlZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2VmbF91bml0 dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZWZsX3VuaXR0ZXN0LnB5 CkBAIC00Niw3ICs0Niw3IEBAIGNsYXNzIEVmbFBvcnRUZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRl c3RDYXNlKToKICAgICBkZWYgdGVzdF9zaG93X3Jlc3VsdHNfaHRtbF9maWxlKHNlbGYpOgogICAg ICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQogICAgICAgICBwb3J0Ll9leGVjdXRpdmUgPSBN b2NrRXhlY3V0aXZlKHNob3VsZF9sb2c9VHJ1ZSkKLSAgICAgICAgZXhwZWN0ZWRfbG9ncyA9ICJN T0NLIHJ1bl9jb21tYW5kOiBbJ1Rvb2xzL1NjcmlwdHMvcnVuLWxhdW5jaGVyJywgJy0tcmVsZWFz ZScsICctLWVmbCcsICdmaWxlOi8vdGVzdC5odG1sJ10sIGN3ZD0vbW9jay1jaGVja291dFxuIgor ICAgICAgICBleHBlY3RlZF9sb2dzID0gIk1PQ0sgcnVuX2NvbW1hbmQ6IFsnVG9vbHMvU2NyaXB0 cy9ydW4tbWluaWJyb3dzZXInLCAnLS1yZWxlYXNlJywgJy0tZWZsJywgJ2ZpbGU6Ly90ZXN0Lmh0 bWwnXSwgY3dkPS9tb2NrLWNoZWNrb3V0XG4iCiAgICAgICAgIE91dHB1dENhcHR1cmUoKS5hc3Nl cnRfb3V0cHV0cyhzZWxmLCBwb3J0LnNob3dfcmVzdWx0c19odG1sX2ZpbGUsIFsidGVzdC5odG1s Il0sIGV4cGVjdGVkX2xvZ3M9ZXhwZWN0ZWRfbG9ncykKIAogICAgIGRlZiB0ZXN0X2dldF9jcmFz aF9sb2coc2VsZik6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZ3Rr LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0ay5weQppbmRleCBhZDQ1MWJlNGIz YWQ2MGRjODZiNjlmNjk1ZWMyNDdkNWY4ZDU5NWVkLi4zN2MwNjdlZTcwMDZkZTQ0NTlkOGViZTli N2EwYzgxYTkxMDY1MTIxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv Z3RrLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9ndGsucHkKQEAgLTE5OCwx MyArMTk4LDggQEAgY2xhc3MgR3RrUG9ydChQb3J0KToKICAgICAgICAgICAgIHJldHVybgogICAg ICAgICBzZWxmLl9sZWFrZGV0ZWN0b3IucGFyc2VfYW5kX3ByaW50X2xlYWtzX2RldGFpbChsZWFr c19maWxlcykKIAotICAgICMgRklYTUU6IFdlIHNob3VsZCBmaW5kIGEgd2F5IHRvIHNoYXJlIHRo aXMgaW1wbG1lbnRhdGlvbiB3aXRoIEd0aywKLSAgICAjIG9yIHRlYWNoIHJ1bi1sYXVuY2hlciBo b3cgdG8gY2FsbCBydW4tc2FmYXJpIGFuZCBtb3ZlIHRoaXMgZG93biB0byBQb3J0LgogICAgIGRl ZiBzaG93X3Jlc3VsdHNfaHRtbF9maWxlKHNlbGYsIHJlc3VsdHNfZmlsZW5hbWUpOgotICAgICAg ICBydW5fbGF1bmNoZXJfYXJncyA9IFsiZmlsZTovLyVzIiAlIHJlc3VsdHNfZmlsZW5hbWVdCi0g ICAgICAgICMgRklYTUU6IG9sZC1ydW4td2Via2l0LXRlc3RzIGFsc28gYWRkZWQgWyItZ3JhcGhp Y3NzeXN0ZW0iLCAicmFzdGVyIiwgIi1zdHlsZSIsICJ3aW5kb3dzIl0KLSAgICAgICAgIyBGSVhN RTogb2xkLXJ1bi13ZWJraXQtdGVzdHMgY29udmVydGVkIHJlc3VsdHNfZmlsZW5hbWUgcGF0aCBm b3IgY3lnd2luLgotICAgICAgICBzZWxmLl9ydW5fc2NyaXB0KCJydW4tbGF1bmNoZXIiLCBydW5f bGF1bmNoZXJfYXJncykKKyAgICAgICAgc2VsZi5fcnVuX3NjcmlwdCgicnVuLW1pbmlicm93c2Vy IiwgWyJmaWxlOi8vJXMiICUgcmVzdWx0c19maWxlbmFtZV0pCiAKICAgICBkZWYgY2hlY2tfc3lz X2RlcHMoc2VsZiwgbmVlZHNfaHR0cCk6CiAgICAgICAgIHJldHVybiBzdXBlcihHdGtQb3J0LCBz ZWxmKS5jaGVja19zeXNfZGVwcyhuZWVkc19odHRwKSBhbmQgc2VsZi5fZHJpdmVyX2NsYXNzKCku Y2hlY2tfZHJpdmVyKHNlbGYpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvZ3RrX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0a191bml0 dGVzdC5weQppbmRleCA3ODViN2IxNjQ5MTRmNGVkYjQ1YTA2MGZkZTBlNzJjY2NmZDMxZTczLi40 MWYyNDYwNDA3ZGZhOTY0YjExZWVlOGRkMTE0MDdkNWQyYmI5NThiIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZ3RrX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC9ndGtfdW5pdHRlc3QucHkKQEAgLTY0LDcgKzY0LDcgQEAgY2xhc3Mg R3RrUG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgIGRlZiB0ZXN0X3No b3dfcmVzdWx0c19odG1sX2ZpbGUoc2VsZik6CiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9y dCgpCiAgICAgICAgIHBvcnQuX2V4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUoc2hvdWxkX2xvZz1U cnVlKQotICAgICAgICBleHBlY3RlZF9sb2dzID0gIk1PQ0sgcnVuX2NvbW1hbmQ6IFsnVG9vbHMv U2NyaXB0cy9ydW4tbGF1bmNoZXInLCAnLS1yZWxlYXNlJywgJy0tZ3RrJywgJ2ZpbGU6Ly90ZXN0 Lmh0bWwnXSwgY3dkPS9tb2NrLWNoZWNrb3V0XG4iCisgICAgICAgIGV4cGVjdGVkX2xvZ3MgPSAi TU9DSyBydW5fY29tbWFuZDogWydUb29scy9TY3JpcHRzL3J1bi1taW5pYnJvd3NlcicsICctLXJl bGVhc2UnLCAnLS1ndGsnLCAnZmlsZTovL3Rlc3QuaHRtbCddLCBjd2Q9L21vY2stY2hlY2tvdXRc biIKICAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHBvcnQuc2hv d19yZXN1bHRzX2h0bWxfZmlsZSwgWyJ0ZXN0Lmh0bWwiXSwgZXhwZWN0ZWRfbG9ncz1leHBlY3Rl ZF9sb2dzKQogCiAgICAgZGVmIHRlc3RfZGVmYXVsdF90aW1lb3V0X21zKHNlbGYpOgo=