168036 2017-02-08 21:13:02 -0800 [GTK] ImageDiff should be run by jhbuild-wrapper in case of using jhbuild 2017-04-25 09:10:11 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=171268 P2 Normal --- 1 fujii clopez bugs-noreply buildbot clopez glenn lforschler mcatanzaro rego svillar oldest_to_newest 1274743 0 fujii 2017-02-08 21:13:02 -0800 [GTK][EFL] nrwt: ImageDiff should be run by jhbuild-wrapper in case of using jhbuild 1274748 1 fujii 2017-02-08 21:28:12 -0800 After installing EFL libs in my system, it works. > sudo apt-get install libevas1 libecore1 libecore-evas1 Closed as INVALID. 1290456 2 svillar 2017-03-23 08:55:58 -0700 I'm reopening this because I think the report is correct. I do also think that we should use jhbuild-wrapper because, among other things, ImageDiff links against a lot of things we build inside our jhbuild: cairo, libicu, gtk, pango, cairo... It has been working because I did also have libicu55 in my system, but as soon as Debian unstable moved to libicu57 the problem arose. We want ImageDiff to also use the same versions of cairo,gtk,pango... than webkit in order to provide a reliable testing platform. 1300790 3 mcatanzaro 2017-04-24 18:41:57 -0700 *** Bug 171255 has been marked as a duplicate of this bug. *** 1300847 4 308050 clopez 2017-04-24 19:56:45 -0700 Created attachment 308050 Patch 1300859 5 308050 mcatanzaro 2017-04-24 20:18:57 -0700 Comment on attachment 308050 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=308050&action=review Excellent! Nice tests. > Tools/Scripts/webkitpy/port/base_unittest.py:402 > + port._filesystem.maybe_make_directory(port.path_from_webkit_base('WebKitBuild', 'Dependencies%s' % port.port_name.upper())) Nit: is there a non-maybe version of this function? If not, you should add one. It doesn't make sense to say "maybe" here when we want to assert that the path definitely does not already exist. > Tools/Scripts/webkitpy/port/port_testcase.py:274 > + port._filesystem.maybe_make_directory(port.path_from_webkit_base('WebKitBuild', 'Dependencies%s' % port.port_name.upper())) Ditto. 1300963 6 clopez 2017-04-25 03:46:06 -0700 (In reply to Michael Catanzaro from comment #5) > Comment on attachment 308050 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=308050&action=review > > Excellent! Nice tests. > Thanks for the review. > > Tools/Scripts/webkitpy/port/base_unittest.py:402 > > + port._filesystem.maybe_make_directory(port.path_from_webkit_base('WebKitBuild', 'Dependencies%s' % port.port_name.upper())) > > Nit: is there a non-maybe version of this function? If not, you should add > one. It doesn't make sense to say "maybe" here when we want to assert that > the path definitely does not already exist. > No, there isn't anyone. Also the function will always create the virtual directory. I guess it was named "maybe", because the function only creates it if its not already created. In this sense I think it behaves exactly like "mkdir -p". I also think is a bad name. But changing that name is out of the scope of this patch. I have opened bug 171268 for requesting that rename to be done, and I'll land this patch as is. 1300964 7 308050 clopez 2017-04-25 03:48:37 -0700 Comment on attachment 308050 Patch Clearing flags on attachment: 308050 Committed r215727: <http://trac.webkit.org/changeset/215727> 1300965 8 clopez 2017-04-25 03:48:41 -0700 All reviewed patches have been landed. Closing bug. 1301050 9 clopez 2017-04-25 09:10:11 -0700 Committed r215735: <http://trac.webkit.org/changeset/215735> 308050 2017-04-24 19:56:45 -0700 2017-04-25 03:48:37 -0700 Patch bug-168036-20170425045642.patch text/plain 10833 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1NzE1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjhlNWZkMzlhY2Y5NDA1ZmVmOTMwMTNlNjY0ODJiYzY4 YTcwZTQ5Yi4uNzk5MzhkMjY3NjMwMzM1ZTgyYzFhNjI5NDhlMDdmMTBjNWNjN2YyMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDE3LTA0LTI0ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEtdIEltYWdlRGlmZiBzaG91bGQgYmUgcnVuIGJ5IGpoYnVp bGQtd3JhcHBlciBpbiBjYXNlIG9mIHVzaW5nIGpoYnVpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2ODAzNgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENhbGwgSW1hZ2VEaWZmIHdpdGggdGhlIEpIQnVp bGQgd3JhcHBlciBpZiB3ZSBzaG91bGQgdXNlIGl0LgorICAgICAgICBBbHNvIGFkZCBzb21lIHVu aXQgdGVzdHMgZm9yIHRoZSBKSEJ1aWxkIHdyYXBwZXIgZmVhdHVyZS4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5fc2hvdWxkX3VzZV9q aGJ1aWxkKTogVXNlIHNlbGYuX2ZpbGVzeXN0ZW0gaW5zdGVhZCBvZiBvcy5wYXRoIHRvIGFsbG93 IG1vY2sgdGVzdGluZy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZV91bml0 dGVzdC5weToKKyAgICAgICAgKHRlc3RfamhidWlsZF93cmFwcGVyKTogQWRkIGEgdGVzdCBmb3Ig cG9ydC5fc2hvdWxkX3VzZV9qaGJ1aWxkKCkKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Bv cnQvaW1hZ2VfZGlmZi5weToKKyAgICAgICAgKEltYWdlRGlmZmVyLl9zdGFydCk6IFRoZSBhY3R1 YWwgZml4LCB1c2UgdGhlIHdyYXBwZXIgaWYgd2Ugc2hvdWxkLgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvcG9ydC9pbWFnZV9kaWZmX3VuaXR0ZXN0LnB5OiBSZW1vdmVkLiBUaGlzIHR3byB0 ZXN0cyBhcmUgbm93IGludGVncmF0ZWQgaW4gcG9ydF90ZXN0Y2FzZQorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5OgorICAgICAgICAoUG9ydFRlc3RDYXNl KToKKyAgICAgICAgKFBvcnRUZXN0Q2FzZS50ZXN0X2RpZmZfaW1hZ2UpOiBUZXN0IHRoZSBjb21t YW5kIHdpdGggd3JhcHBlciBhbmQgd2l0aG91dCBpdC4KKyAgICAgICAgKFBvcnRUZXN0Q2FzZS50 ZXN0X2RpZmZfaW1hZ2VfcGFzc2VkKTogTW92ZWQgZnJvbSBpbWFnZV9kaWZmX3VuaXR0ZXN0LnB5 CisgICAgICAgIChQb3J0VGVzdENhc2UudGVzdF9kaWZmX2ltYWdlX2ZhaWxlZCk6IE1vdmVkIGZy b20gaW1hZ2VfZGlmZl91bml0dGVzdC5weQorCiAyMDE3LTA0LTI0ICBXZW5zb24gSHNpZWggIDx3 ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFJlc3BlY3QgZmlkZWxpdHkgb3JkZXIg d2hlbiByZWFkaW5nIHdlYiBjb250ZW50IGZyb20gaXRlbSBwcm92aWRlcnMKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2Jhc2UucHkKaW5kZXggZDRhNDkwNDFiODRhNjA0Nzk1NDI1ZWI3NmVmOTFmYjdh NDRiNWMxOS4uMTEzYjVkZWM4MjQzNTBlODEyZGI1MjhhYWYwZDU2Yzc5NGE4ZGMzMyAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKQEAgLTEzODUsNyArMTM4NSw3IEBAIGNsYXNzIFBv cnQob2JqZWN0KToKICAgICAgICAgc3VmZml4ID0gIiIKICAgICAgICAgaWYgc2VsZi5wb3J0X25h bWU6CiAgICAgICAgICAgICBzdWZmaXggPSBzZWxmLnBvcnRfbmFtZS51cHBlcigpCi0gICAgICAg IHJldHVybiBvcy5wYXRoLmV4aXN0cyhzZWxmLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgnV2ViS2l0 QnVpbGQnLCAnRGVwZW5kZW5jaWVzJXMnICUgc3VmZml4KSkKKyAgICAgICAgcmV0dXJuIHNlbGYu X2ZpbGVzeXN0ZW0uZXhpc3RzKHNlbGYucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCdXZWJLaXRCdWls ZCcsICdEZXBlbmRlbmNpZXMlcycgJSBzdWZmaXgpKQogCiAgICAgIyBGSVhNRTogRXZlbnR1YWxs eSB3ZSBzaG91bGQgc3RhbmRhcml6ZSBwb3J0IG5hbWluZywgYW5kIG1ha2UgdGhpcyBtZXRob2Qg c21hcnQgZW5vdWdoCiAgICAgIyB0byB1c2UgZm9yIGFsbCBwb3J0IGNvbmZpZ3VyYXRpb25zIChp bmNsdWRpbmcgYXJjaGl0ZWN0dXJlcywgZ3JhcGhpY3MgdHlwZXMsIGV0YykuCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZV91bml0dGVzdC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5CmluZGV4IDAwODAwNzk1NmM1OGIx NTQ5ZGZiZjU3YjY1NTU0NTU5MDRjZjk5ZWIuLmIxZTMyNzQ5Y2IzMDYwZDQwODU1MmFlZjUzYzFj MWRjOGQwMWM2NmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNl X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlX3VuaXR0 ZXN0LnB5CkBAIC0zOTUsNiArMzk1LDEzIEBAIGNsYXNzIFBvcnRUZXN0KHVuaXR0ZXN0LlRlc3RD YXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQuaXNfdzNjX3Jlc291cmNlX2ZpbGUo cG9ydC5ob3N0LmZpbGVzeXN0ZW0sIHBvcnQubGF5b3V0X3Rlc3RzX2RpcigpICsgIi9pbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL1hNTEh0dHBSZXF1ZXN0IiwgInhtbGh0dHByZXF1ZXN0 LXN5bmMtYmxvY2stZGVmZXItc2NyaXB0cy1zdWJmcmFtZS5odG1sIikpCiAgICAgICAgIHNlbGYu YXNzZXJ0VHJ1ZShwb3J0LmlzX3czY19yZXNvdXJjZV9maWxlKHBvcnQuaG9zdC5maWxlc3lzdGVt LCBwb3J0LmxheW91dF90ZXN0c19kaXIoKSArICIvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9kb20vbm9kZXMvRG9jdW1lbnQtY3JlYXRlRWxlbWVudC1uYW1lc3BhY2UtdGVzdHMiLCAi dGVzdC5odG1sIikpCiAKKyAgICBkZWYgdGVzdF9qaGJ1aWxkX3dyYXBwZXIoc2VsZik6CisgICAg ICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChwb3J0X25hbWU9J2ZvbycpCisgICAgICAgIHBvcnQu cG9ydF9uYW1lID0gJ2ZvbycKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShwb3J0Ll9zaG91bGRf dXNlX2poYnVpbGQoKSkKKyAgICAgICAgcG9ydC5fZmlsZXN5c3RlbS5tYXliZV9tYWtlX2RpcmVj dG9yeShwb3J0LnBhdGhfZnJvbV93ZWJraXRfYmFzZSgnV2ViS2l0QnVpbGQnLCAnRGVwZW5kZW5j aWVzJXMnICUgcG9ydC5wb3J0X25hbWUudXBwZXIoKSkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1 ZShwb3J0Ll9zaG91bGRfdXNlX2poYnVpbGQoKSkKKwogY2xhc3MgTmF0dXJhbENvbXBhcmVUZXN0 KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgc2V0VXAoc2VsZik6CiAgICAgICAgIHNlbGYu X3BvcnQgPSBUZXN0UG9ydChNb2NrU3lzdGVtSG9zdCgpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L2ltYWdlX2RpZmYucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvaW1hZ2VfZGlmZi5weQppbmRleCA4MTllZGU0NGFiYWFiM2NjYTY5NjA4YTJiZDRhNDQ3 M2Q5YWY3MmMxLi45ZjlhY2VjNTNjZDIwZjRiYzY3ZmQzZDE1YjA5NWZiNjhhYjIyYWMwIDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW1hZ2VfZGlmZi5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW1hZ2VfZGlmZi5weQpAQCAtNjYsNiArNjYsOCBA QCBjbGFzcyBJbWFnZURpZmZlcihvYmplY3QpOgogCiAgICAgZGVmIF9zdGFydChzZWxmLCB0b2xl cmFuY2UpOgogICAgICAgICBjb21tYW5kID0gW3NlbGYuX3BvcnQuX3BhdGhfdG9faW1hZ2VfZGlm ZigpLCAnLS10b2xlcmFuY2UnLCBzdHIodG9sZXJhbmNlKV0KKyAgICAgICAgaWYgc2VsZi5fcG9y dC5fc2hvdWxkX3VzZV9qaGJ1aWxkKCk6CisgICAgICAgICAgICBjb21tYW5kID0gc2VsZi5fcG9y dC5famhidWlsZF93cmFwcGVyICsgY29tbWFuZAogICAgICAgICBlbnZpcm9ubWVudCA9IHNlbGYu X3BvcnQuc2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyKCdJbWFnZURpZmYnKQogICAgICAgICBzZWxm Ll9wcm9jZXNzID0gc2VsZi5fcG9ydC5fc2VydmVyX3Byb2Nlc3NfY29uc3RydWN0b3Ioc2VsZi5f cG9ydCwgJ0ltYWdlRGlmZicsIGNvbW1hbmQsIGVudmlyb25tZW50KQogICAgICAgICBzZWxmLl9w cm9jZXNzLnN0YXJ0KCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9p bWFnZV9kaWZmX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ltYWdl X2RpZmZfdW5pdHRlc3QucHkKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDI5MmQwNTI0 NjJiZTE2MmFiMTA0ZmU3N2NiZWQ1OGY0ZmRlOTNkMWQuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ltYWdl X2RpZmZfdW5pdHRlc3QucHkKKysrIC9kZXYvbnVsbApAQCAtMSw1NyArMCwwIEBACi0jIENvcHly aWdodCAoQykgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotIwotIyBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKLSMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZv bGxvd2luZyBjb25kaXRpb25zIGFyZQotIyBtZXQ6Ci0jCi0jICAgICogUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSMgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgot IyAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUg YWJvdmUKLSMgY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRo ZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgotIyBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3Ro ZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCi0jIGRpc3RyaWJ1dGlvbi4KLSMgICAgKiBO ZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCi0jIGNv bnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVy aXZlZCBmcm9tCi0jIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVu IHBlcm1pc3Npb24uCi0jCi0jIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlS SUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKLSMgIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1Mg T1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKLSMgTElNSVRFRCBUTywg VEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9S Ci0jIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFM TCBUSEUgQ09QWVJJR0hUCi0jIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFO WSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAotIyBTUEVDSUFMLCBFWEVNUExBUlksIE9S IENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCi0jIExJTUlURUQgVE8s IFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNF LAotIyBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIg Q0FVU0VEIEFORCBPTiBBTlkKLSMgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05U UkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAotIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0Ug T1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKLSMgT0YgVEhJ UyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KLQotIiIiVW5pdCB0ZXN0aW5nIGJhc2UgY2xhc3MgZm9yIFBvcnQgaW1wbGVtZW50YXRp b25zLiIiIgotCi1pbXBvcnQgdW5pdHRlc3QKLQotZnJvbSB3ZWJraXRweS5wb3J0LnNlcnZlcl9w cm9jZXNzX21vY2sgaW1wb3J0IE1vY2tTZXJ2ZXJQcm9jZXNzCi1mcm9tIHdlYmtpdHB5LnBvcnQu aW1hZ2VfZGlmZiBpbXBvcnQgSW1hZ2VEaWZmZXIKLQotCi1jbGFzcyBGYWtlUG9ydChvYmplY3Qp OgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBzZXJ2ZXJfcHJvY2Vzc19vdXRwdXQpOgotICAgICAg ICBzZWxmLl9zZXJ2ZXJfcHJvY2Vzc19jb25zdHJ1Y3RvciA9IGxhbWJkYSBwb3J0LCBubSwgY21k LCBlbnY6IE1vY2tTZXJ2ZXJQcm9jZXNzKGxpbmVzPXNlcnZlcl9wcm9jZXNzX291dHB1dCkKLQot ICAgIGRlZiBfcGF0aF90b19pbWFnZV9kaWZmKHNlbGYpOgotICAgICAgICByZXR1cm4gJycKLQot ICAgIGRlZiBzZXR1cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIoc2VsZiwgbm0pOgotICAgICAgICByZXR1 cm4gTm9uZQotCi0KLWNsYXNzIFRlc3RJbWFnZURpZmZlcih1bml0dGVzdC5UZXN0Q2FzZSk6Ci0g ICAgZGVmIHRlc3RfZGlmZl9pbWFnZV9mYWlsZWQoc2VsZik6Ci0gICAgICAgIHBvcnQgPSBGYWtl UG9ydChbJ2RpZmY6IDEwMCUgZmFpbGVkXG4nXSkKLSAgICAgICAgaW1hZ2VfZGlmZmVyID0gSW1h Z2VEaWZmZXIocG9ydCkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChpbWFnZV9kaWZmZXIuZGlm Zl9pbWFnZSgnZm9vJywgJ2JhcicsIDAuMSksICgnJywgMTAwLjAsIE5vbmUpKQotCi0gICAgZGVm IHRlc3RfZGlmZl9pbWFnZV9wYXNzZWQoc2VsZik6Ci0gICAgICAgIHBvcnQgPSBGYWtlUG9ydChb J2RpZmY6IDAlIHBhc3NlZFxuJ10pCi0gICAgICAgIGltYWdlX2RpZmZlciA9IEltYWdlRGlmZmVy KHBvcnQpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoaW1hZ2VfZGlmZmVyLmRpZmZfaW1hZ2Uo J2ZvbycsICdiYXInLCAwLjEpLCAoTm9uZSwgMCwgTm9uZSkpCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvcG9ydF90ZXN0Y2FzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5CmluZGV4IDNlMzUzNzlmODU1NmNiZDg1OGVmNjhi YTJmZmE2NTg1ZDUwYmZkZGMuLjQ2M2VhYjgzODIxMDMyMDYyYjY3MGFmOTQwODkwMmE0OGI5NWM4 ZWEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9wb3J0X3Rlc3RjYXNl LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5CkBA IC00Miw2ICs0Miw3IEBAIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5maWxlc3lzdGVtX21v Y2sgaW1wb3J0IE1vY2tGaWxlU3lzdGVtCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0ub3V0 cHV0Y2FwdHVyZSBpbXBvcnQgT3V0cHV0Q2FwdHVyZQogZnJvbSB3ZWJraXRweS5jb21tb24uc3lz dGVtLnN5c3RlbWhvc3RfbW9jayBpbXBvcnQgTW9ja1N5c3RlbUhvc3QKIGZyb20gd2Via2l0cHku cG9ydC5iYXNlIGltcG9ydCBQb3J0Citmcm9tIHdlYmtpdHB5LnBvcnQuaW1hZ2VfZGlmZiBpbXBv cnQgSW1hZ2VEaWZmZXIKIGZyb20gd2Via2l0cHkucG9ydC5zZXJ2ZXJfcHJvY2Vzc19tb2NrIGlt cG9ydCBNb2NrU2VydmVyUHJvY2VzcwogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMuc2VydmVy cyBpbXBvcnQgaHR0cF9zZXJ2ZXJfYmFzZQogZnJvbSB3ZWJraXRweS50b29sLm1vY2t0b29sIGlt cG9ydCBNb2NrT3B0aW9ucwpAQCAtMjU4LDE5ICsyNTksNDQgQEAgY2xhc3MgUG9ydFRlc3RDYXNl KHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogICAgICAgICBwb3J0Ll9zZXJ2ZXJfcHJvY2Vzc19jb25z dHJ1Y3RvciA9IG1ha2VfcHJvYwogICAgICAgICBwb3J0LnNldHVwX3Rlc3RfcnVuKCkKLSAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LmRpZmZfaW1hZ2UoJ2ZvbycsICdiYXInKSwgKCcnLCAx MDAuMCwgTm9uZSkpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5wcm9jLmNtZFsxOjNd LCBbIi0tdG9sZXJhbmNlIiwgIjAuMSJdKQogCisgICAgICAgICMgRmlyc3QgdGVzdCB0aGUgY2Fz ZSBvZiBub3QgdXNpbmcgdGhlIEpIQnVpbGQgd3JhcHBlci4KKyAgICAgICAgc2VsZi5hc3NlcnRG YWxzZShwb3J0Ll9zaG91bGRfdXNlX2poYnVpbGQoKSkKKworICAgICAgICBzZWxmLmFzc2VydEVx dWFsKHBvcnQuZGlmZl9pbWFnZSgnZm9vJywgJ2JhcicpLCAoJycsIDEwMC4wLCBOb25lKSkKKyAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLnByb2MuY21kLCBbcG9ydC5fcGF0aF90b19pbWFn ZV9kaWZmKCksICItLXRvbGVyYW5jZSIsICIwLjEiXSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChwb3J0LmRpZmZfaW1hZ2UoJ2ZvbycsICdiYXInLCBOb25lKSwgKCcnLCAxMDAuMCwgTm9uZSkp Ci0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5wcm9jLmNtZFsxOjNdLCBbIi0tdG9sZXJh bmNlIiwgIjAuMSJdKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYucHJvYy5jbWQsIFtw b3J0Ll9wYXRoX3RvX2ltYWdlX2RpZmYoKSwgIi0tdG9sZXJhbmNlIiwgIjAuMSJdKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuZGlmZl9pbWFnZSgnZm9vJywgJ2JhcicsIDApLCAoJycs IDEwMC4wLCBOb25lKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLnByb2MuY21kLCBb cG9ydC5fcGF0aF90b19pbWFnZV9kaWZmKCksICItLXRvbGVyYW5jZSIsICIwIl0pCisKKyAgICAg ICAgIyBOb3cgdGVzdCB0aGUgY2FzZSBvZiB1c2luZyBKSEJ1aWxkIHdyYXBwZXIuCisgICAgICAg IHBvcnQuX2ZpbGVzeXN0ZW0ubWF5YmVfbWFrZV9kaXJlY3RvcnkocG9ydC5wYXRoX2Zyb21fd2Vi a2l0X2Jhc2UoJ1dlYktpdEJ1aWxkJywgJ0RlcGVuZGVuY2llcyVzJyAlIHBvcnQucG9ydF9uYW1l LnVwcGVyKCkpKQorICAgICAgICBzZWxmLmFzc2VydFRydWUocG9ydC5fc2hvdWxkX3VzZV9qaGJ1 aWxkKCkpCiAKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LmRpZmZfaW1hZ2UoJ2Zvbycs ICdiYXInKSwgKCcnLCAxMDAuMCwgTm9uZSkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2Vs Zi5wcm9jLmNtZCwgcG9ydC5famhidWlsZF93cmFwcGVyICsgW3BvcnQuX3BhdGhfdG9faW1hZ2Vf ZGlmZigpLCAiLS10b2xlcmFuY2UiLCAiMC4xIl0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo cG9ydC5kaWZmX2ltYWdlKCdmb28nLCAnYmFyJywgTm9uZSksICgnJywgMTAwLjAsIE5vbmUpKQor ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYucHJvYy5jbWQsIHBvcnQuX2poYnVpbGRfd3Jh cHBlciArIFtwb3J0Ll9wYXRoX3RvX2ltYWdlX2RpZmYoKSwgIi0tdG9sZXJhbmNlIiwgIjAuMSJd KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuZGlmZl9pbWFnZSgnZm9vJywgJ2Jhcics IDApLCAoJycsIDEwMC4wLCBOb25lKSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLnBy b2MuY21kWzE6M10sIFsiLS10b2xlcmFuY2UiLCAiMCJdKQorICAgICAgICBzZWxmLmFzc2VydEVx dWFsKHNlbGYucHJvYy5jbWQsIHBvcnQuX2poYnVpbGRfd3JhcHBlciArIFtwb3J0Ll9wYXRoX3Rv X2ltYWdlX2RpZmYoKSwgIi0tdG9sZXJhbmNlIiwgIjAiXSkKIAogICAgICAgICBwb3J0LmNsZWFu X3VwX3Rlc3RfcnVuKCkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHNlbGYucHJvYy5zdG9wcGVk KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuX2ltYWdlX2RpZmZlciwgTm9uZSkKIAor ICAgIGRlZiB0ZXN0X2RpZmZfaW1hZ2VfcGFzc2VkKHNlbGYpOgorICAgICAgICBwb3J0ID0gc2Vs Zi5tYWtlX3BvcnQoKQorICAgICAgICBwb3J0Ll9zZXJ2ZXJfcHJvY2Vzc19jb25zdHJ1Y3RvciA9 IGxhbWJkYSBwb3J0LCBubSwgY21kLCBlbnY6IE1vY2tTZXJ2ZXJQcm9jZXNzKGxpbmVzPVsnZGlm ZjogMCUgcGFzc2VkXG4nXSkKKyAgICAgICAgaW1hZ2VfZGlmZmVyID0gSW1hZ2VEaWZmZXIocG9y dCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChpbWFnZV9kaWZmZXIuZGlmZl9pbWFnZSgnZm9v JywgJ2JhcicsIDAuMSksIChOb25lLCAwLCBOb25lKSkKKworICAgIGRlZiB0ZXN0X2RpZmZfaW1h Z2VfZmFpbGVkKHNlbGYpOgorICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQorICAgICAg ICBwb3J0Ll9zZXJ2ZXJfcHJvY2Vzc19jb25zdHJ1Y3RvciA9IGxhbWJkYSBwb3J0LCBubSwgY21k LCBlbnY6IE1vY2tTZXJ2ZXJQcm9jZXNzKGxpbmVzPVsnZGlmZjogMTAwJSBmYWlsZWRcbiddKQor ICAgICAgICBpbWFnZV9kaWZmZXIgPSBJbWFnZURpZmZlcihwb3J0KQorICAgICAgICBzZWxmLmFz c2VydEVxdWFsKGltYWdlX2RpZmZlci5kaWZmX2ltYWdlKCdmb28nLCAnYmFyJywgMC4xKSwgKCcn LCAxMDAuMCwgTm9uZSkpCisKICAgICBkZWYgdGVzdF9kaWZmX2ltYWdlX2NyYXNoZWQoc2VsZik6 CiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCiAgICAgICAgIHNlbGYucHJvYyA9IE5v bmUK