34677 2010-02-05 23:24:26 -0800 check-webkit-style: Eliminate support for "extra_flag_values" from ProcessorOptions, per the FIXME 2010-03-09 00:32:45 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 34675 34676 1 cjerdonek cjerdonek abarth cjerdonek eric hamaji levin oldest_to_newest 188421 0 cjerdonek 2010-02-05 23:24:26 -0800 It looks like support for extra_flag_values was added before check-webkit-style was forked (in order to support the "git-commit" option). When the "git-commit" option was subsequently moved into ProcessorOptions, the extra_flag_values attribute became no longer necessary. 197100 1 50199 cjerdonek 2010-03-08 02:45:14 -0800 Created attachment 50199 Proposed patch 197452 2 50199 hamaji 2010-03-08 21:56:51 -0800 Comment on attachment 50199 Proposed patch Great! 197489 3 cjerdonek 2010-03-09 00:32:45 -0800 Manually committed: http://trac.webkit.org/changeset/55715 50199 2010-03-08 02:45:14 -0800 2010-03-08 21:56:51 -0800 Proposed patch _patch-34677-1.diff text/plain 11926 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzZGM0NzAwLi5kYzRlNmYxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTAtMDMt MDggIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2ltcGxpZmllZCBjaGVjay13ZWJr aXQtc3R5bGUncyBhcmd1bWVudCBwYXJzaW5nIGNvZGUgYnkgcmVtb3ZpbmcKKyAgICAgICAgc3Vw cG9ydCBmb3IgdGhlIHZlc3RpZ2lhbCAiZXh0cmEgZmxhZyB2YWx1ZXMiIHBhcmFtZXRlci4KKwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQ2NzcKKwor ICAgICAgICBUaGUgImV4dHJhIGZsYWcgdmFsdWVzIiBwYXJhbWV0ZXIgd2FzIG5lZWRlZCBiZWZv cmUgV2ViS2l0CisgICAgICAgIGZvcmtlZCBjaGVjay13ZWJraXQtc3R5bGUgZnJvbSBHb29nbGUu ICBJdCB3YXMgdXNlZCB0byBwYXNzCisgICAgICAgIHRocm91Z2ggdGhlIG9wdGlvbiBwYXJzZXIg dGhvc2UgY29tbWFuZC1saW5lIGZsYWdzIHRoYXQgV2ViS2l0CisgICAgICAgIHJlcXVpcmVkIGJ1 dCB0aGF0IEdvb2dsZSdzIHBhcnNlciBkaWQgbm90IHN1cHBvcnQgKHRoZSAtLWdpdC1jb21taXQK KyAgICAgICAgZmxhZyBpbiBwYXJ0aWN1bGFyKS4KKyAgICAgICAgICAgIFdlIGNhbiByZW1vdmUg dGhlIHBhcmFtZXRlciBub3cgYmVjYXVzZSBpdCBpcyBubyBsb25nZXIKKyAgICAgICAgbmVlZGVk IGFuZCB1bm5lY2Vzc2FyaWx5IGNsdXR0ZXJzIHRoZSBhcmd1bWVudC1wYXJzaW5nIGNvZGUuCisK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL29wdHBhcnNlci5weToKKyAgICAgICAg ICAtIFJlbW92ZWQgdGhlIGV4dHJhX2ZsYWdfdmFsdWVzIHBhcmFtZXRlciBmcm9tIHRoZQorICAg ICAgICAgICAgQ29tbWFuZE9wdGlvblZhbHVlcyBjbGFzcydzIGNvbnN0cnVjdG9yLgorICAgICAg ICAgIC0gUmVtb3ZlZCB0aGUgZXh0cmFfZmxhZ3MgcGFyYW1ldGVyIGZyb20gdGhlIEFyZ3VtZW50 UGFyc2VyCisgICAgICAgICAgICBjbGFzcydzIHBhcnNlKCkgbWV0aG9kLgorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9zdHlsZS9vcHRwYXJzZXJfdW5pdHRlc3QucHk6CisgICAgICAgICAg LSBSZW1vdmVkIGZyb20gdGhlIHVuaXQgdGVzdHMgYWxsIHJlZmVyZW5jZXMgdG8gdGhlCisgICAg ICAgICAgICBleHRyYV9mbGFnX3ZhbHVlcyB2YXJpYWJsZS4KKwogMjAxMC0wMy0wOCAgSG9sZ2Vy IEhhbnMgUGV0ZXIgRnJleXRoZXIgIDx6ZWNrZUBzZWxmaXNoLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvc3R5bGUvb3B0cGFyc2VyLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9z dHlsZS9vcHRwYXJzZXIucHkKaW5kZXggNDEzN2M4Yi4uOTdlYTZjOSAxMDA2NDQKLS0tIGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9vcHRwYXJzZXIucHkKKysrIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9vcHRwYXJzZXIucHkKQEAgLTExOCwxOCArMTE4 LDEyIEBAIGNsYXNzIERlZmF1bHRDb21tYW5kT3B0aW9uVmFsdWVzKG9iamVjdCk6CiAgICAgICAg IHNlbGYudmVyYm9zaXR5ID0gdmVyYm9zaXR5CiAKIAotIyBGSVhNRTogRWxpbWluYXRlIHN1cHBv cnQgZm9yICJleHRyYV9mbGFnX3ZhbHVlcyIuCi0jCiAjIFRoaXMgY2xhc3Mgc2hvdWxkIG5vdCBo YXZlIGtub3dsZWRnZSBvZiB0aGUgZmxhZyBrZXkgbmFtZXMuCiBjbGFzcyBDb21tYW5kT3B0aW9u VmFsdWVzKG9iamVjdCk6CiAKICAgICAiIiJTdG9yZXMgdGhlIG9wdGlvbiB2YWx1ZXMgcGFzc2Vk IGJ5IHRoZSB1c2VyIHZpYSB0aGUgY29tbWFuZCBsaW5lLgogCiAgICAgQXR0cmlidXRlczoKLSAg ICAgIGV4dHJhX2ZsYWdfdmFsdWVzOiBBIHN0cmluZy1zdHJpbmcgZGljdGlvbmFyeSBvZiBhbGwg ZmxhZyBrZXktdmFsdWUKLSAgICAgICAgICAgICAgICAgICAgICAgICBwYWlycyB0aGF0IGFyZSBu b3Qgb3RoZXJ3aXNlIHJlcHJlc2VudGVkIGJ5IHRoaXMKLSAgICAgICAgICAgICAgICAgICAgICAg ICBjbGFzcy4gIFRoZSBkZWZhdWx0IGlzIHRoZSBlbXB0eSBkaWN0aW9uYXJ5LgotCiAgICAgICBm aWx0ZXJfcnVsZXM6IFRoZSBsaXN0IG9mIGZpbHRlciBydWxlcyBwcm92aWRlZCBieSB0aGUgdXNl ci4KICAgICAgICAgICAgICAgICAgICAgVGhlc2UgcnVsZXMgYXJlIGFwcGVuZGVkIHRvIHRoZSBi YXNlIHJ1bGVzIGFuZAogICAgICAgICAgICAgICAgICAgICBwYXRoLXNwZWNpZmljIHJ1bGVzIGFu ZCBzbyB0YWtlIHByZWNlZGVuY2Ugb3ZlcgpAQCAtMTQ4LDEzICsxNDIsMTAgQEAgY2xhc3MgQ29t bWFuZE9wdGlvblZhbHVlcyhvYmplY3QpOgogCiAgICAgIiIiCiAgICAgZGVmIF9faW5pdF9fKHNl bGYsCi0gICAgICAgICAgICAgICAgIGV4dHJhX2ZsYWdfdmFsdWVzPU5vbmUsCiAgICAgICAgICAg ICAgICAgIGZpbHRlcl9ydWxlcz1Ob25lLAogICAgICAgICAgICAgICAgICBnaXRfY29tbWl0PU5v bmUsCiAgICAgICAgICAgICAgICAgIG91dHB1dF9mb3JtYXQ9ImVtYWNzIiwKICAgICAgICAgICAg ICAgICAgdmVyYm9zaXR5PTEpOgotICAgICAgICBpZiBleHRyYV9mbGFnX3ZhbHVlcyBpcyBOb25l OgotICAgICAgICAgICAgZXh0cmFfZmxhZ192YWx1ZXMgPSB7fQogICAgICAgICBpZiBmaWx0ZXJf cnVsZXMgaXMgTm9uZToKICAgICAgICAgICAgIGZpbHRlcl9ydWxlcyA9IFtdCiAKQEAgLTE2OCw3 ICsxNTksNiBAQCBjbGFzcyBDb21tYW5kT3B0aW9uVmFsdWVzKG9iamVjdCk6CiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICJ2YWx1ZSBtdXN0IGJlIGFuIGludGVnZXIgYmV0d2VlbiAxLTUg aW5jbHVzaXZlLiAiCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdWYWx1ZSBnaXZlbjog IiVzIi4nICUgdmVyYm9zaXR5KQogCi0gICAgICAgIHNlbGYuZXh0cmFfZmxhZ192YWx1ZXMgPSBl eHRyYV9mbGFnX3ZhbHVlcwogICAgICAgICBzZWxmLmZpbHRlcl9ydWxlcyA9IGZpbHRlcl9ydWxl cwogICAgICAgICBzZWxmLmdpdF9jb21taXQgPSBnaXRfY29tbWl0CiAgICAgICAgIHNlbGYub3V0 cHV0X2Zvcm1hdCA9IG91dHB1dF9mb3JtYXQKQEAgLTE3Nyw4ICsxNjcsNiBAQCBjbGFzcyBDb21t YW5kT3B0aW9uVmFsdWVzKG9iamVjdCk6CiAgICAgIyBVc2VmdWwgZm9yIHVuaXQgdGVzdGluZy4K ICAgICBkZWYgX19lcV9fKHNlbGYsIG90aGVyKToKICAgICAgICAgIiIiUmV0dXJuIHdoZXRoZXIg dGhpcyBpbnN0YW5jZSBpcyBlcXVhbCB0byBhbm90aGVyLiIiIgotICAgICAgICBpZiBzZWxmLmV4 dHJhX2ZsYWdfdmFsdWVzICE9IG90aGVyLmV4dHJhX2ZsYWdfdmFsdWVzOgotICAgICAgICAgICAg cmV0dXJuIEZhbHNlCiAgICAgICAgIGlmIHNlbGYuZmlsdGVyX3J1bGVzICE9IG90aGVyLmZpbHRl cl9ydWxlczoKICAgICAgICAgICAgIHJldHVybiBGYWxzZQogICAgICAgICBpZiBzZWxmLmdpdF9j b21taXQgIT0gb3RoZXIuZ2l0X2NvbW1pdDoKQEAgLTIxMiw4ICsyMDAsNyBAQCBjbGFzcyBBcmd1 bWVudFByaW50ZXIob2JqZWN0KToKICAgICAgICAgICBvcHRpb25zOiBBIENvbW1hbmRPcHRpb25W YWx1ZXMgaW5zdGFuY2UuCiAKICAgICAgICAgIiIiCi0gICAgICAgIGZsYWdzID0gb3B0aW9ucy5l eHRyYV9mbGFnX3ZhbHVlcy5jb3B5KCkKLQorICAgICAgICBmbGFncyA9IHt9CiAgICAgICAgIGZs YWdzWydvdXRwdXQnXSA9IG9wdGlvbnMub3V0cHV0X2Zvcm1hdAogICAgICAgICBmbGFnc1sndmVy Ym9zZSddID0gb3B0aW9ucy52ZXJib3NpdHkKICAgICAgICAgIyBPbmx5IGluY2x1ZGUgdGhlIGZp bHRlciBmbGFnIGlmIHVzZXItcHJvdmlkZWQgcnVsZXMgYXJlIHByZXNlbnQuCkBAIC0zMzUsMTUg KzMyMiwxMSBAQCBjbGFzcyBBcmd1bWVudFBhcnNlcihvYmplY3QpOgogICAgICAgICAgICAgZmls dGVycy5hcHBlbmQoZmlsdGVyKQogICAgICAgICByZXR1cm4gZmlsdGVycwogCi0gICAgZGVmIHBh cnNlKHNlbGYsIGFyZ3MsIGV4dHJhX2ZsYWdzPU5vbmUpOgorICAgIGRlZiBwYXJzZShzZWxmLCBh cmdzKToKICAgICAgICAgIiIiUGFyc2UgdGhlIGNvbW1hbmQgbGluZSBhcmd1bWVudHMgdG8gY2hl Y2std2Via2l0LXN0eWxlLgogCiAgICAgICAgIEFyZ3M6CiAgICAgICAgICAgYXJnczogQSBsaXN0 IG9mIGNvbW1hbmQtbGluZSBhcmd1bWVudHMgYXMgcmV0dXJuZWQgYnkgc3lzLmFyZ3ZbMTpdLgot ICAgICAgICAgIGV4dHJhX2ZsYWdzOiBBIGxpc3Qgb2YgZmxhZ3Mgd2hvc2UgdmFsdWVzIHdlIHdh bnQgdG8gZXh0cmFjdCwgYnV0Ci0gICAgICAgICAgICAgICAgICAgICAgIGFyZSBub3Qgc3VwcG9y dGVkIGJ5IHRoZSBDb21tYW5kT3B0aW9uVmFsdWVzIGNsYXNzLgotICAgICAgICAgICAgICAgICAg ICAgICBBbiBleGFtcGxlIGZsYWcgIm5ld19mbGFnPSIuIFRoaXMgZGVmYXVsdHMgdG8gdGhlCi0g ICAgICAgICAgICAgICAgICAgICAgIGVtcHR5IGxpc3QuCiAKICAgICAgICAgUmV0dXJuczoKICAg ICAgICAgICBBIHR1cGxlIG9mIChmaWxlbmFtZXMsIG9wdGlvbnMpCkBAIC0zNTIsMjIgKzMzNSwx MiBAQCBjbGFzcyBBcmd1bWVudFBhcnNlcihvYmplY3QpOgogICAgICAgICAgIG9wdGlvbnM6IEEg Q29tbWFuZE9wdGlvblZhbHVlcyBpbnN0YW5jZS4KIAogICAgICAgICAiIiIKLSAgICAgICAgaWYg ZXh0cmFfZmxhZ3MgaXMgTm9uZToKLSAgICAgICAgICAgIGV4dHJhX2ZsYWdzID0gW10KLQogICAg ICAgICBvdXRwdXRfZm9ybWF0ID0gc2VsZi5kZWZhdWx0X29wdGlvbnMub3V0cHV0X2Zvcm1hdAog ICAgICAgICB2ZXJib3NpdHkgPSBzZWxmLmRlZmF1bHRfb3B0aW9ucy52ZXJib3NpdHkKIAotICAg ICAgICAjIFRoZSBmbGFncyBhbHJlYWR5IHN1cHBvcnRlZCBieSB0aGUgQ29tbWFuZE9wdGlvblZh bHVlcyBjbGFzcy4KKyAgICAgICAgIyBUaGUgZmxhZ3MgdGhhdCB0aGUgQ29tbWFuZE9wdGlvblZh bHVlcyBjbGFzcyBzdXBwb3J0cy4KICAgICAgICAgZmxhZ3MgPSBbJ2hlbHAnLCAnb3V0cHV0PScs ICd2ZXJib3NlPScsICdmaWx0ZXI9JywgJ2dpdC1jb21taXQ9J10KIAotICAgICAgICBmb3IgZXh0 cmFfZmxhZyBpbiBleHRyYV9mbGFnczoKLSAgICAgICAgICAgIGlmIGV4dHJhX2ZsYWcgaW4gZmxh Z3M6Ci0gICAgICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcignRmxhZyBcJyUoZXh0cmFfZmxh ZylzIGlzIGR1cGxpY2F0ZWQgJwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ29y IGFscmVhZHkgc3VwcG9ydGVkLicgJQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg eydleHRyYV9mbGFnJzogZXh0cmFfZmxhZ30pCi0gICAgICAgICAgICBmbGFncy5hcHBlbmQoZXh0 cmFfZmxhZykKLQogICAgICAgICB0cnk6CiAgICAgICAgICAgICAob3B0cywgZmlsZW5hbWVzKSA9 IGdldG9wdC5nZXRvcHQoYXJncywgJycsIGZsYWdzKQogICAgICAgICBleGNlcHQgZ2V0b3B0Lkdl dG9wdEVycm9yOgpAQCAtMzc3LDcgKzM1MCw2IEBAIGNsYXNzIEFyZ3VtZW50UGFyc2VyKG9iamVj dCk6CiAgICAgICAgICAgICAjICAgICAgICBzeXMuZXhpdCB3aGVuIG5lZWRpbmcgdG8gaW50ZXJy dXB0IGV4ZWN1dGlvbi4KICAgICAgICAgICAgIHNlbGYuX2V4aXRfd2l0aF91c2FnZSgnSW52YWxp ZCBhcmd1bWVudHMuJykKIAotICAgICAgICBleHRyYV9mbGFnX3ZhbHVlcyA9IHt9CiAgICAgICAg IGdpdF9jb21taXQgPSBOb25lCiAgICAgICAgIGZpbHRlcl9ydWxlcyA9IFtdCiAKQEAgLTM5NSw3 ICszNjcsNyBAQCBjbGFzcyBBcmd1bWVudFBhcnNlcihvYmplY3QpOgogICAgICAgICAgICAgICAg ICAgICBzZWxmLl9leGl0X3dpdGhfY2F0ZWdvcmllcygpCiAgICAgICAgICAgICAgICAgZmlsdGVy X3J1bGVzID0gc2VsZi5fcGFyc2VfZmlsdGVyX2ZsYWcodmFsKQogICAgICAgICAgICAgZWxzZToK LSAgICAgICAgICAgICAgICBleHRyYV9mbGFnX3ZhbHVlc1tvcHRdID0gdmFsCisgICAgICAgICAg ICAgICAgcmFpc2UgVmFsdWVFcnJvcignSW52YWxpZCBvcHRpb246ICIlcyInICUgb3B0KQogCiAg ICAgICAgICMgQ2hlY2sgdmFsaWRpdHkgb2YgcmVzdWx0aW5nIHZhbHVlcy4KICAgICAgICAgaWYg ZmlsZW5hbWVzIGFuZCAoZ2l0X2NvbW1pdCAhPSBOb25lKToKQEAgLTQxNCw4ICszODYsNyBAQCBj bGFzcyBBcmd1bWVudFBhcnNlcihvYmplY3QpOgogICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJv cignSW52YWxpZCAtLXZlcmJvc2UgdmFsdWUgJXM6IHZhbHVlIG11c3QgJwogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAnYmUgYmV0d2VlbiAxLTUuJyAlIHZlcmJvc2l0eSkKIAotICAgICAg ICBvcHRpb25zID0gQ29tbWFuZE9wdGlvblZhbHVlcyhleHRyYV9mbGFnX3ZhbHVlcz1leHRyYV9m bGFnX3ZhbHVlcywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZpbHRlcl9ydWxl cz1maWx0ZXJfcnVsZXMsCisgICAgICAgIG9wdGlvbnMgPSBDb21tYW5kT3B0aW9uVmFsdWVzKGZp bHRlcl9ydWxlcz1maWx0ZXJfcnVsZXMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBnaXRfY29tbWl0PWdpdF9jb21taXQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBvdXRwdXRfZm9ybWF0PW91dHB1dF9mb3JtYXQsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB2ZXJib3NpdHk9dmVyYm9zaXR5KQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9zdHlsZS9vcHRwYXJzZXJfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL29wdHBhcnNlcl91bml0dGVzdC5weQppbmRleCBmMjNjNWQx Li5lNGM3NWZiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L29wdHBhcnNlcl91bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3N0eWxlL29wdHBhcnNlcl91bml0dGVzdC5weQpAQCAtNTIsMTkgKzUyLDE2IEBAIGNsYXNzIEFy Z3VtZW50UHJpbnRlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgICAgICAg ICAgICAgb3V0cHV0X2Zvcm1hdD0nZW1hY3MnLAogICAgICAgICAgICAgICAgICAgICAgICAgdmVy Ym9zaXR5PTMsCiAgICAgICAgICAgICAgICAgICAgICAgICBmaWx0ZXJfcnVsZXM9W10sCi0gICAg ICAgICAgICAgICAgICAgICAgICBnaXRfY29tbWl0PU5vbmUsCi0gICAgICAgICAgICAgICAgICAg ICAgICBleHRyYV9mbGFnX3ZhbHVlcz17fSk6Ci0gICAgICAgIHJldHVybiBQcm9jZXNzb3JPcHRp b25zKGV4dHJhX2ZsYWdfdmFsdWVzPWV4dHJhX2ZsYWdfdmFsdWVzLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBmaWx0ZXJfcnVsZXM9ZmlsdGVyX3J1bGVzLAorICAgICAgICAgICAg ICAgICAgICAgICAgZ2l0X2NvbW1pdD1Ob25lKToKKyAgICAgICAgcmV0dXJuIFByb2Nlc3Nvck9w dGlvbnMoZmlsdGVyX3J1bGVzPWZpbHRlcl9ydWxlcywKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZ2l0X2NvbW1pdD1naXRfY29tbWl0LAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBvdXRwdXRfZm9ybWF0PW91dHB1dF9mb3JtYXQsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHZlcmJvc2l0eT12ZXJib3NpdHkpCiAKICAgICBkZWYgdGVzdF90b19mbGFn X3N0cmluZyhzZWxmKToKLSAgICAgICAgb3B0aW9ucyA9IHNlbGYuX2NyZWF0ZV9vcHRpb25zKCd2 czcnLCA1LCBbJytmb28nLCAnLWJhciddLCAnZ2l0JywKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHsnYSc6IDAsICd6JzogMX0pCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxzKCctLWE9MCAtLWZpbHRlcj0rZm9vLC1iYXIgLS1naXQtY29tbWl0PWdpdCAnCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICctLW91dHB1dD12czcgLS12ZXJib3NlPTUgLS16PTEnLAorICAg ICAgICBvcHRpb25zID0gc2VsZi5fY3JlYXRlX29wdGlvbnMoJ3ZzNycsIDUsIFsnK2ZvbycsICct YmFyJ10sICdnaXQnKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscygnLS1maWx0ZXI9K2Zvbywt YmFyIC0tZ2l0LWNvbW1pdD1naXQgJworICAgICAgICAgICAgICAgICAgICAgICAgICAnLS1vdXRw dXQ9dnM3IC0tdmVyYm9zZT01JywKICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fcHJp bnRlci50b19mbGFnX3N0cmluZyhvcHRpb25zKSkKIAogICAgICAgICAjIFRoaXMgaXMgdG8gY2hl Y2sgdGhhdCAtLWZpbHRlciBhbmQgLS1naXQtY29tbWl0IGRvIG5vdApAQCAtMTM0LDEzICsxMzEs NiBAQCBjbGFzcyBBcmd1bWVudFBhcnNlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAg ICBwYXJzZShbJy0tZmlsdGVyPStidWlsZCddKSAjIHdvcmtzCiAgICAgICAgICMgUGFzcyBmaWxl cyBhbmQgZ2l0LWNvbW1pdCBhdCB0aGUgc2FtZSB0aW1lLgogICAgICAgICBzZWxmLmFzc2VydFJh aXNlcyhTeXN0ZW1FeGl0LCBwYXJzZSwgWyctLWdpdC1jb21taXQ9JywgJ2ZpbGUudHh0J10pCi0g ICAgICAgICMgUGFzcyBhbiBleHRyYSBmbGFnIGFscmVhZHkgc3VwcG9ydGVkLgotICAgICAgICBz ZWxmLmFzc2VydFJhaXNlcyhWYWx1ZUVycm9yLCBwYXJzZSwgW10sIFsnZmlsdGVyPSddKQotICAg ICAgICBwYXJzZShbXSwgWydleHRyYT0nXSkgIyB3b3JrcwotICAgICAgICAjIFBhc3MgYW4gZXh0 cmEgZmxhZyB3aXRoIHR5cG8uCi0gICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFN5c3RlbUV4aXQs IHBhcnNlLCBbJy0tZXh0cmF0eXBvPSddLCBbJ2V4dHJhPSddKQotICAgICAgICBwYXJzZShbJy0t ZXh0cmE9J10sIFsnZXh0cmE9J10pICMgd29ya3MKLSAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMo VmFsdWVFcnJvciwgcGFyc2UsIFtdLCBbJ2V4dHJhPScsICdleHRyYT0nXSkKIAogCiAgICAgZGVm IHRlc3RfcGFyc2VfZGVmYXVsdF9hcmd1bWVudHMoc2VsZik6CkBAIC0xNzYsMTQgKzE2Niw2IEBA IGNsYXNzIEFyZ3VtZW50UGFyc2VyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWxzKG9wdGlvbnMuZmlsdGVyX3J1bGVzLAogICAgICAgICAgICAgICAgICAg ICAgICAgICBbIitidWlsZCIsICItd2hpdGVzcGFjZSJdKQogCi0gICAgICAgICMgUGFzcyBleHRy YSBmbGFnIHZhbHVlcy4KLSAgICAgICAgKGZpbGVzLCBvcHRpb25zKSA9IHBhcnNlKFsnLS1leHRy YSddLCBbJ2V4dHJhJ10pCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKG9wdGlvbnMuZXh0cmFf ZmxhZ192YWx1ZXMsIHsnLS1leHRyYSc6ICcnfSkKLSAgICAgICAgKGZpbGVzLCBvcHRpb25zKSA9 IHBhcnNlKFsnLS1leHRyYT0nXSwgWydleHRyYT0nXSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVh bHMob3B0aW9ucy5leHRyYV9mbGFnX3ZhbHVlcywgeyctLWV4dHJhJzogJyd9KQotICAgICAgICAo ZmlsZXMsIG9wdGlvbnMpID0gcGFyc2UoWyctLWV4dHJhPXgnXSwgWydleHRyYT0nXSkKLSAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbHMob3B0aW9ucy5leHRyYV9mbGFnX3ZhbHVlcywgeyctLWV4dHJh JzogJ3gnfSkKLQogICAgIGRlZiB0ZXN0X3BhcnNlX2ZpbGVzKHNlbGYpOgogICAgICAgICBwYXJz ZSA9IHNlbGYuX3BhcnNlKCkKIApAQCAtMjAzLDcgKzE4NSw2IEBAIGNsYXNzIENvbW1hbmRPcHRp b25WYWx1ZXNUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgIiIiVGVzdCBfX2luaXRf XyBjb25zdHJ1Y3Rvci4iIiIKICAgICAgICAgIyBDaGVjayBkZWZhdWx0IHBhcmFtZXRlcnMuCiAg ICAgICAgIG9wdGlvbnMgPSBQcm9jZXNzb3JPcHRpb25zKCkKLSAgICAgICAgc2VsZi5hc3NlcnRF cXVhbHMob3B0aW9ucy5leHRyYV9mbGFnX3ZhbHVlcywge30pCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWxzKG9wdGlvbnMuZmlsdGVyX3J1bGVzLCBbXSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bHMob3B0aW9ucy5naXRfY29tbWl0LCBOb25lKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhv cHRpb25zLm91dHB1dF9mb3JtYXQsICJlbWFjcyIpCkBAIC0yMTksMTIgKzIwMCwxMCBAQCBjbGFz cyBDb21tYW5kT3B0aW9uVmFsdWVzVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIFBy b2Nlc3Nvck9wdGlvbnModmVyYm9zaXR5PTUpICMgd29ya3MKIAogICAgICAgICAjIENoZWNrIGF0 dHJpYnV0ZXMuCi0gICAgICAgIG9wdGlvbnMgPSBQcm9jZXNzb3JPcHRpb25zKGV4dHJhX2ZsYWdf dmFsdWVzPXsiZXh0cmFfdmFsdWUiIDogMn0sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGZpbHRlcl9ydWxlcz1bIisiXSwKKyAgICAgICAgb3B0aW9ucyA9IFByb2Nlc3Nvck9w dGlvbnMoZmlsdGVyX3J1bGVzPVsiKyJdLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBnaXRfY29tbWl0PSJjb21taXQiLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBvdXRwdXRfZm9ybWF0PSJ2czciLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB2ZXJib3NpdHk9MykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMob3B0aW9ucy5leHRy YV9mbGFnX3ZhbHVlcywgeyJleHRyYV92YWx1ZSIgOiAyfSkKICAgICAgICAgc2VsZi5hc3NlcnRF cXVhbHMob3B0aW9ucy5maWx0ZXJfcnVsZXMsIFsiKyJdKQogICAgICAgICBzZWxmLmFzc2VydEVx dWFscyhvcHRpb25zLmdpdF9jb21taXQsICJjb21taXQiKQogICAgICAgICBzZWxmLmFzc2VydEVx dWFscyhvcHRpb25zLm91dHB1dF9mb3JtYXQsICJ2czciKQpAQCAtMjM2LDEzICsyMTUsMTAgQEAg Y2xhc3MgQ29tbWFuZE9wdGlvblZhbHVlc1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAg ICBzZWxmLmFzc2VydFRydWUoUHJvY2Vzc29yT3B0aW9ucygpID09IFByb2Nlc3Nvck9wdGlvbnMo KSkKIAogICAgICAgICAjIFZlcmlmeSB0aGF0IGEgZGlmZmVyZW5jZSBpbiBhbnkgYXJndW1lbnQg Y2F1c2VzIGVxdWFsaXR5IHRvIGZhaWwuCi0gICAgICAgIG9wdGlvbnMgPSBQcm9jZXNzb3JPcHRp b25zKGV4dHJhX2ZsYWdfdmFsdWVzPXsiZXh0cmFfdmFsdWUiIDogMX0sCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGZpbHRlcl9ydWxlcz1bIisiXSwKKyAgICAgICAgb3B0aW9u cyA9IFByb2Nlc3Nvck9wdGlvbnMoZmlsdGVyX3J1bGVzPVsiKyJdLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBnaXRfY29tbWl0PSJjb21taXQiLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBvdXRwdXRfZm9ybWF0PSJ2czciLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB2ZXJib3NpdHk9MSkKLSAgICAgICAgc2VsZi5hc3NlcnRGYWxz ZShvcHRpb25zID09IFByb2Nlc3Nvck9wdGlvbnMoZXh0cmFfZmxhZ192YWx1ZXM9Ci0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHsiZXh0cmFfdmFs dWUiIDogMn0pKQogICAgICAgICBzZWxmLmFzc2VydEZhbHNlKG9wdGlvbnMgPT0gUHJvY2Vzc29y T3B0aW9ucyhmaWx0ZXJfcnVsZXM9WyItIl0pKQogICAgICAgICBzZWxmLmFzc2VydEZhbHNlKG9w dGlvbnMgPT0gUHJvY2Vzc29yT3B0aW9ucyhnaXRfY29tbWl0PSJjb21taXQyIikpCiAgICAgICAg IHNlbGYuYXNzZXJ0RmFsc2Uob3B0aW9ucyA9PSBQcm9jZXNzb3JPcHRpb25zKG91dHB1dF9mb3Jt YXQ9ImVtYWNzIikpCg==