101140 2012-11-02 19:27:35 -0700 webkitpy: clean up options for specifying multiple platforms at once 2012-11-05 11:24:57 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric ojan oldest_to_newest 757853 0 dpranke 2012-11-02 19:27:35 -0700 webkitpy: clean up options for specifying multiple platforms at once 757854 1 172194 dpranke 2012-11-02 19:29:21 -0700 Created attachment 172194 Patch 757896 2 172194 ojan 2012-11-02 22:19:56 -0700 Comment on attachment 172194 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172194&action=review > Tools/Scripts/webkitpy/layout_tests/port/factory.py:39 > +def platform_options(globs=False): This variable name doesn't read like a boolean. It confused me at first reading the code. How about "allow_globs" or "use_globs"? > Tools/Scripts/webkitpy/layout_tests/port/factory.py:44 > + const=('chromium' if globs else 'chromium'), I think you're missing a *. > Tools/Scripts/webkitpy/layout_tests/port/factory.py:138 > + If platform is specified, we will glob-match all ports""" Missing a "not"? > Tools/Scripts/webkitpy/tool/commands/rebaseline.py:-356 > - return super(RebaselineJson, self).__init__(options=[ lol whoops 758674 3 dpranke 2012-11-05 10:35:22 -0800 (In reply to comment #2) > (From update of attachment 172194 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=172194&action=review > > > Tools/Scripts/webkitpy/layout_tests/port/factory.py:39 > > +def platform_options(globs=False): > > This variable name doesn't read like a boolean. It confused me at first reading the code. How about "allow_globs" or "use_globs"? > Makes sense. > > Tools/Scripts/webkitpy/layout_tests/port/factory.py:44 > > + const=('chromium' if globs else 'chromium'), > > I think you're missing a *. > Good catch. > > Tools/Scripts/webkitpy/layout_tests/port/factory.py:138 > > + If platform is specified, we will glob-match all ports""" > > Missing a "not"? > Right. 758732 4 dpranke 2012-11-05 11:24:57 -0800 Committed r133507: <http://trac.webkit.org/changeset/133507> 172194 2012-11-02 19:29:21 -0700 2012-11-02 22:19:56 -0700 Patch bug-101140-20121102192740.patch text/plain 10398 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMzgyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTRiZTMzYjVmMTVmYmFkN2Y3NDVhYjU4NGMyNzg3NjQz ZWZiOWUxNy4uNGEwYjYxNTBlOTVhNWNiNTczNjNmZGM1ODcxZDNlZDkyYWQ5ZmU2MSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMz IEBACiAyMDEyLTExLTAyICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHdlYmtpdHB5OiBjbGVhbiB1cCBvcHRpb25zIGZvciBzcGVjaWZ5aW5nIG11bHRpcGxl IHBsYXRmb3JtcyBhdCBvbmNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMDExNDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIHBhdGNoIHJld29ya3MgaG93IHdlIGRpc3BsYXkgdGhlIGhlbHAgc3Ry aW5ncyBmb3IgLS1wbGF0Zm9ybQorICAgICAgICBvcHRpb25zIGFuZCBob3cgd2UgZmlsdGVyIG91 dCBwbGF0Zm9ybXMgbWF0Y2hpbmcgYSBnbG9iLiBUaGlzIHdpbGwKKyAgICAgICAgYmUgdXNlZnVs IGFzIEkgYWRkIHBhdGNoZXMgdG8gZW5zdXJlIHRoYXQgYWxsIHRoZSB3ZWJraXQtcGF0Y2gKKyAg ICAgICAgY29tbWFuZHMgYXJlIHVzaW5nIC0tcGxhdGZvcm0gY29uc2lzdGVudGx5IHRvIGZpbHRl ciBwb3J0cy4KKworICAgICAgICBUaGVyZSBzaG91bGQgYmUgbm8gZnVuY3Rpb25hbCBjaGFuZ2Vz IHJlc3VsdGluZyBmcm9tIHRoaXMgcGF0Y2guCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2ZhY3RvcnkucHk6CisgICAgICAgIChwbGF0Zm9ybV9vcHRpb25z KToKKyAgICAgICAgKFBvcnRGYWN0b3J5LmFsbF9wb3J0X25hbWVzKToKKyAgICAgICAgKFBvcnRG YWN0b3J5LmdldF9mcm9tX2J1aWxkZXJfbmFtZSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL3F1ZXJpZXMucHk6CisgICAgICAgIChQcmludEV4cGVjdGF0aW9ucy5f X2luaXRfXyk6CisgICAgICAgIChQcmludEJhc2VsaW5lcy5fX2luaXRfXyk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHk6CisgICAgICAgIChB YnN0cmFjdFJlYmFzZWxpbmluZ0NvbW1hbmQpOgorICAgICAgICAoUmViYXNlbGluZUpzb24uX19p bml0X18pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2Vs aW5lX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdFJlYmFzZWxpbmVFeHBlY3RhdGlvbnMuc2V0 VXApOgorICAgICAgICAoVGVzdFJlYmFzZWxpbmVFeHBlY3RhdGlvbnMudGVzdF9yZWJhc2VsaW5l X2V4cGVjdGF0aW9ucyk6CisKKzIwMTItMTEtMDIgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJv bWl1bS5vcmc+CisKICAgICAgICAgd2Via2l0LXBhdGNoIHJlYmFzZWxpbmUgaXMgYnJva2VuCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDEwODEKIApk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0 b3J5LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5 LnB5CmluZGV4IGY2ODE2NGVmMmYxZWJmY2ZhMzRhMWRjOTBmYjQxYjVlMzg3MzQzY2IuLjJlNDhi OTNhYTk5YzI0YmY2ODUwMTY2Nzc1NWZkYzZhNzVmYjBkODkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZmFjdG9yeS5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2ZhY3RvcnkucHkKQEAgLTI5LDI2ICsy OSwzMiBAQAogCiAiIiJGYWN0b3J5IG1ldGhvZCB0byByZXRyaWV2ZSB0aGUgYXBwcm9wcmlhdGUg cG9ydCBpbXBsZW1lbnRhdGlvbi4iIiIKIAoraW1wb3J0IGZubWF0Y2gKIGltcG9ydCBvcHRwYXJz ZQogaW1wb3J0IHJlCiAKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IGJ1 aWxkZXJzCiAKIAotZGVmIHBsYXRmb3JtX29wdGlvbnMoKipoZWxwX3N0cmluZ3MpOgorZGVmIHBs YXRmb3JtX29wdGlvbnMoZ2xvYnM9RmFsc2UpOgogICAgIHJldHVybiBbCiAgICAgICAgIG9wdHBh cnNlLm1ha2Vfb3B0aW9uKCctLXBsYXRmb3JtJywgYWN0aW9uPSdzdG9yZScsCi0gICAgICAgICAg ICBoZWxwPWhlbHBfc3RyaW5ncy5nZXQoJ3BsYXRmb3JtJywgJ1BsYXRmb3JtL1BvcnQgYmVpbmcg dGVzdGVkIChlLmcuLCAibWFjLWxpb24iKScpKSwKLSAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRp b24oJy0tY2hyb21pdW0nLCBhY3Rpb249J3N0b3JlX2NvbnN0JywgY29uc3Q9J2Nocm9taXVtJywg ZGVzdD0ncGxhdGZvcm0nLAotICAgICAgICAgICAgaGVscD0nQWxpYXMgZm9yIC0tcGxhdGZvcm09 Y2hyb21pdW0nKSwKLSAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oJy0tY2hyb21pdW0tYW5k cm9pZCcsIGFjdGlvbj0nc3RvcmVfY29uc3QnLCBjb25zdD0nY2hyb21pdW0tYW5kcm9pZCcsIGRl c3Q9J3BsYXRmb3JtJywKLSAgICAgICAgICAgIGhlbHA9J0FsaWFzIGZvciAtLXBsYXRmb3JtPWNo cm9taXVtLWFuZHJvaWQnKSwKLSAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oJy0tZWZsJywg YWN0aW9uPSdzdG9yZV9jb25zdCcsIGNvbnN0PSdlZmwnLCBkZXN0PSJwbGF0Zm9ybSIsCi0gICAg ICAgICAgICBoZWxwPSdBbGlhcyBmb3IgLS1wbGF0Zm9ybT1lZmwnKSwKLSAgICAgICAgb3B0cGFy c2UubWFrZV9vcHRpb24oJy0tZ3RrJywgYWN0aW9uPSdzdG9yZV9jb25zdCcsIGNvbnN0PSdndGsn LCBkZXN0PSJwbGF0Zm9ybSIsCi0gICAgICAgICAgICBoZWxwPSdBbGlhcyBmb3IgLS1wbGF0Zm9y bT1ndGsnKSwKLSAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oJy0tcXQnLCBhY3Rpb249J3N0 b3JlX2NvbnN0JywgY29uc3Q9J3F0JywgZGVzdD0icGxhdGZvcm0iLAotICAgICAgICAgICAgaGVs cD0nQWxpYXMgZm9yIC0tcGxhdGZvcm09cXQnKSwKKyAgICAgICAgICAgIGhlbHA9KCdHbG9iLXN0 eWxlIGxpc3Qgb2YgcGxhdGZvcm0vcG9ydHMgdG8gdXNlIChlLmcuLCAibWFjKiIpJyBpZiBnbG9i cyBlbHNlICdQbGF0Zm9ybSB0byB1c2UgKGUuZy4sICJtYWMtbGlvbiIpJykpLAorICAgICAgICBv cHRwYXJzZS5tYWtlX29wdGlvbignLS1jaHJvbWl1bScsIGFjdGlvbj0nc3RvcmVfY29uc3QnLCBk ZXN0PSdwbGF0Zm9ybScsCisgICAgICAgICAgICBjb25zdD0oJ2Nocm9taXVtJyBpZiBnbG9icyBl bHNlICdjaHJvbWl1bScpLAorICAgICAgICAgICAgaGVscD0oJ0FsaWFzIGZvciAtLXBsYXRmb3Jt PWNocm9taXVtKicgaWYgZ2xvYnMgZWxzZSAnQWxpYXMgZm9yIC0tcGxhdGZvcm09Y2hyb21pdW0n KSksCisgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCctLWNocm9taXVtLWFuZHJvaWQnLCBh Y3Rpb249J3N0b3JlX2NvbnN0JywgZGVzdD0ncGxhdGZvcm0nLAorICAgICAgICAgICAgY29uc3Q9 KCdjaHJvbWl1bS1hbmRyb2lkKicgaWYgZ2xvYnMgZWxzZSAnY2hyb21pdW0tYW5kcm9pZCcpLAor ICAgICAgICAgICAgaGVscD0oJ0FsaWFzIGZvciAtLXBsYXRmb3JtPWNocm9taXVtLWFuZHJvaWQq JyBpZiBnbG9icyBlbHNlICdBbGlhcyBmb3IgLS1wbGF0Zm9ybT1jaHJvbWl1bScpKSwKKyAgICAg ICAgb3B0cGFyc2UubWFrZV9vcHRpb24oJy0tZWZsJywgYWN0aW9uPSdzdG9yZV9jb25zdCcsIGRl c3Q9J3BsYXRmb3JtJywKKyAgICAgICAgICAgIGNvbnN0PSgnZWZsKicgaWYgZ2xvYnMgZWxzZSAn ZWZsJyksCisgICAgICAgICAgICBoZWxwPSgnQWxpYXMgZm9yIC0tcGxhdGZvcm09ZWZsKicgaWYg Z2xvYnMgZWxzZSAnQWxpYXMgZm9yIC0tcGxhdGZvcm09ZWZsJykpLAorICAgICAgICBvcHRwYXJz ZS5tYWtlX29wdGlvbignLS1ndGsnLCBhY3Rpb249J3N0b3JlX2NvbnN0JywgZGVzdD0ncGxhdGZv cm0nLAorICAgICAgICAgICAgY29uc3Q9KCdndGsqJyBpZiBnbG9icyBlbHNlICdndGsnKSwKKyAg ICAgICAgICAgIGhlbHA9KCdBbGlhcyBmb3IgLS1wbGF0Zm9ybT1ndGsqJyBpZiBnbG9icyBlbHNl ICdBbGlhcyBmb3IgLS1wbGF0Zm9ybT1ndGsnKSksCisgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0 aW9uKCctLXF0JywgYWN0aW9uPSdzdG9yZV9jb25zdCcsIGRlc3Q9InBsYXRmb3JtIiwKKyAgICAg ICAgICAgIGNvbnN0PSgncXQqJyBpZiBnbG9icyBlbHNlICdxdCcpLAorICAgICAgICAgICAgaGVs cD0oJ0FsaWFzIGZvciAtLXBsYXRmb3JtPXF0JyBpZiBnbG9icyBlbHNlICdBbGlhcyBmb3IgLS1w bGF0Zm9ybT1xdCcpKSwKICAgICAgICAgXQogCiAKQEAgLTEyMiwxOCArMTI4LDE4IEBAIGNsYXNz IFBvcnRGYWN0b3J5KG9iamVjdCk6CiAgICAgICAgICAgICAgICAgcmV0dXJuIGNscyhzZWxmLl9o b3N0LCBwb3J0X25hbWUsIG9wdGlvbnM9b3B0aW9ucywgKiprd2FyZ3MpCiAgICAgICAgIHJhaXNl IE5vdEltcGxlbWVudGVkRXJyb3IoJ3Vuc3VwcG9ydGVkIHBsYXRmb3JtOiAiJXMiJyAlIHBvcnRf bmFtZSkKIAotICAgIGRlZiBhbGxfcG9ydF9uYW1lcyhzZWxmKToKKyAgICBkZWYgYWxsX3BvcnRf bmFtZXMoc2VsZiwgcGxhdGZvcm09Tm9uZSk6CiAgICAgICAgICIiIlJldHVybiBhIGxpc3Qgb2Yg YWxsIHZhbGlkLCBmdWxseS1zcGVjaWZpZWQsICJyZWFsIiBwb3J0IG5hbWVzLgogCiAgICAgICAg IFRoaXMgaXMgdGhlIGxpc3Qgb2YgZGlyZWN0b3JpZXMgdGhhdCBhcmUgdXNlZCBhcyBhY3R1YWwg YmFzZWxpbmVfcGF0aHMoKQogICAgICAgICBieSByZWFsIHBvcnRzLiBUaGlzIGRvZXMgbm90IGlu Y2x1ZGUgYW55ICJmYWtlIiBuYW1lcyBsaWtlICJ0ZXN0IgotICAgICAgICBvciAibW9jay1tYWMi LCBhbmQgaXQgZG9lcyBub3QgaW5jbHVkZSBhbnkgZGlyZWN0b3JpZXMgdGhhdCBhcmUgbm90IC4i IiIKLSAgICAgICAgIyBGSVhNRTogVGhlcmUncyBwcm9iYWJseSBhIGJldHRlciB3YXkgdG8gZ2Vu ZXJhdGUgdGhpcyBsaXN0IC4uLgotICAgICAgICByZXR1cm4gYnVpbGRlcnMuYWxsX3BvcnRfbmFt ZXMoKQorICAgICAgICBvciAibW9jay1tYWMiLCBhbmQgaXQgZG9lcyBub3QgaW5jbHVkZSBhbnkg ZGlyZWN0b3JpZXMgdGhhdCBhcmUgbm90LgorCisgICAgICAgIElmIHBsYXRmb3JtIGlzIHNwZWNp ZmllZCwgd2Ugd2lsbCBnbG9iLW1hdGNoIGFsbCBwb3J0cyIiIgorICAgICAgICBwbGF0Zm9ybSA9 IHBsYXRmb3JtIG9yICcqJworICAgICAgICByZXR1cm4gZm5tYXRjaC5maWx0ZXIoYnVpbGRlcnMu YWxsX3BvcnRfbmFtZXMoKSwgcGxhdGZvcm0pCiAKICAgICBkZWYgZ2V0X2Zyb21fYnVpbGRlcl9u YW1lKHNlbGYsIGJ1aWxkZXJfbmFtZSk6CiAgICAgICAgIHBvcnRfbmFtZSA9IGJ1aWxkZXJzLnBv cnRfbmFtZV9mb3JfYnVpbGRlcl9uYW1lKGJ1aWxkZXJfbmFtZSkKLSAgICAgICAgYXNzZXJ0KHBv cnRfbmFtZSkgICMgTmVlZCB0byB1cGRhdGUgcG9ydF9uYW1lX2Zvcl9idWlsZGVyX25hbWUKLSAg ICAgICAgcG9ydCA9IHNlbGYuZ2V0KHBvcnRfbmFtZSwgX2J1aWxkZXJfb3B0aW9ucyhidWlsZGVy X25hbWUpKQotICAgICAgICBhc3NlcnQocG9ydCkgICMgTmVlZCB0byB1cGRhdGUgcG9ydF9uYW1l X2Zvcl9idWlsZGVyX25hbWUKLSAgICAgICAgcmV0dXJuIHBvcnQKKyAgICAgICAgYXNzZXJ0IHBv cnRfbmFtZSwgInVucmVjb2duaXplZCBidWlsZGVyIG5hbWUgJyVzJyIgJSBidWlsZGVyX25hbWUK KyAgICAgICAgcmV0dXJuIHNlbGYuZ2V0KHBvcnRfbmFtZSwgX2J1aWxkZXJfb3B0aW9ucyhidWls ZGVyX25hbWUpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1h bmRzL3F1ZXJpZXMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVl cmllcy5weQppbmRleCA5MTA4M2Y1ODVlYmYzOWNmMWZkZjc3YjViNmQ4ODhiYzM3ZmQ0MDExLi5i OWJlM2IxOTFkMTk3MDRmOWE4ODQzMmJjZTJiNGE0YzMyMWVhZjM3IDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVlcmllcy5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVlcmllcy5weQpAQCAtNDQwLDcgKzQ0MCw3 IEBAIGNsYXNzIFByaW50RXhwZWN0YXRpb25zKEFic3RyYWN0RGVjbGFyYXRpdmVDb21tYW5kKToK ICAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9J1ByaW50IGEgQ1NWLXN0eWxlIHJlcG9ydCB0 aGF0IGluY2x1ZGVzIHRoZSBwb3J0IG5hbWUsIG1vZGlmaWVycywgdGVzdHMsIGFuZCBleHBlY3Rh dGlvbnMnKSwKICAgICAgICAgICAgIG1ha2Vfb3B0aW9uKCctZicsICctLWZ1bGwnLCBhY3Rpb249 J3N0b3JlX3RydWUnLCBkZWZhdWx0PUZhbHNlLAogICAgICAgICAgICAgICAgICAgICAgICAgaGVs cD0nUHJpbnQgYSBmdWxsIFRlc3RFeHBlY3RhdGlvbnMtc3R5bGUgbGluZSBmb3IgZXZlcnkgbWF0 Y2gnKSwKLSAgICAgICAgXSArIHBsYXRmb3JtX29wdGlvbnMocGxhdGZvcm09J3BvcnQvcGxhdGZv cm0gdG8gdXNlLiBVc2UgZ2xvYi1zdHlsZSB3aWxkY2FyZHMgZm9yIG11bHRpcGxlIHBvcnRzIChp bXBsaWVzIC0tY3N2KScpICsgY29uZmlndXJhdGlvbl9vcHRpb25zKCkKKyAgICAgICAgXSArIHBs YXRmb3JtX29wdGlvbnMoZ2xvYnM9VHJ1ZSkKIAogICAgICAgICBBYnN0cmFjdERlY2xhcmF0aXZl Q29tbWFuZC5fX2luaXRfXyhzZWxmLCBvcHRpb25zPW9wdGlvbnMpCiAgICAgICAgIHNlbGYuX2V4 cGVjdGF0aW9uX21vZGVscyA9IHt9CkBAIC01MTksNyArNTE5LDcgQEAgY2xhc3MgUHJpbnRCYXNl bGluZXMoQWJzdHJhY3REZWNsYXJhdGl2ZUNvbW1hbmQpOgogICAgICAgICAgICAgICAgICAgICAg ICAgaGVscD0nUHJpbnQgYSBDU1Ytc3R5bGUgcmVwb3J0IHRoYXQgaW5jbHVkZXMgdGhlIHBvcnQg bmFtZSwgdGVzdF9uYW1lLCB0ZXN0IHBsYXRmb3JtLCBiYXNlbGluZSB0eXBlLCBiYXNlbGluZSBs b2NhdGlvbiwgYW5kIGJhc2VsaW5lIHBsYXRmb3JtJyksCiAgICAgICAgICAgICBtYWtlX29wdGlv bignLS1pbmNsdWRlLXZpcnR1YWwtdGVzdHMnLCBhY3Rpb249J3N0b3JlX3RydWUnLAogICAgICAg ICAgICAgICAgICAgICAgICAgaGVscD0nSW5jbHVkZSB2aXJ0dWFsIHRlc3RzJyksCi0gICAgICAg IF0gKyBwbGF0Zm9ybV9vcHRpb25zKHBsYXRmb3JtPSdwb3J0L3BsYXRmb3JtIHRvIHVzZS4gVXNl IGdsb2Itc3R5bGUgd2lsZGNhcmRzIGZvciBtdWx0aXBsZSBwb3J0cyAoaW1wbGllcyAtLWNzdikn KSArIGNvbmZpZ3VyYXRpb25fb3B0aW9ucygpCisgICAgICAgIF0gKyBwbGF0Zm9ybV9vcHRpb25z KGdsb2JzPVRydWUpCiAgICAgICAgIEFic3RyYWN0RGVjbGFyYXRpdmVDb21tYW5kLl9faW5pdF9f KHNlbGYsIG9wdGlvbnM9b3B0aW9ucykKICAgICAgICAgc2VsZi5fcGxhdGZvcm1fcmVnZXhwID0g cmUuY29tcGlsZSgncGxhdGZvcm0vKFteXC9dKykvKC4rKScpCiAKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHkKaW5kZXggZmMzMmJiMzI2 ZDNiZmU2ZWE1ZDY0MDNjN2NiN2ZkNjUxNmM5NTQ1ZC4uYjRmMjk2ZDRiM2EyYTI5MGFhNTNmMTdm ZDBjN2Y1ZTM5Y2I5MTYxOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L2NvbW1hbmRzL3JlYmFzZWxpbmUucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L2NvbW1hbmRzL3JlYmFzZWxpbmUucHkKQEAgLTY3LDcgKzY3LDcgQEAgY2xhc3MgQWJzdHJhY3RS ZWJhc2VsaW5pbmdDb21tYW5kKEFic3RyYWN0RGVjbGFyYXRpdmVDb21tYW5kKToKICAgICAgICAg aGVscD0oJ0RvIG5vdCBvcHRpbWl6ZS9kZS1kdXAgdGhlIGV4cGVjdGF0aW9ucyBhZnRlciByZWJh c2VsaW5pbmcgKGRlZmF1bHQgaXMgdG8gZGUtZHVwIGF1dG9tYXRpY2FsbHkpLiAnCiAgICAgICAg ICAgICAgICdZb3UgY2FuIHVzZSAid2Via2l0LXBhdGNoIG9wdGltaXplLWJhc2VsaW5lcyIgdG8g b3B0aW1pemUgc2VwYXJhdGVseS4nKSkKIAotICAgIHBsYXRmb3JtX29wdGlvbnMgPSBmYWN0b3J5 LnBsYXRmb3JtX29wdGlvbnMoKQorICAgIHBsYXRmb3JtX29wdGlvbnMgPSBmYWN0b3J5LnBsYXRm b3JtX29wdGlvbnMoZ2xvYnM9VHJ1ZSkKIAogICAgIHJlc3VsdHNfZGlyZWN0b3J5X29wdGlvbiA9 IG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLXJlc3VsdHMtZGlyZWN0b3J5IiwgaGVscD0iTG9jYWwg cmVzdWx0cyBkaXJlY3RvcnkgdG8gdXNlIikKIApAQCAtMzUzLDcgKzM1Myw3IEBAIGNsYXNzIFJl YmFzZWxpbmVKc29uKEFic3RyYWN0UGFyYWxsZWxSZWJhc2VsaW5lQ29tbWFuZCk6CiAgICAgaGVs cF90ZXh0ID0gIlJlYmFzZWxpbmUgYmFzZWQgb2ZmIEpTT04gcGFzc2VkIHRvIHN0ZGluLiBJbnRl bmRlZCB0byBvbmx5IGJlIGNhbGxlZCBmcm9tIG90aGVyIHNjcmlwdHMuIgogCiAgICAgZGVmIF9f aW5pdF9fKHNlbGYsKToKLSAgICAgICAgcmV0dXJuIHN1cGVyKFJlYmFzZWxpbmVKc29uLCBzZWxm KS5fX2luaXRfXyhvcHRpb25zPVsKKyAgICAgICAgc3VwZXIoUmViYXNlbGluZUpzb24sIHNlbGYp Ll9faW5pdF9fKG9wdGlvbnM9WwogICAgICAgICAgICAgc2VsZi5tb3ZlX292ZXJ3cml0dGVuX2Jh c2VsaW5lc19vcHRpb24sCiAgICAgICAgICAgICBzZWxmLm5vX29wdGltaXplX29wdGlvbiwKICAg ICAgICAgICAgIHNlbGYucmVzdWx0c19kaXJlY3Rvcnlfb3B0aW9uLApkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5pdHRlc3QucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZV91bml0dGVz dC5weQppbmRleCAwNDRlOGEwNThhMTExNWNjNGU1ODMwM2E1YzkyMGRiMzM3N2JiMTBhLi5iMDBh MzY4YTYyMjU5OWE5OWRjY2JmNWI3OTg1MmM5MDk0YzExY2M2IDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZV91bml0dGVzdC5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZV91bml0dGVz dC5weQpAQCAtMzEyLDcgKzMxMiw4IEBAIGNsYXNzIFRlc3RSZWJhc2VsaW5lRXhwZWN0YXRpb25z KF9CYXNlVGVzdENhc2UpOgogCiAgICAgZGVmIHNldFVwKHNlbGYpOgogICAgICAgICBzdXBlcihU ZXN0UmViYXNlbGluZUV4cGVjdGF0aW9ucywgc2VsZikuc2V0VXAoKQotICAgICAgICBzZWxmLm9w dGlvbnMgPSBNb2NrT3B0aW9ucyhvcHRpbWl6ZT1UcnVlLCBidWlsZGVycz1Ob25lLCBzdWZmaXhl cz1bJ3R4dCddLCB2ZXJib3NlPUZhbHNlKQorICAgICAgICBzZWxmLm9wdGlvbnMgPSBNb2NrT3B0 aW9ucyhvcHRpbWl6ZT1GYWxzZSwgYnVpbGRlcnM9Tm9uZSwgc3VmZml4ZXM9Wyd0eHQnXSwgdmVy Ym9zZT1GYWxzZSwgcGxhdGZvcm09Tm9uZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbW92ZV9vdmVyd3JpdHRlbl9iYXNlbGluZXM9RmFsc2UsIHJlc3VsdHNfZGlyZWN0b3J5 PU5vbmUpCiAKICAgICBkZWYgdGVzdF9yZWJhc2VsaW5lX2V4cGVjdGF0aW9ucyhzZWxmKToKICAg ICAgICAgc2VsZi5femVyb19vdXRfdGVzdF9leHBlY3RhdGlvbnMoKQpAQCAtMzIwLDcgKzMyMSw3 IEBAIGNsYXNzIFRlc3RSZWJhc2VsaW5lRXhwZWN0YXRpb25zKF9CYXNlVGVzdENhc2UpOgogICAg ICAgICBzZWxmLnRvb2wuZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIoKQogCiAgICAgICAgIHNl bGYuY29tbWFuZC5fdGVzdHNfdG9fcmViYXNlbGluZSA9IGxhbWJkYSBwb3J0OiB7J3VzZXJzY3Jp cHRzL2Fub3RoZXItdGVzdC5odG1sJzogc2V0KFsndHh0J10pLCAndXNlcnNjcmlwdHMvaW1hZ2Vz LnN2Zyc6IHNldChbJ3BuZyddKX0KLSAgICAgICAgc2VsZi5jb21tYW5kLmV4ZWN1dGUoTW9ja09w dGlvbnMob3B0aW1pemU9RmFsc2UsIHZlcmJvc2U9RmFsc2UsIG1vdmVfb3ZlcndyaXR0ZW5fYmFz ZWxpbmVzPUZhbHNlLCByZXN1bHRzX2RpcmVjdG9yeT1Ob25lKSwgW10sIHNlbGYudG9vbCkKKyAg ICAgICAgc2VsZi5jb21tYW5kLmV4ZWN1dGUoc2VsZi5vcHRpb25zLCBbXSwgc2VsZi50b29sKQog CiAgICAgICAgICMgRklYTUU6IGNoYW5nZSB0aGlzIHRvIHVzZSB0aGUgdGVzdC0gcG9ydHMuCiAg ICAgICAgIGNhbGxzID0gZmlsdGVyKGxhbWJkYSB4OiB4ICE9IFsncW1ha2UnLCAnLXYnXSwgc2Vs Zi50b29sLmV4ZWN1dGl2ZS5jYWxscykK